diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/ZkController.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/ZkController.java index 63d4e8d..ce3a7e5 100644 --- a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/ZkController.java +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/ZkController.java @@ -1,15 +1,9 @@ package com.sincere.xiaoanSearch.controller; -import com.sincere.common.dto.xiaoan.CheckInDto; -import com.sincere.common.dto.xiaoan.CheckOutDto; import com.sincere.common.dto.xiaoan.FingerDto; -import com.sincere.xiaoanSearch.model.CheckIn; import com.sincere.xiaoanSearch.service.ZkService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author chen @@ -27,4 +21,9 @@ public class ZkController { public int insertFinger(@RequestBody FingerDto fingerDto){ return zkService.insertFinger(fingerDto); } + + @RequestMapping(value = "selectFinger",method = RequestMethod.GET) + String selectFinger(@RequestParam("studentId") int studentId){ + return zkService.selectFinger(studentId); + } } diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/FingerMapper.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/FingerMapper.java index 1ae0ffc..cb4c919 100644 --- a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/FingerMapper.java +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/FingerMapper.java @@ -10,4 +10,6 @@ import com.sincere.common.dto.xiaoan.FingerDto; public interface FingerMapper { int insertFinger(FingerDto fingerDto); + + String selectFinger(int studentId); } diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/ZkService.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/ZkService.java index a1e5480..e561a9e 100644 --- a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/ZkService.java +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/ZkService.java @@ -8,5 +8,8 @@ import com.sincere.common.dto.xiaoan.FingerDto; * @date 2019/12/31 0031 13:40 */ public interface ZkService { + int insertFinger(FingerDto fingerDto); + + String selectFinger(int studentId); } diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/ZkServiceImpl.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/ZkServiceImpl.java index a0f770d..58ccdfe 100644 --- a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/ZkServiceImpl.java +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/ZkServiceImpl.java @@ -21,4 +21,9 @@ public class ZkServiceImpl implements ZkService { public int insertFinger(FingerDto fingerDto) { return fingerMapper.insertFinger(fingerDto); } + + @Override + public String selectFinger(int studentId) { + return fingerMapper.selectFinger(studentId); + } } diff --git a/cloud/search_xiaoan/src/main/resources/mapper/FingerMapper.xml b/cloud/search_xiaoan/src/main/resources/mapper/FingerMapper.xml index 51db800..fea42f2 100644 --- a/cloud/search_xiaoan/src/main/resources/mapper/FingerMapper.xml +++ b/cloud/search_xiaoan/src/main/resources/mapper/FingerMapper.xml @@ -8,4 +8,8 @@ values (#{studentId},#{orderMsg},#{createTime}) + + \ No newline at end of file diff --git a/cloud/zkAttendance/src/main/java/com/sincere/att/controller/AttPushController.java b/cloud/zkAttendance/src/main/java/com/sincere/att/controller/AttPushController.java index 4248848..4e48256 100644 --- a/cloud/zkAttendance/src/main/java/com/sincere/att/controller/AttPushController.java +++ b/cloud/zkAttendance/src/main/java/com/sincere/att/controller/AttPushController.java @@ -8,11 +8,13 @@ import com.sincere.att.feign.XaFeign; import com.sincere.att.logs.LogName; import com.sincere.att.logs.LoggerUtils; import com.sincere.att.vo.AttendanceInfoBean; +import com.sincere.att.vo.FingerOrderVo; import com.sincere.att.vo.UserOrderVo; import com.sincere.common.dto.smartCampus.SZ_AttendanceDto; import com.sincere.common.dto.xiaoan.FingerDto; import com.sincere.common.util.DateUtils; import com.sincere.common.util.HttpClientUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -51,8 +53,8 @@ public class AttPushController { @Autowired XaFeign xaFeign ; - @RequestMapping(value = "sendOrder/{roomId}" , method = RequestMethod.GET) - public void sendOrder(@PathVariable int roomId){ + @RequestMapping(value = "sendUser/{roomId}" , method = RequestMethod.GET) + public void sendUser(@PathVariable int roomId){ JSONObject object = new JSONObject(); object.put("PageIndex",1); object.put("roomId",roomId); @@ -83,6 +85,39 @@ public class AttPushController { cmdMap.put(attendance,order); } } + + @RequestMapping(value = "sendUser/{roomId}" , method = RequestMethod.GET) + public void sendFinger(@PathVariable int roomId){ + JSONObject object = new JSONObject(); + object.put("PageIndex",1); + object.put("roomId",roomId); + object.put("pageSize",9999); + JSONObject result = HttpClientUtils.httpPostJson("http://campus.myjxt.com/api/Room/GetListPageRoom",object.toJSONString()); + JSONArray array = (JSONArray) ((JSONObject) result.get("data")).get("roomList") ; + List order = new ArrayList<>(); + List attendanceList = scFeign.selectRoomAttendance(roomId); + for(String attendance : attendanceList){ + for(int i = 0 ; i < array.size() ; i++){ + JSONObject student = (JSONObject) array.get(i); + FingerOrderVo vo = new FingerOrderVo(); + int number = 1 ; + try{ + number = cmdOrderMap.get(attendance) ; + }catch (Exception e){ + + } + vo.setNumber(number); + vo.setOrder(xaFeign.selectFinger((Integer)student.get("studentid"))); + number++ ; + cmdOrderMap.put(attendance,number) ; + if(StringUtils.isNotBlank(vo.getOrder())){ + order.add(vo.toString()); + } + } + cmdMap.put(attendance,order); + } + } + /** * 1，设备通完电以后第一个发送到后台的请求 * 格式为 /iclock/cdata?options=all&language=xxxx&pushver=xxxx diff --git a/cloud/zkAttendance/src/main/java/com/sincere/att/feign/XaFeign.java b/cloud/zkAttendance/src/main/java/com/sincere/att/feign/XaFeign.java index a8279e3..761b4ba 100644 --- a/cloud/zkAttendance/src/main/java/com/sincere/att/feign/XaFeign.java +++ b/cloud/zkAttendance/src/main/java/com/sincere/att/feign/XaFeign.java @@ -5,6 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; /** * @author chen @@ -16,4 +17,7 @@ public interface XaFeign { @RequestMapping(value = "/xa/zk/insertFinger",method = RequestMethod.POST) int insertFinger(@RequestBody FingerDto fingerDto); + + @RequestMapping(value = "/xa/zk/selectFinger",method = RequestMethod.GET) + String selectFinger(@RequestParam("studentId") int studentId); } diff --git a/cloud/zkAttendance/src/main/java/com/sincere/att/vo/FingerOrderVo.java b/cloud/zkAttendance/src/main/java/com/sincere/att/vo/FingerOrderVo.java new file mode 100644 index 0000000..82b1ff6 --- /dev/null +++ b/cloud/zkAttendance/src/main/java/com/sincere/att/vo/FingerOrderVo.java @@ -0,0 +1,34 @@ +package com.sincere.att.vo; + +/** + * 下发 指纹命令 + * @author chen + * @version 1.0 + * @date 2019/12/31 0031 15:39 + */ +public class FingerOrderVo { + + private int number ; + private String order ; + + public int getNumber() { + return number; + } + + public void setNumber(int number) { + this.number = number; + } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + @Override + public String toString() { + return "C:"+this.number+":DATA UPDATE FINGERTMP "+this.order+"\r\n\r\n"; + } +} diff --git a/cloud/zkAttendance/src/main/java/com/sincere/att/vo/OrderVo.java b/cloud/zkAttendance/src/main/java/com/sincere/att/vo/OrderVo.java deleted file mode 100644 index 814dc79..0000000 --- a/cloud/zkAttendance/src/main/java/com/sincere/att/vo/OrderVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.sincere.att.vo; - -/** - * @author chen - * @version 1.0 - * @date 2019/12/31 0031 9:50 - */ -public class OrderVo { - - private int number ; - private int studentId ; - - public int getNumber() { - return number; - } - - public void setNumber(int number) { - this.number = number; - } - - public int getStudentId() { - return studentId; - } - - public void setStudentId(int studentId) { - this.studentId = studentId; - } -} diff --git a/cloud/zkAttendance/src/main/java/com/sincere/att/vo/UserOrderVo.java b/cloud/zkAttendance/src/main/java/com/sincere/att/vo/UserOrderVo.java index a470918..1c60f80 100644 --- a/cloud/zkAttendance/src/main/java/com/sincere/att/vo/UserOrderVo.java +++ b/cloud/zkAttendance/src/main/java/com/sincere/att/vo/UserOrderVo.java @@ -1,14 +1,32 @@ package com.sincere.att.vo; /** + * 下发用户 指令 * @author chen * @version 1.0 * @date 2019/12/31 0031 9:08 */ -public class UserOrderVo extends OrderVo { +public class UserOrderVo { private String studentName ; + private int number ; + private int studentId ; + public int getNumber() { + return number; + } + + public void setNumber(int number) { + this.number = number; + } + + public int getStudentId() { + return studentId; + } + + public void setStudentId(int studentId) { + this.studentId = studentId; + } public String getStudentName() { return studentName; @@ -20,6 +38,6 @@ public class UserOrderVo extends OrderVo { @Override public String toString() { - return "C:"+this.getNumber()+":DATA UPDATE USERINFO PIN="+this.getStudentId()+"\tName="+this.getStudentName()+"\tPasswd=\tCard=\tPri=0\r\n\r\n"; + return "C:"+this.number+":DATA UPDATE USERINFO PIN="+this.studentId+"\tName="+this.studentName+"\tPasswd=\tCard=\tPri=0\r\n\r\n"; } } -- libgit2 0.21.0