diff --git a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java index ef18e61..3562fd6 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java @@ -478,9 +478,7 @@ public class MyTask implements ApplicationRunner { //刷卡结果，1表示成功, 0表示失败 int status = msg.bStatus; - log.info("考勤状态：{}，学校：{}，设备ID: {}，学生信息：{}",status,schoolId,szSn,new Gson().toJson(userInfoBean)); if(szSn.startsWith("ytj")) { - log.info("考勤进来了，学校：{}，设备ID: {}，学生信息：{}",schoolId,szSn,new Gson().toJson(userInfoBean)); // 艺校考勤OA if(schoolId == 12 && status ==1){ int intOrOut = eventType ==1? 1 : 2; diff --git a/cloud/dahua/src/main/java/com/example/dahua/bean/yx/FaceBean.java b/cloud/dahua/src/main/java/com/example/dahua/bean/yx/FaceBean.java new file mode 100644 index 0000000..a0d43b8 --- /dev/null +++ b/cloud/dahua/src/main/java/com/example/dahua/bean/yx/FaceBean.java @@ -0,0 +1,105 @@ +package com.example.dahua.bean.yx; + +import java.util.Date; + +public class FaceBean { + private String deviceId; + private String userId; + private String Num; + private String Name; + private Date time; + private String schoolName; + private Integer schoolId; + private Integer userType; + private Integer deviceType; + private Integer status; + private Integer channel; + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getNum() { + return Num; + } + + public void setNum(String num) { + Num = num; + } + + public String getName() { + return Name; + } + + public void setName(String name) { + Name = name; + } + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + + public Integer getSchoolId() { + return schoolId; + } + + public void setSchoolId(Integer schoolId) { + this.schoolId = schoolId; + } + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + + public Integer getDeviceType() { + return deviceType; + } + + public void setDeviceType(Integer deviceType) { + this.deviceType = deviceType; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getChannel() { + return channel; + } + + public void setChannel(Integer channel) { + this.channel = channel; + } +} diff --git a/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java b/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java index 9f262ae..2725689 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java +++ b/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java @@ -1,6 +1,7 @@ package com.example.dahua.xiananDao; import com.example.dahua.bean.CheckIn; +import com.example.dahua.bean.yx.FaceBean; public interface SearchMapper { /** @@ -16,4 +17,6 @@ public interface SearchMapper { void insertSS(String user_id,String school_id,String customerId,String card_num,Integer card_type,Integer outof,String intime,String cid,String class_id,String attendance_id, String name,String mobile,String class_name,String sex,String systime); + void insertFace(FaceBean faceBean); + } diff --git a/cloud/dahua/src/main/resources/xiaoanmapper/SearchMapper.xml b/cloud/dahua/src/main/resources/xiaoanmapper/SearchMapper.xml index 7aa2eb8..6343c46 100644 --- a/cloud/dahua/src/main/resources/xiaoanmapper/SearchMapper.xml +++ b/cloud/dahua/src/main/resources/xiaoanmapper/SearchMapper.xml @@ -73,4 +73,8 @@ ) + + insert into Face_SendRecord values (#{deviceId},#{userId},#{Num},#{Name},#{time},#{schoolName},null,#{schoolId},null,null,#{userType},#{deviceType},#{status},#{channel}) + + \ No newline at end of file diff --git a/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java b/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java index 3c60307..85c8c4c 100644 --- a/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java +++ b/cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java @@ -4,10 +4,14 @@ import com.alibaba.fastjson.JSON; import com.example.dahua.async.SendUserInfoTask; import com.example.dahua.bean.*; +import com.example.dahua.bean.yx.FaceBean; +import com.example.dahua.bean.yx.ImportStudent; import com.example.dahua.dao.TestDao; import com.example.dahua.dao.UserDao; import com.example.dahua.mqtt.MqttManager; import com.example.dahua.service.UserService; +import com.example.dahua.service.imp.BaseService; +import com.example.dahua.xiananDao.SearchMapper; import com.example.dahua.xiananDao.SendRecordDao; import org.apache.http.util.TextUtils; import org.junit.Test; @@ -21,10 +25,13 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; +import javax.annotation.Resource; import java.io.*; import java.util.*; +import java.util.stream.Collectors; @RunWith(SpringRunner.class) @SpringBootTest @@ -510,4 +517,68 @@ public class DahuaApplicationTests { } } + @Resource + private BaseService baseService; + @Resource + private SearchMapper searchMapper; + + @Test + public void test8(){ + //根据类型获取下发用户信息 + String deviceIds = "ytj7locb3apaj33b6a,ytj7locb3apaj412af,ytj7locb3apaj76210,ytj7locb3apajb69c3"; +// String deviceIds = "ytj7locb3apaj8ob3c,ytj7locb3apaj5cao8,ytj7locb3apaj7fc35,ytj7locb3apajdb8f4"; + List deviceList = new ArrayList<>(Arrays.asList(deviceIds.split(","))); + List studentBeanList = baseService.getYxStudentList(12,"B幢"); + System.out.println("统计共有下发用户数量：{}"+studentBeanList.size()); + studentBeanList.stream() + .filter(importStudent -> !StringUtils.isEmpty(importStudent.getPhoto())) + .forEach(importStudent -> { + System.out.println(importStudent.getName()); + deviceList.stream().forEach(s -> { + FaceBean faceBean = new FaceBean(); + faceBean.setDeviceId(s); + faceBean.setName(importStudent.getName()); + faceBean.setNum(importStudent.getCardNum()); + faceBean.setUserId(importStudent.getUserId()); + faceBean.setSchoolId(12); + faceBean.setSchoolName("绍兴艺术学校"); + faceBean.setChannel(1); + faceBean.setStatus(1); + faceBean.setDeviceType(29); + faceBean.setTime(new Date()); + searchMapper.insertFace(faceBean); + }); + }); + } + + @Test + public void test9(){ + //根据类型获取下发用户信息 +// String deviceIds = "ytj7locb3apaj33b6a,ytj7locb3apaj412af,ytj7locb3apaj76210,ytj7locb3apajb69c3"; + String deviceIds = "ytj7locb3apaj8ob3c,ytj7locb3apaj5cao8,ytj7locb3apaj7fc35,ytj7locb3apajdb8f4"; + List deviceList = new ArrayList<>(Arrays.asList(deviceIds.split(","))); + List studentBeanList = baseService.getTeacherList(12); + System.out.println("统计共有下发用户数量： "+studentBeanList.size()); + studentBeanList.stream() + .filter(studentBean -> !StringUtils.isEmpty(studentBean.getFace())) + .forEach(studentBean -> { + System.out.println(studentBean.getName()); + deviceList.stream().forEach(s -> { + FaceBean faceBean = new FaceBean(); + faceBean.setDeviceId(s); + faceBean.setName(studentBean.getName()); + faceBean.setNum(studentBean.getTeacher_num()); + faceBean.setUserId(studentBean.getUser_id()); + faceBean.setSchoolId(12); + faceBean.setSchoolName("绍兴艺术学校"); + faceBean.setChannel(1); + faceBean.setStatus(1); + faceBean.setDeviceType(29); + faceBean.setUserType(1); + faceBean.setTime(new Date()); + searchMapper.insertFace(faceBean); + }); + }); + } + } -- libgit2 0.21.0