feat: 修改测试工号

guzijian
1 parent e93c7f0e
Showing 5 changed files with 80 additions and 8 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/TempCache.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/application-druid-dev.yml
+package com.ruoyi.common.cache;
+
+
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class TempCache {
+    private static ConcurrentHashMap<String, Boolean> map = null;
+
+    static {
+        map = new ConcurrentHashMap<>();
+        map.put("620001", true);
+        map.put("620002", true);
+        map.put("700001", true);
+        map.put("722717", true);
+    }
+
+    /**
+     * false 代表签到
+     *
+     * @param jobCode
+     * @return
+     */
+    public static Boolean querySignStatus(String jobCode) {
+        return map.get(jobCode);
+    }
+
+    public static void updateSignStatus(String jobCode) {
+        map.put(jobCode, !map.get(jobCode));
+    }
+
+    /**
+     * 是否测试工号
+     *
+     * @param jobCode
+     * @return
+     */
+    public static Boolean checkJobCodeExist(String jobCode) {
+        return !Objects.isNull(map.get(jobCode));
+    }
+
+    public static void resetMapStatus() {
+        map.put("620001", true);
+        map.put("620002", true);
+        map.put("700001", true);
+        map.put("722717", true);
+    }
+}
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
+import com.ruoyi.common.cache.TempCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -380,20 +381,32 @@ public class DriverServiceImpl implements IDriverService {
         for (Driver item : drivers) {
             dto = schedulingService.queryScheduling(item.getJobCode(), now);
             DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
-            // TODO 针对指定用户操作
-            if (item.getJobCode().equals("722717") || item.getJobCode().equals("700001")) {
-                if (!CollectionUtil.isEmpty(dto) && vo.getPlanAction().equals(SIGN_IN_STRING)) {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
-                } else if (!CollectionUtil.isEmpty(dto)) {
+            // TODO 针对指定用户测试操作
+            if (TempCache.checkJobCodeExist(item.getJobCode())) {
+                if (!CollectionUtil.isEmpty(dto)) {
+                    vo.setPlanAction(TempCache.querySignStatus(item.getJobCode()) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING);
+                    vo.setCheckAlcohol(TempCache.querySignStatus(item.getJobCode()));
+//                    vo.setCheckAlcohol(false);
                     vos.add(vo);
-                } else {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
+                }
+//                if (!CollectionUtil.isEmpty(dto) && vo.getPlanAction().equals(SIGN_IN_STRING)) {
+//                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
+//                }
+//                else if (!CollectionUtil.isEmpty(dto)) {
+//                    vos.add(vo);
+//                }
+                else {
+                    vos.add(DriverResponseVo.createDriverResponseVo(null, item,
+                            TempCache.querySignStatus(item.getJobCode()) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING,
+                            needCheckAlcoholDevice ? TempCache.querySignStatus(item.getJobCode()) : false,
+//                            false,
+                            true, "测试", "测试", "测试"));
                 }
                 // 上面可删除
             } else {
                 // 无排班 工种是驾驶员需要酒测
                 if (Objects.isNull(vo)) {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, "驾驶员".equals(item.getPosts()), false, "", "", ""));
+                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, DRIVER_STRING.equals(item.getPosts()), false, "", "", ""));
                 } else {
                     // 特定设备是无需酒精测试的
                     vo.setCheckAlcohol(needCheckAlcoholDevice ? vo.getCheckAlcohol() : false);
@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
+import com.ruoyi.common.cache.TempCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -173,6 +174,10 @@ public class SignInServiceImpl implements ISignInService {
         // 更新考勤
         schedulingService.computedSignInBySignIn(dto, signIn, globalIndex);
  
+        if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
+            TempCache.updateSignStatus(signIn.getJobCode());
+        }
+
         // 异常保存到异常异常中
         threadJobService.asyncInsertExceptionRecord(signIn, driver, dto, globalIndex);
  
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.cache.NowSchedulingCache;
+import com.ruoyi.common.cache.TempCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.common.utils.DateUtils;
@@ -407,6 +408,8 @@ public class ThreadJobService {
             log.info("已有数据,当天排班数据长度：{}", originSchedulingMap.size());
             return;
         }
+        // TODO maybe delete
+        TempCache.resetMapStatus();
         List<DriverScheduling> bcList = getBcList(originSchedulingMap);
  
         // 处理非司售人员的排班明细
+
 # 数据源配置
 spring:
     # 邮箱配置
@@ -179,3 +180,5 @@ api:
             url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 log:
     path: D:/ruoyi/logs
+server:
+    port: 8100