feat: 金高配置修改

guzijian
1 parent 75daf5b4
Showing 7 changed files with 25 additions and 50 deletions
Bsth-admin/src/main/java/com/ruoyi/BsthApplication.java
Bsth-admin/src/main/java/com/ruoyi/BsthServletInitializer.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.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/resources/application-druid-prd.yml
Bsth-admin/src/main/resources/logback.xml
@@ -31,7 +31,7 @@ public class BsthApplication {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         ConfigurableApplicationContext app = SpringApplication.run(BsthApplication.class, args);
         Environment env = app.getEnvironment();
-        log.info("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        log.info("(♥◠‿◠)ﾉﾞ  一体机后台启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
                 " | ( ' )  |       \\  _. /  '       \n" +
@@ -23,22 +23,4 @@ public class BsthServletInitializer extends SpringBootServletInitializer
     {
         return application.sources(BsthApplication.class);
     }
-
-    // 测试方法
-    public static void main(String[] args) {
-        RestTemplate restTemplate = new RestTemplate();
-        String url = "http://1.14.107.94:8100/driver/driver";
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization", "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImNhOGRhOGJlLWQ0ZjItNDhjMy05ZWU1LWJkMDQzYzY3YzQ0MyJ9.79b8JM31faxhLnIqu6xGtrx1JK019NoN26AwNfPzptYSriHSTABdYp16kzKD538wo2HfXhYoviSqy4qZfoEV5Q");
-        Map<String, String> requestBody = new HashMap<>();
-        requestBody.put("jobCode", "asdfasd");
-        requestBody.put("personnelName", "asdfasdf");
-
-        HttpEntity<Map<String, String>> entity = new HttpEntity<>(requestBody, headers);
-
-        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
-
-        String responseBody = response.getBody();
-        System.out.println(responseBody);
-    }
 }
@@ -29,7 +29,7 @@ public class NowSchedulingCache {
         this.schedulingMapper = driverSchedulingMapper;
         this.errorJobcodeService = errorJobcodeService;
         log.info("项目启动加载中获取排班表-----");
-        cacheNowDaySchedulingInit();
+//        cacheNowDaySchedulingInit();
     }
     private void cacheNowDaySchedulingInit() {
@@ -352,23 +352,13 @@ public class DriverServiceImpl implements IDriverService {
             dto = schedulingService.queryScheduling(item.getJobCode(), now);
             DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
             // 针对指定用户操作
-            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)) {
-                    vos.add(vo);
-                } else {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
-                }
+            // 无排班
+            if (Objects.isNull(vo)) {
+                vos.add(DriverResponseVo.createDriverResponseVo(null, item, "签到", needCheckAlcoholDevice, false, "", "", ""));
             } else {
-                // 无排班
-                if (Objects.isNull(vo)) {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, false, false, "", "", ""));
-                } else {
-                    // 特定设备是无需酒精测试的
-                    vo.setCheckAlcohol(needCheckAlcoholDevice ? vo.getCheckAlcohol() : false);
-                    vos.add(vo);
-                }
+                // 特定设备是无需酒精测试的
+                vo.setCheckAlcohol(needCheckAlcoholDevice);
+                vos.add(vo);
             }
         }
         return vos;
@@ -381,14 +371,14 @@ public class DriverServiceImpl implements IDriverService {
      * @return
      */
     public static boolean doCheckDevice(String deviceId) {
-        if (StringUtil.isEmpty(deviceId)) {
-            return true;
-        }
-        int num = Integer.parseInt(deviceId);
-        if (num < 101) {
-            return true;
-        }
-        return false;
+//        if (StringUtil.isEmpty(deviceId)) {
+//            return true;
+//        }
+//        int num = Integer.parseInt(deviceId);
+//        if (num < 101) {
+//            return true;
+//        }
+        return true;
     }
     private DriverResponseVo handlerRecommendation(Driver driver, Long now, List<DriverScheduling> dto, Boolean schedulingFlag, Boolean alcoholFlag) {
@@ -511,6 +501,7 @@ public class DriverServiceImpl implements IDriverService {
         }
         driver.setImage(fileName);
         driver.setUpdateTime(new Date());
+        driverMapper.insertDriver(driver);
         driverMapper.updateSignStatusDriversByJobCodes(new ArrayList<>(Arrays.asList(driver)));
         driverMapper.deleteDeviceIdAssociatedJobCode(new ArrayList<>(Arrays.asList(driver.getJobCode())));
         log.info("进行人员数据更新完毕");
@@ -577,14 +568,14 @@ public class DriverServiceImpl implements IDriverService {
     private List<DriverSignInRecommendation> handleTimeOutPerson(List<DriverSignInRecommendation> nowTimerList) {
         return nowTimerList.stream()
                 // 只需要签到
-                .filter(item-> BC_TYPE_OUT.equals(item.getBcType()) && checkPosts(item))
+                .filter(item -> BC_TYPE_OUT.equals(item.getBcType()) && checkPosts(item))
                 // 筛选应签未签人员
                 .filter(item -> Objects.isNull(item.getSignTime()) || item.getTimestamps() - item.getSignTime() < 0)
                 .collect(Collectors.toList());
     }
     private boolean checkPosts(DriverSignInRecommendation item) {
-        switch (item.getPosts()){
+        switch (item.getPosts()) {
             case "驾驶员":
             case "售票员":
             case "采集员":
@@ -195,7 +195,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     private AjaxResult handleAjaxResult(SignIn signIn, Driver driver, SignInResponseVo vo) {
-        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
+        if (SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
                 return result;
@@ -424,7 +424,7 @@ public class SignInServiceImpl implements ISignInService {
         result = checkWorkDay(now, dto, globalIndex, signIn, driver.getPosts());
         // 酒精测试校验 确定 且员工工种是驾驶员
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) ) {
             if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) <= 0) {
                 threadJobService.asyncSendEmail(dto, globalIndex.getIndex(), signIn, driver);
                 signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR + signIn.getAlcoholIntake().toString() + "mg/100ml。");
@@ -133,7 +133,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: E:/ruoyi/uploadPath
+    profile: D:/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -202,3 +202,5 @@ api:
         people:
             url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+    path: D:/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" />-->
-	<springProperty name="log.path" source="log.path" defaultValue="E:/ruoyi/logs" />
+	<springProperty name="log.path" source="log.path" defaultValue="D:/ruoyi/logs" />
     />
 <!--	<property name="log.path" value="/home/ruoyi/logs" />-->
     <!-- 日志输出格式 -->