Merge branch 'pre'

src/main/java/com/xjrsoft/module/hikvision/util/DataUtil.java

@@ -287,8 +287,9 @@ public class DataUtil {
             paramJson.addProperty("birthday", objectMap.get("birthday")==null?"":objectMap.get("birthday").toString());
             paramJson.addProperty("personType", 2);
 
-            int gender;
-            switch (objectMap.get("gender").toString()) {
+            int gender = 0;
+            String genderData = objectMap.get("gender") == null ? "" : objectMap.get("gender").toString();
+            switch (genderData) {
                 case "SB10001":
                     gender = 1;
                     break;

src/main/java/com/xjrsoft/module/job/AttenDanceWarnNoticeTask.java

@@ -59,7 +59,7 @@ public class AttenDanceWarnNoticeTask {
     @Autowired
     private IWechatMessageLogService wechatMessageLogService;
 
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 */1 * * * ?")
     public void RefreshConnectionPool() {
         String active = SpringUtil.getActiveProfile();
         if("dev".equals(active)){
@@ -101,7 +101,7 @@ public class AttenDanceWarnNoticeTask {
 
         //获取最近的时间
         LocalDateTime recentlyTime = getRecentlyTime(ruleDetailsList, now);
-        if(recentlyTime.getHour() != now.getHour() && Math.abs(recentlyTime.getMinute() - now.getMinute()) <= 2){
+        if(recentlyTime.getHour() != now.getHour() && Math.abs(recentlyTime.getMinute() - now.getMinute()) >= 2){
             log.info("未到时间，不进行推送");
             return;
         }
@@ -249,19 +249,35 @@ public class AttenDanceWarnNoticeTask {
                     && ruleDetail.getIsAttendance() != null && ruleDetail.getIsAttendance() == 1){
                 if(ruleDetail.getAmStartTime() != null){
                     LocalDateTime amStartTime = now.with(ruleDetail.getAmStartTime().toLocalTime());
-                    result.add(amStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
-                    result.add(amStartTime.plusMinutes(ruleDetail.getOverMinutes()));
+                    if(ruleDetail.getAgoMinutes() != null){
+                        result.add(amStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
+                    }
+
+                    if(ruleDetail.getOverMinutes() != null){
+                        result.add(amStartTime.plusMinutes(ruleDetail.getOverMinutes()));
+                    }
+
                 }
                 if(ruleDetail.getPmStartTime() != null){
                     LocalDateTime pmStartTime = now.with(ruleDetail.getPmStartTime().toLocalTime());
-                    result.add(pmStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
-                    result.add(pmStartTime.plusMinutes(ruleDetail.getOverMinutes()));
+                    if(ruleDetail.getAgoMinutes() != null){
+                        result.add(pmStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
+                    }
+
+                    if(ruleDetail.getOverMinutes() != null){
+                        result.add(pmStartTime.plusMinutes(ruleDetail.getOverMinutes()));
+                    }
                 }
 
                 if(ruleDetail.getEveningStartTime() != null){
                     LocalDateTime eveningStartTime = now.with(ruleDetail.getEveningStartTime().toLocalTime());
-                    result.add(eveningStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
-                    result.add(eveningStartTime.plusMinutes(ruleDetail.getOverMinutes()));
+                    if(ruleDetail.getAgoMinutes() != null){
+                        result.add(eveningStartTime.plusMinutes(- ruleDetail.getAgoMinutes()));
+                    }
+
+                    if(ruleDetail.getOverMinutes() != null){
+                        result.add(eveningStartTime.plusMinutes(ruleDetail.getOverMinutes()));
+                    }
                 }
             }
         }

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -106,19 +106,6 @@ public class AttendanceMessageTask {
         }
         //查询今天的考勤规则
         List<AttendanceRuleDetails> ruleDetails = ruleCategoryService.getTodayRules();
-
-
-//        WechatMessageLog log = wechatMessageLogService.getOne(
-//                new QueryWrapper<WechatMessageLog>().lambda()
-//                        .select(WechatMessageLog.class, x -> VoToColumnUtil.fieldsToColumns(WechatMessageLog.class).contains(x.getProperty()))
-//                        .eq(WechatMessageLog::getSendTime, recentlyTime)
-//                        .eq(WechatMessageLog::getTemplateId, wechatTemplate)
-//        );
-//        if(log != null){//已经推送过，不再进行推送
-//            return;
-//        }
-
-
         List<AttendanceMessageSet> list = messageSetService.list();
         //判断是上午还是下午
         Integer timePeriod = null;
@@ -142,16 +129,6 @@ public class AttendanceMessageTask {
         //查询需要通知的人
 
         for (AttendanceMessageSet messageSet : list) {
-            List<XjrUser> userList = userService.list(
-                new MPJLambdaWrapper<XjrUser>().distinct()
-                .select(XjrUser::getId)
-                .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
-                .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                .leftJoin(AttendanceMessageUserRelation.class, AttendanceMessageUserRelation::getUserId, XjrUser::getId)
-                .in(UserRoleRelation::getRoleId, roleTypes)
-                .eq(AttendanceMessageUserRelation::getAttendanceMessageSetId, messageSet.getId())
-            );
-
             LocalDateTime recentlyTime = null;
             String characterKey = "character_string18";
             String wechatTemplate = weChatUtil.getAttendanceMsgLateTemplate();
@@ -160,16 +137,34 @@ public class AttendanceMessageTask {
                 characterKey = "character_string18";
                 //获取最近的时间
                 recentlyTime = getRecentlyTime(ruleDetails, now);
-                if(!recentlyTime.isEqual(now)){
-                    log.info("未到时间，不需要提醒");
+                if(recentlyTime.getHour() != now.getHour() && Math.abs(recentlyTime.getMinute() - now.getMinute()) >= 2){
+                    log.info("未到时间，不进行推送");
+                    continue;
+                }
+                long count = wechatMessageLogService.count(
+                        new QueryWrapper<WechatMessageLog>().lambda()
+                                .eq(WechatMessageLog::getSendTime, recentlyTime)
+                                .eq(WechatMessageLog::getTemplateId, wechatTemplate)
+                );
+                if(count > 0){//已经推送过，不再进行推送
+                    log.info("已推送过，不进行推送");
                     continue;
                 }
             }else if(messageSet.getMessageCategory() != null && messageSet.getMessageCategory() == 3){
                 wechatTemplate = weChatUtil.getAttendanceMsgAbsenceTemplate();
                 recentlyTime = getRecentlyOverTime(ruleDetails, now);
                 characterKey = "character_string36";
-                if(!recentlyTime.isEqual(now)){
-                    log.info("未到时间，不需要提醒");
+                if(recentlyTime.getHour() != now.getHour() && Math.abs(recentlyTime.getMinute() - now.getMinute()) >= 2){
+                    log.info("未到时间，不进行推送");
+                    continue;
+                }
+                long count = wechatMessageLogService.count(
+                        new QueryWrapper<WechatMessageLog>().lambda()
+                                .eq(WechatMessageLog::getSendTime, recentlyTime)
+                                .eq(WechatMessageLog::getTemplateId, wechatTemplate)
+                );
+                if(count > 0){//已经推送过，不再进行推送
+                    log.info("已推送过，不进行推送");
                     continue;
                 }
             }
@@ -178,6 +173,16 @@ public class AttendanceMessageTask {
                 continue;
             }
 
+            List<XjrUser> userList = userService.list(
+                    new MPJLambdaWrapper<XjrUser>().distinct()
+                            .select(XjrUser::getId)
+                            .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
+                            .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
+                            .leftJoin(AttendanceMessageUserRelation.class, AttendanceMessageUserRelation::getUserId, XjrUser::getId)
+                            .in(UserRoleRelation::getRoleId, roleTypes)
+                            .eq(AttendanceMessageUserRelation::getAttendanceMessageSetId, messageSet.getId())
+            );
+
             //没有需要通知的，直接跳过
             if(userList.isEmpty()){
                 continue;
@@ -189,7 +194,7 @@ public class AttendanceMessageTask {
             String format = recentlyTime.format(formatter);
 
             userCount += userList.size();
-            if(messageSet.getRoleType() != null && messageSet.getRoleType() == 2){
+            if(messageSet.getRoleType() != null && messageSet.getRoleType() == 1){
                 //教师总人数
                 long teacherCout = userService.count(
                         new MPJLambdaWrapper<XjrUser>()
@@ -235,9 +240,9 @@ public class AttendanceMessageTask {
                 for (XjrUser xjrUser : userList) {
                     weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
                     weChatSendMessageDto.setUserId(xjrUser.getOpenId());
-                    weChatService.sendTemplateMessage(weChatSendMessageDto);
+//                    weChatService.sendTemplateMessage(weChatSendMessageDto);
                 }
-            }else if(messageSet.getRoleType() != null && messageSet.getRoleType() == 3){
+            }else if(messageSet.getRoleType() != null && messageSet.getRoleType() == 2){
                 //教师总人数
                 long teacherCout = userService.count(
                         new MPJLambdaWrapper<XjrUser>()
@@ -280,7 +285,7 @@ public class AttendanceMessageTask {
                 for (XjrUser xjrUser : userList) {
                     weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
                     weChatSendMessageDto.setUserId(xjrUser.getOpenId());
-                    weChatService.sendTemplateMessage(weChatSendMessageDto);
+//                    weChatService.sendTemplateMessage(weChatSendMessageDto);
                 }
             }
 
@@ -334,16 +339,25 @@ public class AttendanceMessageTask {
             if(ruleDetail.getIsAllowInOutSchool() != null && ruleDetail.getIsAllowInOutSchool() == 1
                     && ruleDetail.getIsAttendance() != null && ruleDetail.getIsAttendance() == 1){
                 if(ruleDetail.getAmStartTime() != null){
-                    LocalDateTime amStartTime = now.with(ruleDetail.getAmStartTime().toLocalTime()).plusMinutes(ruleDetail.getOverMinutes());
+                    LocalDateTime amStartTime = now.with(ruleDetail.getAmStartTime().toLocalTime());
+                    if(ruleDetail.getOverMinutes() != null){
+                        amStartTime.plusMinutes(ruleDetail.getOverMinutes());
+                    }
                     result.add(amStartTime);
                 }
                 if(ruleDetail.getPmStartTime() != null){
-                    LocalDateTime pmStartTime = now.with(ruleDetail.getPmStartTime().toLocalTime()).plusMinutes(ruleDetail.getOverMinutes());
+                    LocalDateTime pmStartTime = now.with(ruleDetail.getPmStartTime().toLocalTime());
+                    if(ruleDetail.getOverMinutes() != null){
+                        pmStartTime.plusMinutes(ruleDetail.getOverMinutes());
+                    }
                     result.add(pmStartTime);
                 }
 
                 if(ruleDetail.getEveningStartTime() != null){
-                    LocalDateTime eveningStartTime = now.with(ruleDetail.getEveningStartTime().toLocalTime()).plusMinutes(ruleDetail.getOverMinutes());
+                    LocalDateTime eveningStartTime = now.with(ruleDetail.getEveningStartTime().toLocalTime());
+                    if(ruleDetail.getOverMinutes() != null){
+                        eveningStartTime.plusMinutes(ruleDetail.getOverMinutes());
+                    }
                     result.add(eveningStartTime);
                 }
             }

src/main/java/com/xjrsoft/module/job/HikvisionBaseDataTask.java

@@ -6,7 +6,6 @@ import com.xjrsoft.common.utils.SqlRunnerAdapterUtil;
 import com.xjrsoft.module.hikvision.entity.HikvisionData;
 import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
 import com.xjrsoft.module.hikvision.util.DataUtil;
-import com.xjrsoft.module.teacher.mapper.FaceImportMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -25,8 +24,6 @@ import java.util.Set;
 @Component
 @Slf4j
 public class HikvisionBaseDataTask {
-    @Autowired
-    private FaceImportMapper faceImportMapper;
 
     @Autowired
     private HikvisionDataMapper hikvisionDataMapper;

src/main/java/com/xjrsoft/module/job/InsertOutInRecordTask.java

@@ -20,7 +20,7 @@ public class InsertOutInRecordTask {
 
     OutInRecordUtil out_in_recordUtil = new OutInRecordUtil();
 
-    @Scheduled(cron = "*/60 * * * * ?")
+    @Scheduled(cron = "* */60 * * * ?")
     public void RefreshConnectionPool() {
         String active = SpringUtil.getActiveProfile();
         if(!"prod".equals(active)){

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -409,6 +409,11 @@ public class UserController {
         List<String> processIds = historicProcessInstances.stream().map(HistoricProcessInstance::getId).collect(Collectors.toList());
         int myApplicationCount = 0;
         for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
+            Long countByProcessId = workflowExecuteService.getCountByProcessId(historicProcessInstance.getId());
+            if(countByProcessId == 0L){
+                continue;
+
+            }
             if (!ObjectUtil.isNotNull(historicProcessInstance.getEndTime())) {
                 myApplicationCount ++;
             }

src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java

@@ -163,7 +163,7 @@ public class StundentFaceProcessController {
     @ApiOperation(value = "删除学生人脸信息审核")
     @SaCheckPermission("stundentfaceprocess:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(stundentFaceProcessService.removeBatchByIds(ids));
+        return RT.ok(stundentFaceProcessService.removeByIds(ids));
     }
 
     @PostMapping(value = "/batch-import")

src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -148,7 +148,7 @@ public class TeacherFaceProcessController {
     @ApiOperation(value = "删除人脸信息审核")
     @SaCheckPermission("teacherfaceprocess:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(teacherFaceProcessService.removeBatchByIds(ids));
+        return RT.ok(teacherFaceProcessService.removeByIds(ids));
 
     }
 

src/main/java/com/xjrsoft/module/personnel/service/IStundentFaceProcessService.java

@@ -3,6 +3,8 @@ package com.xjrsoft.module.personnel.service;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
 
+import java.util.List;
+
 /**
 * @title: 学生人脸信息审核
 * @Author dzx
@@ -11,4 +13,6 @@ import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
 */
 
 public interface IStundentFaceProcessService extends MPJBaseService<StundentFaceProcess> {
+
+    Boolean removeByIds(List<Long> ids);
 }

src/main/java/com/xjrsoft/module/personnel/service/ITeacherFaceProcessService.java

@@ -3,6 +3,8 @@ package com.xjrsoft.module.personnel.service;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
 
+import java.util.List;
+
 /**
 * @title: 人脸信息审核
 * @Author dzx
@@ -11,4 +13,6 @@ import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
 */
 
 public interface ITeacherFaceProcessService extends MPJBaseService<TeacherFaceProcess> {
+
+    Boolean removeByIds(List<Long> ids);
 }

src/main/java/com/xjrsoft/module/personnel/service/impl/StundentFaceProcessServiceImpl.java

@@ -1,12 +1,23 @@
 package com.xjrsoft.module.personnel.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.google.gson.JsonObject;
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
+import com.xjrsoft.module.hikvision.util.ApiUtil;
+import com.xjrsoft.module.personnel.entity.FaceManagement;
 import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
 import com.xjrsoft.module.personnel.mapper.StundentFaceProcessMapper;
+import com.xjrsoft.module.personnel.service.IFaceManagementService;
 import com.xjrsoft.module.personnel.service.IStundentFaceProcessService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
 * @title: 学生人脸信息审核
 * @Author dzx
@@ -16,4 +27,41 @@ import org.springframework.stereotype.Service;
 @Service
 @AllArgsConstructor
 public class StundentFaceProcessServiceImpl extends MPJBaseServiceImpl<StundentFaceProcessMapper, StundentFaceProcess> implements IStundentFaceProcessService {
+
+    private final HikvisionDataMapper hikvisionDataMapper;
+
+    private final IFaceManagementService faceManagementService;
+
+
+    //删除人脸后，移除海康那边的人脸
+    @Override
+    public Boolean removeByIds(List<Long> ids) {
+        List<StundentFaceProcess> list = this.baseMapper.selectBatchIds(ids);
+        ApiUtil apiUtil = new ApiUtil();
+        String apiPath = "/api/resource/v1/face/single/delete";
+        for (StundentFaceProcess process : list) {
+            String studentHikvisionId = hikvisionDataMapper.getStudentHikvisionId(process.getUserId());
+
+            JsonObject paramJson = new JsonObject();
+            paramJson.addProperty("faceId", studentHikvisionId);
+
+            String result = apiUtil.doPost(apiPath, paramJson.toString(), null);
+            process.setExamStatus(2);
+            process.setHikvisionResult(result);
+            process.setDeleteMark(DeleteMark.DELETED.getCode());
+            process.setModifyUserId(StpUtil.getLoginIdAsLong());
+            process.setModifyDate(new Date());
+            this.baseMapper.updateById(process);
+
+            FaceManagement faceManagement = faceManagementService.getOne(
+                    new QueryWrapper<FaceManagement>().lambda()
+                            .eq(FaceManagement::getUserId, process.getUserId())
+                            .eq(FaceManagement::getFileId, process.getFacePhoto())
+            );
+
+            faceManagement.setRegisterBase64(null);
+            faceManagementService.update(faceManagement);
+        }
+        return true;
+    }
 }

src/main/java/com/xjrsoft/module/personnel/service/impl/TeacherFaceProcessServiceImpl.java

@@ -1,12 +1,23 @@
 package com.xjrsoft.module.personnel.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.google.gson.JsonObject;
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
+import com.xjrsoft.module.hikvision.util.ApiUtil;
+import com.xjrsoft.module.personnel.entity.FaceManagement;
 import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
 import com.xjrsoft.module.personnel.mapper.TeacherFaceProcessMapper;
+import com.xjrsoft.module.personnel.service.IFaceManagementService;
 import com.xjrsoft.module.personnel.service.ITeacherFaceProcessService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
 * @title: 人脸信息审核
 * @Author dzx
@@ -16,4 +27,40 @@ import org.springframework.stereotype.Service;
 @Service
 @AllArgsConstructor
 public class TeacherFaceProcessServiceImpl extends MPJBaseServiceImpl<TeacherFaceProcessMapper, TeacherFaceProcess> implements ITeacherFaceProcessService {
+    private final HikvisionDataMapper hikvisionDataMapper;
+
+    private final IFaceManagementService faceManagementService;
+
+
+    //删除人脸后，移除海康那边的人脸
+    @Override
+    public Boolean removeByIds(List<Long> ids) {
+        List<TeacherFaceProcess> list = this.baseMapper.selectBatchIds(ids);
+        ApiUtil apiUtil = new ApiUtil();
+        String apiPath = "/api/resource/v1/face/single/delete";
+        for (TeacherFaceProcess process : list) {
+            String studentHikvisionId = hikvisionDataMapper.getStudentHikvisionId(process.getUserId());
+
+            JsonObject paramJson = new JsonObject();
+            paramJson.addProperty("faceId", studentHikvisionId);
+
+            String result = apiUtil.doPost(apiPath, paramJson.toString(), null);
+            process.setExamStatus(2);
+            process.setHikvisionResult(result);
+            process.setDeleteMark(DeleteMark.DELETED.getCode());
+            process.setModifyUserId(StpUtil.getLoginIdAsLong());
+            process.setModifyDate(new Date());
+            this.baseMapper.updateById(process);
+
+            FaceManagement faceManagement = faceManagementService.getOne(
+                    new QueryWrapper<FaceManagement>().lambda()
+                            .eq(FaceManagement::getUserId, process.getUserId())
+                            .eq(FaceManagement::getFileId, process.getFacePhoto())
+            );
+
+            faceManagement.setRegisterBase64(null);
+            faceManagementService.update(faceManagement);
+        }
+        return true;
+    }
 }

src/main/java/com/xjrsoft/module/workflow/service/IWorkflowExecuteService.java

@@ -459,4 +459,5 @@ public interface IWorkflowExecuteService {
 
     List<UserDefinedProcessRecordListVo> listAuditApproveRecord(ApproveRecordListDto dto);
 
+    Long getCountByProcessId(String processId);
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -13,6 +13,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Session;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6107,6 +6108,14 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         return userDefinedProcessRecordListVos;
     }
 
+    @Override
+    public Long getCountByProcessId(String processId) {
+        return xjrWorkflowExtraMapper.selectCount(
+                new QueryWrapper<WorkflowExtra>().lambda()
+                        .eq(WorkflowExtra::getProcessId, processId)
+        );
+    }
+
     /**
      * 获取上一节点信息
      * 分两种情况：

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环境 dev|pre|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8