大华代码提交

徐泉
1 parent 86dc0d39
Showing 5 changed files with 73 additions and 0 deletions Show diff stats
cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java
cloud/dahua/src/main/java/com/example/dahua/service/UserOperateService.java
cloud/dahua/src/main/java/com/example/dahua/service/imp/BaseService.java
cloud/dahua/src/main/java/com/example/dahua/service/imp/UserOperateServiceImpl.java
cloud/dahua/src/main/java/com/example/dahua/xiananDao/SendRecordDao.java
@@ -91,4 +91,11 @@ public class UserOperateController {
                              @RequestParam(value = "deviceIds",required = false) String deviceIds){
         userOperateService.sendFaceByClassId(schoolId,classIds,deviceIds);
     }
+
+    @ApiOperation(value = "删除指定学校下无效人脸")
+    @RequestMapping(value = "deleteFaceByClassId", method = RequestMethod.POST)
+    public void exportFace(@RequestParam("schoolId") Integer schoolId,
+                           @RequestParam(value = "deviceIds",required = false) String deviceIds){
+        userOperateService.deleteFaceByClassId(schoolId,deviceIds);
+    }
 }
@@ -20,5 +20,7 @@ public interface UserOperateService {
      */
     void sendFaceByClassId(Integer schoolId,String classIds,String deviceIds);
  
+    void deleteFaceByClassId(Integer schoolId,String deviceIds);
+
     void test6(Integer schoolId,Integer roomId,Integer type,Integer outof,String intime,String clintId,String startTime,String endTime);
 }
@@ -145,4 +145,21 @@ public class BaseService {
                 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(StudentBean::getStudent_num))), ArrayList::new));
         return studentList;
     }
+
+    /**
+     * 获取指定学校下的学生卡信息
+     * @param schoolId
+     * @return
+     */
+    public List<SendRecordBean> getRecordCardBySchoolId(int schoolId) {
+        List<SendRecordBean> allStudents = new LinkedList<>();
+        List<SendRecordBean> students = sendRecordDao.getSendFaceSuccess(schoolId);
+        allStudents.addAll(students);
+        List<SendRecordBean> students2 = sendRecordDao.getFaceRecord(schoolId);
+        allStudents.addAll(students2);
+        //去重重复数据
+        List<SendRecordBean> studentList = allStudents.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(SendRecordBean::getNum))),ArrayList::new));
+        return studentList;
+    }
 }
 package com.example.dahua.service.imp;
  
+import com.example.dahua.MyTask;
+import com.example.dahua.bean.SendRecordBean;
 import com.example.dahua.bean.StudentBean;
 import com.example.dahua.bean.UserInfoBean;
 import com.example.dahua.dao.UserDao;
 import com.example.dahua.lib.CompressPic;
 import com.example.dahua.lib.FilePath;
+import com.example.dahua.lib.NetSDKLib;
+import com.example.dahua.module.GateModule2;
 import com.example.dahua.service.UserOperateService;
 import com.example.dahua.utils.DateFormatUtil;
 import com.example.dahua.utils.DateUtils;
@@ -175,4 +179,39 @@ public class UserOperateServiceImpl implements UserOperateService {
         String dateStr = DateUtils.date2String(afterDate,DateUtils.format3);
         return dateStr;
     }
+
+    @Override
+    public void deleteFaceByClassId(Integer schoolId,String deviceIds) {
+        //下发设备集合
+        List<String> deviceList = new ArrayList<>();
+        if(StringUtils.isEmpty(deviceIds)){
+            deviceList = userDao.selectDeviceBySchoolId(schoolId);
+        }else{
+            String[] deviceArr = deviceIds.split(",");
+            deviceList= new ArrayList<>(Arrays.asList(deviceArr));
+        }
+        List<SendRecordBean> students= baseService.getRecordCardBySchoolId(schoolId.intValue());
+        if(!CollectionUtils.isEmpty(students)){
+            for(SendRecordBean s : students){
+                String cardNum = s.getNum();
+                String userId = s.getUserId();
+                StudentBean studentBean = userDao.getStudentWithCard(cardNum,schoolId.intValue());
+                if(studentBean == null){
+                    deviceList.stream().forEach(deviceId->{
+                        int isOk = 1;
+                        //登录设备
+                        NetSDKLib.LLong loginHandleLong = MyTask.lLongSendMap.get(deviceId);
+                        if (loginHandleLong !=null) {
+                            isOk = GateModule2.deleteFace(userId,loginHandleLong);
+                        }
+                        if(isOk ==0){
+                            log.info("删除成功： 用户：{}, 卡号： {}， 设备：{}", s.getName(),cardNum,deviceId);
+                            //删除成功记录
+                            sendRecordDao.deleteRecordById(schoolId,deviceId,cardNum);
+                        }
+                    });
+                }
+            }
+        }
+    }
 }
@@ -30,6 +30,8 @@ public interface SendRecordDao {
     @Update("update Face_SendSuccess set time = #{time} where num = #{num} and deviceID = #{deviceID} ")
     void updateFaceSuccess(@Param("time") String time, @Param("deviceID") String clint_id, @Param("num") String num);
  
+    @Select("select * from Face_SendSuccess where schoolId = #{schoolId} ")
+    List<SendRecordBean> getSendFaceSuccess(@Param("schoolId") Integer schoolId);
  
     @Insert("insert into Face_SendFail values(#{deviceID},#{customerid},#{num},#{name},#{time},#{schoolName},#{imgPath},#{schoolId},#{failContent},#{failType},#{userType},#{deviceType})")
     void addFaceFail(@Param("customerid") String customerid, @Param("deviceID") String deviceID, @Param("num") String num, @Param("name") String name,
@@ -102,6 +104,9 @@ public interface SendRecordDao {
     @Update("delete from Face_SendRecord where id = #{id}")
     void deleteRecord(@Param("id") Integer id);
  
+    @Delete("delete Face_SendRecord where deviceID = #{deviceID} and Num = #{Num} and schoolId = #{schoolId}")
+    void deleteRecordById(@Param("schoolId") Integer schoolId,@Param("deviceID") String deviceID,@Param("Num") String Num);
+
     // ======================== 表 Face_SendRecord ========================
     @Select("select * from Face_SendRecord where schoolId = #{schoolId} and deviceID = #{deviceID} and Num = #{Num} and userId = #{userId}")
     List<SendRecordBean> getRecordIsExit(@Param("schoolId") Integer schoolId,@Param("deviceID") String deviceId, @Param("Num") String card,@Param("userId") String userId);
@@ -120,6 +125,9 @@ public interface SendRecordDao {
     @Select("select * from Face_SendRecord where schoolId = #{schoolId} and status =2")
     List<SendRecordBean> getFailRecord(@Param("schoolId") Integer schoolId);
  
+    @Select("select * from Face_SendRecord where schoolId = #{schoolId}")
+    List<SendRecordBean> getFaceRecord(@Param("schoolId") Integer schoolId);
+
     @Select("select count(*) from SZ_AttendanceRecordsSS202101 where school_id = #{schoolId} and card_num = #{cardNum} and card_type = #{cardType} and outof=#{outof} and intime > #{startTime} and intime < #{endTime} ")
     int getSSKaoQin(@Param("schoolId") Integer schoolId,@Param("cardNum") String cardNum,@Param("cardType") Integer cardType,@Param("outof") Integer outof,@Param("startTime") String startTime,@Param("endTime") String endTime);
...	...	@@ -91,4 +91,11 @@ public class UserOperateController {
91	91	@RequestParam(value = "deviceIds",required = false) String deviceIds){
92	92	userOperateService.sendFaceByClassId(schoolId,classIds,deviceIds);
93	93	}
	94	+
	95	+ @ApiOperation(value = "删除指定学校下无效人脸")
	96	+ @RequestMapping(value = "deleteFaceByClassId", method = RequestMethod.POST)
	97	+ public void exportFace(@RequestParam("schoolId") Integer schoolId,
	98	+ @RequestParam(value = "deviceIds",required = false) String deviceIds){
	99	+ userOperateService.deleteFaceByClassId(schoolId,deviceIds);
	100	+ }
94	101	}
...	...
...	...	@@ -20,5 +20,7 @@ public interface UserOperateService {
20	20	*/
21	21	void sendFaceByClassId(Integer schoolId,String classIds,String deviceIds);
22	22
	23	+ void deleteFaceByClassId(Integer schoolId,String deviceIds);
	24	+
23	25	void test6(Integer schoolId,Integer roomId,Integer type,Integer outof,String intime,String clintId,String startTime,String endTime);
24	26	}
...	...
...	...	@@ -145,4 +145,21 @@ public class BaseService {
145	145	Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(StudentBean::getStudent_num))), ArrayList::new));
146	146	return studentList;
147	147	}
	148	+
	149	+ /**
	150	+ * 获取指定学校下的学生卡信息
	151	+ * @param schoolId
	152	+ * @return
	153	+ */
	154	+ public List<SendRecordBean> getRecordCardBySchoolId(int schoolId) {
	155	+ List<SendRecordBean> allStudents = new LinkedList<>();
	156	+ List<SendRecordBean> students = sendRecordDao.getSendFaceSuccess(schoolId);
	157	+ allStudents.addAll(students);
	158	+ List<SendRecordBean> students2 = sendRecordDao.getFaceRecord(schoolId);
	159	+ allStudents.addAll(students2);
	160	+ //去重重复数据
	161	+ List<SendRecordBean> studentList = allStudents.stream().collect(Collectors.collectingAndThen(
	162	+ Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(SendRecordBean::getNum))),ArrayList::new));
	163	+ return studentList;
	164	+ }
148	165	}
...	...
1	1	package com.example.dahua.service.imp;
2	2
	3	+import com.example.dahua.MyTask;
	4	+import com.example.dahua.bean.SendRecordBean;
3	5	import com.example.dahua.bean.StudentBean;
4	6	import com.example.dahua.bean.UserInfoBean;
5	7	import com.example.dahua.dao.UserDao;
6	8	import com.example.dahua.lib.CompressPic;
7	9	import com.example.dahua.lib.FilePath;
	10	+import com.example.dahua.lib.NetSDKLib;
	11	+import com.example.dahua.module.GateModule2;
8	12	import com.example.dahua.service.UserOperateService;
9	13	import com.example.dahua.utils.DateFormatUtil;
10	14	import com.example.dahua.utils.DateUtils;
...	...	@@ -175,4 +179,39 @@ public class UserOperateServiceImpl implements UserOperateService {
175	179	String dateStr = DateUtils.date2String(afterDate,DateUtils.format3);
176	180	return dateStr;
177	181	}
	182	+
	183	+ @Override
	184	+ public void deleteFaceByClassId(Integer schoolId,String deviceIds) {
	185	+ //下发设备集合
	186	+ List<String> deviceList = new ArrayList<>();
	187	+ if(StringUtils.isEmpty(deviceIds)){
	188	+ deviceList = userDao.selectDeviceBySchoolId(schoolId);
	189	+ }else{
	190	+ String[] deviceArr = deviceIds.split(",");
	191	+ deviceList= new ArrayList<>(Arrays.asList(deviceArr));
	192	+ }
	193	+ List<SendRecordBean> students= baseService.getRecordCardBySchoolId(schoolId.intValue());
	194	+ if(!CollectionUtils.isEmpty(students)){
	195	+ for(SendRecordBean s : students){
	196	+ String cardNum = s.getNum();
	197	+ String userId = s.getUserId();
	198	+ StudentBean studentBean = userDao.getStudentWithCard(cardNum,schoolId.intValue());
	199	+ if(studentBean == null){
	200	+ deviceList.stream().forEach(deviceId->{
	201	+ int isOk = 1;
	202	+ //登录设备
	203	+ NetSDKLib.LLong loginHandleLong = MyTask.lLongSendMap.get(deviceId);
	204	+ if (loginHandleLong !=null) {
	205	+ isOk = GateModule2.deleteFace(userId,loginHandleLong);
	206	+ }
	207	+ if(isOk ==0){
	208	+ log.info("删除成功：用户：{}, 卡号： {}，设备：{}", s.getName(),cardNum,deviceId);
	209	+ //删除成功记录
	210	+ sendRecordDao.deleteRecordById(schoolId,deviceId,cardNum);
	211	+ }
	212	+ });
	213	+ }
	214	+ }
	215	+ }
	216	+ }
178	217	}
...	...
...	...	@@ -30,6 +30,8 @@ public interface SendRecordDao {
30	30	@Update("update Face_SendSuccess set time = #{time} where num = #{num} and deviceID = #{deviceID} ")
31	31	void updateFaceSuccess(@Param("time") String time, @Param("deviceID") String clint_id, @Param("num") String num);
32	32
	33	+ @Select("select * from Face_SendSuccess where schoolId = #{schoolId} ")
	34	+ List<SendRecordBean> getSendFaceSuccess(@Param("schoolId") Integer schoolId);
33	35
34	36	@Insert("insert into Face_SendFail values(#{deviceID},#{customerid},#{num},#{name},#{time},#{schoolName},#{imgPath},#{schoolId},#{failContent},#{failType},#{userType},#{deviceType})")
35	37	void addFaceFail(@Param("customerid") String customerid, @Param("deviceID") String deviceID, @Param("num") String num, @Param("name") String name,
...	...	@@ -102,6 +104,9 @@ public interface SendRecordDao {
102	104	@Update("delete from Face_SendRecord where id = #{id}")
103	105	void deleteRecord(@Param("id") Integer id);
104	106
	107	+ @Delete("delete Face_SendRecord where deviceID = #{deviceID} and Num = #{Num} and schoolId = #{schoolId}")
	108	+ void deleteRecordById(@Param("schoolId") Integer schoolId,@Param("deviceID") String deviceID,@Param("Num") String Num);
	109	+
105	110	// ======================== 表 Face_SendRecord ========================
106	111	@Select("select * from Face_SendRecord where schoolId = #{schoolId} and deviceID = #{deviceID} and Num = #{Num} and userId = #{userId}")
107	112	List<SendRecordBean> getRecordIsExit(@Param("schoolId") Integer schoolId,@Param("deviceID") String deviceId, @Param("Num") String card,@Param("userId") String userId);
...	...	@@ -120,6 +125,9 @@ public interface SendRecordDao {
120	125	@Select("select * from Face_SendRecord where schoolId = #{schoolId} and status =2")
121	126	List<SendRecordBean> getFailRecord(@Param("schoolId") Integer schoolId);
122	127
	128	+ @Select("select * from Face_SendRecord where schoolId = #{schoolId}")
	129	+ List<SendRecordBean> getFaceRecord(@Param("schoolId") Integer schoolId);
	130	+
123	131	@Select("select count(*) from SZ_AttendanceRecordsSS202101 where school_id = #{schoolId} and card_num = #{cardNum} and card_type = #{cardType} and outof=#{outof} and intime > #{startTime} and intime < #{endTime} ")
124	132	int getSSKaoQin(@Param("schoolId") Integer schoolId,@Param("cardNum") String cardNum,@Param("cardType") Integer cardType,@Param("outof") Integer outof,@Param("startTime") String startTime,@Param("endTime") String endTime);
125	133
...	...