fix: 修改配置文件，修改签到返回内容

guzijian
1 parent e26e27bf
Showing 6 changed files with 21 additions and 10 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ConstSignInConstSignInProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/ErrorTypeProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
@@ -53,6 +53,7 @@ public interface ConstSignInConstSignInProperties {
     String SIGN_IN_SUCCESS_STRING = "签到成功";
     Integer SIGN_IN_SUCCESS = 1;
+    String SIGN_OUT_SUCCESS_STRING = "签退成功";
     String SIGN_IN_FAIL_STRING = "签到异常";
     Integer SIGN_IN_FAIL = 2;
     /**
@@ -5,6 +5,7 @@ package com.ruoyi.common;
  */
 public interface ErrorTypeProperties {
     String SIGN_IN_ERROR = "签到异常";
+    String SIGN_OUT_ERROR = "签退异常";
     String EQUIPMENT_ERROR = "设备异常";
     String ALCOHOL_SIGN_IN_ERROR = "酒精测试超标,";
     String WORK_DAY_ERROR = "当天没有排班,";
@@ -42,7 +42,7 @@ public class SchedulingCache {
     public SchedulingCache() {
         log.info("项目启动加载中获取实时班次-----");
-//        schedulingInit();
+        schedulingInit();
     }
@@ -223,7 +223,7 @@ public class SignInServiceImpl implements ISignInService {
         schedulingService.computedSignInBySignIn(dto, signIn, globalIndex);
         // 异常保存到异常异常中
-        threadJobService.asyncInsertExceptionRecord(signIn,driver,dto,globalIndex);
+        threadJobService.asyncInsertExceptionRecord(signIn, driver, dto, globalIndex);
         // 驾驶人员二次签到酒精测试异常
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
@@ -232,7 +232,18 @@ public class SignInServiceImpl implements ISignInService {
                 return result;
             }
         }
-        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.success(SIGN_IN_ERROR + ":" + signIn.getRemark(), vo);
+        if (SIGN_IN_SUCCESS.equals(signIn.getStatus())) {
+            if (signIn.getType().equals(SIGN_OUT)) {
+                return AjaxResult.success(SIGN_OUT_SUCCESS_STRING, vo);
+            } else {
+                return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
+            }
+        } else {
+            if (signIn.getType().equals(SIGN_OUT)) {
+                return AjaxResult.success(SIGN_OUT_ERROR + ":" + signIn.getRemark(), vo);
+            }
+            return AjaxResult.success(SIGN_IN_ERROR + ":" + signIn.getRemark(), vo);
+        }
     }
     @Override
@@ -288,7 +299,7 @@ public class SignInServiceImpl implements ISignInService {
         return nextDay.format(formatter);
     }
-    private String transFormDate(String dateString){
+    private String transFormDate(String dateString) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         LocalDate parse = LocalDate.parse(dateString, formatter);
         DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -311,7 +322,7 @@ public class SignInServiceImpl implements ISignInService {
             for (SignInResponseVo sign : value) {
                 GlobalIndex globalIndex = new GlobalIndex();
                 checkSignIn(sign.getCreateTime().getTime(), resultMap.get(sign.getJobCode()), globalIndex, sign, drivers.get(sign.getJobCode()));
-                schedulingService.computedSignInBySignIn(resultMap.get(sign.getJobCode()),sign,globalIndex);
+                schedulingService.computedSignInBySignIn(resultMap.get(sign.getJobCode()), sign, globalIndex);
             }
         }
     }
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.domain.*;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.num.domain.RuleNum;
@@ -150,7 +151,8 @@ public class AttendanceServiceImpl implements AttendanceService {
         PageUtils.startPage();
         List<RuleAttendanceMain> list = attendanceMainService.list(new QueryWrapper<RuleAttendanceMain>()
                 .lambda()
-                .eq(RuleAttendanceMain::getSchedulingDate, vo.getDate()));
+                .eq(RuleAttendanceMain::getSchedulingDate, vo.getDate())
+                .eq(StringUtils.isNotEmpty(vo.getJocCode()),RuleAttendanceMain::getJobCode,vo.getJocCode()));
         return list;
     }
@@ -20,10 +20,6 @@ spring:
                       enable: true
                   socketFactory:
                       class: javax.net.ssl.SSLSocketFactory
-
-
-
-
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver