fix: 新增执行日志

guzijian
1 parent db35f26f
Showing 11 changed files with 71 additions and 31 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ConstEquipmentProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/ConstSignInConstSignInProperties.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/application-druid-uat.yml
ruoyi-admin/src/main/resources/logback.xml
@@ -5,6 +5,9 @@ package com.ruoyi.common;
  * @author 20412
  */
 public interface ConstEquipmentProperties {
+    /**
+     * 设备健康
+     */
     Integer EQUIPMENT_STATUS_HEALTH = 1;
     /**
      * 设备异常
@@ -19,7 +22,7 @@ public interface ConstEquipmentProperties {
      */
     Integer EQUIPMENT_PROCESS_FLOW_ACTIVE = 3;
     /**
-     * 处理王城
+     * 处理完成
      */
     Integer EQUIPMENT_PROCESS_FLOW_COMPLETE = 3;
 }
@@ -6,6 +6,18 @@ package com.ruoyi.common;
  */
 public interface ConstSignInConstSignInProperties {
     /**
+     * 未完成人脸注册
+     */
+    Integer SIGN_FACE_ACTIVE = 2;
+    /**
+     * 人脸过期更新中
+     */
+    Integer SIGN_FACE_TIMEOUT = 1;
+    /**
+     * 已完成人脸注册
+     */
+    Integer SIGN_FACE_SUCCESS = 0;
+    /**
      * 导出图片
      */
     Integer EXPORT = 1;
@@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_FACE_ACTIVE;
 import static com.ruoyi.common.global.ResultCode.CODE_207;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
@@ -120,6 +121,7 @@ public class DriverServiceImpl implements IDriverService {
      */
     @Override
     public int insertDriver(Driver driver) {
+        driver.setUpdateTime(new Date());
         return driverMapper.insertDriver(driver);
     }
@@ -285,15 +287,7 @@ public class DriverServiceImpl implements IDriverService {
         // 查询当前人员信息库是否存在对应员工数据
         List<String> jobCodes = vo.getFaceDataList().stream().map(FaceUpdateReqVo.FaceData::getJobCode).collect(Collectors.toList());
         Map<String, String> existsSet = driverMapper.queryJobCodesIsExists(jobCodes).stream().collect(Collectors.toMap(item -> item, s -> s));
-        // 更新失败人员工号列表
-        List<String> insertDriverJobCodeList = new ArrayList<>();
-        for (String jobCode : jobCodes) {
-            if (Objects.isNull(existsSet.get(jobCode))) {
-                insertDriverJobCodeList.add(jobCode);
-            }
-        }
         jobCodes = new ArrayList<>(existsSet.values());
-
         List<Driver> updateDrivers = getDriversByJobCode(vo, date, existsSet, true);
         List<Driver> insertDrivers = getDriversByJobCode(vo, date, existsSet, false);
         List<List<Driver>> lists = ListUtils.splitList(updateDrivers, 400);
@@ -338,6 +332,7 @@ public class DriverServiceImpl implements IDriverService {
                 driver.setJobCode(item.getJobCode());
                 driver.setFleetName(item.getFleetName());
                 driver.setLineName(item.getLineName());
+                driver.setFaceSignIn(SIGN_FACE_ACTIVE);
                 try {
                     driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
                 } catch (IOException e) {
@@ -180,6 +180,7 @@ public class SignInServiceImpl implements ISignInService {
         SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
+        // 测试用户特殊处理
         if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")) {
             return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
         }
@@ -297,17 +298,21 @@ public class SignInServiceImpl implements ISignInService {
     }
     private static boolean driverCheckTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
-        LocalDateTime startTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getFcsjT());
-        LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(driver.size() - 1).getZdsjT());
-        LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
-        long morningBetween = ChronoUnit.MINUTES.between(startTime, signTime);
-        long afternoonBetween = ChronoUnit.MINUTES.between(endTime, signTime);
-        // 签到范围一小时内
-        if (Math.abs(morningBetween) <= 60 || Math.abs(afternoonBetween) <= 60) {
+        try {
+            LocalDateTime startTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getFcsjT());
+            LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(driver.size() - 1).getZdsjT());
+            LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
+            long morningBetween = ChronoUnit.MINUTES.between(startTime, signTime);
+            long afternoonBetween = ChronoUnit.MINUTES.between(endTime, signTime);
+            // 签到范围一小时内 TODO 不合理后续会更改
+            if (Math.abs(morningBetween) <= 60 || Math.abs(afternoonBetween) <= 60) {
+                return true;
+            } else {
+                signIn.setRemark(signIn.getRemark() + SIGN_IN_TIMEOUT);
+                return false;
+            }
+        } catch (Exception e) {
             return true;
-        } else {
-            signIn.setRemark(signIn.getRemark() + SIGN_IN_TIMEOUT);
-            return false;
         }
     }
@@ -92,15 +92,18 @@ public class DriverJob implements InitializingBean {
     /**
      * 通过该定时任务获取驾驶员信息 并保存到数据库
-     * 排班信息映射 不低于2小时更新一次
      */
     public void getDriverInfo(String params) throws Exception {
         try {
 //            String getDriverInfoUrl = String.format(GET_DRIVER_INFO_URL, params);
             //获取token
+            log.info("开始获取人事接口token");
             TokenResponseVo tokenVo = getToken(TOKEN_URL);
+            log.info("获取人事接口token完毕");
             // 获取驾驶员信息
+            log.info("开始获取驾驶员信息");
             getDrivers(tokenVo.getAccessToken());
+            log.info("获取驾驶员信息结束");
         } catch (Exception e) {
             log.info("执行失败：" + e.getMessage());
@@ -161,16 +164,21 @@ public class DriverJob implements InitializingBean {
      * 24小时执行一次
      */
     public void getSchedulingInfo() {
-        // 获取排班请求
         long timestamp = System.currentTimeMillis();
+        log.info("获取排班任务触发时间:{}",timestamp);
+        // 获取排班请求
         String getSchedulingInfoUrl = null;
+        String formatDate = ConstDateUtil.formatDate(timestamp);
+        log.info("开始获取{}的排班数据",formatDate);
         try {
-            getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", ConstDateUtil.formatDate("yyyyMMdd"), timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, ConstDateUtil.formatDate("yyyyMMdd"));
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate);
+
+        log.info("获取{}的排班数据完毕",formatDate);
     }
     /**
@@ -202,9 +210,9 @@ public class DriverJob implements InitializingBean {
             String jobCode = item.getJsy().split("/")[0];
             item.setJobCode(jobCode);
             if (Objects.isNull(driverSchedulingMap.get(jobCode))) {
-                List<ResponseScheduling> oneDriverSchedulings = new ArrayList<>();
-                oneDriverSchedulings.add(item);
-                driverSchedulingMap.put(jobCode, oneDriverSchedulings);
+                List<ResponseScheduling> oneDriverScheduling = new ArrayList<>();
+                oneDriverScheduling.add(item);
+                driverSchedulingMap.put(jobCode, oneDriverScheduling);
             } else {
                 driverSchedulingMap.get(jobCode).add(item);
             }
@@ -239,7 +247,9 @@ public class DriverJob implements InitializingBean {
     }
     private static void updateDrivers(List<Driver> drivers) {
+        log.info("开始更新人脸注册状态");
         DRIVER_SERVICE.updateDrivers(drivers);
+        log.info("更新人脸注册状态完毕");
     }
     private static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
@@ -122,7 +122,7 @@ public class ThreadJobService {
     }
     private void insertDriverInfo(String token, Driver driver) {
-        String headImageUrl = new String(driver.getImage());
+        String headImageUrl = driver.getImage();
         // 生成文件路径
         String fileName = driver.getJobCode() + ".png";
         String filePath = RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName;
@@ -11,6 +11,15 @@ public class ConstDateUtil {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(str);
         return simpleDateFormat.format(new Date());
     }
+    public static String formatDate(long time){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        return simpleDateFormat.format(new Date(time));
+    }
+    public static String formatDate(Date date){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        return simpleDateFormat.format(date);
+    }
+
     public static LocalDateTime getLocalDateTimeByLongTime(long time){
         Instant instant = Instant.ofEpochMilli(time);
@@ -153,4 +153,6 @@ api:
             appKey: dingsclwvxui5zilg1xk
             appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
         people:
-            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 \ No newline at end of file
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+    path: D:/ruoyi/logs
@@ -177,4 +177,6 @@ api:
             appKey: dingsclwvxui5zilg1xk
             appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
         people:
-            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 \ No newline at end of file
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+    path: E:/ruoyi/logs
 \ No newline at end of file
@@ -173,4 +173,6 @@ api:
       appKey: dingsclwvxui5zilg1xk
       appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
     people:
-      url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 \ No newline at end of file
+      url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+  path: /home/ruoyi/logs
 \ No newline at end of file
@@ -3,7 +3,7 @@
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="E:/ruoyi/logs" />-->
 <!--	<property name="log.path" value="D:/ruoyi/logs" />-->
-	<property name="log.path" value="/home/ruoyi/logs" />
+    <springProperty scope="context" name="log.path" source="log.path"/>
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />