feat: 修改请求ip

guzijian
1 parent 52fd9259
Showing 6 changed files with 13 additions and 13 deletions
Bsth-admin/src/main/java/com/ruoyi/common/ErrorTypeProperties.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/resources/application-druid-prd.yml
@@ -5,7 +5,7 @@ package com.ruoyi.common;
  */
 public interface ErrorTypeProperties {
     String SIGN_IN_ERROR = "签到异常";
-    String SIGN_OUT_ERROR = "签退异常";
+    String SIGN_OUT_ERROR = "签到异常";
     String EQUIPMENT_ERROR = "设备异常";
     String ALCOHOL_SIGN_IN_ERROR = "酒精测试超标,";
     String WORK_DAY_ERROR = "当天没有排班,";
@@ -29,7 +29,7 @@ public class NowSchedulingCache {
         this.schedulingMapper = driverSchedulingMapper;
         this.errorJobcodeService = errorJobcodeService;
         log.info("金高项目启动加载中获取排班表-----");
-//        cacheNowDaySchedulingInit();
+        cacheNowDaySchedulingInit();
     }
     private void cacheNowDaySchedulingInit() {
@@ -4,6 +4,7 @@ import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.utils.ConstDateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
@@ -28,7 +29,7 @@ public class SchedulingCache {
     //    @Value("${api.url.getSchedulingInfoNew}")
-    private static final String getSchedulingInfoUrl = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
+    private static final String getSchedulingInfoUrl = "http://58.247.254.118:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
     //    @Value("${api.config.nonce}")
     private static final String NONCE = "adfsad";
     //    @Value("${api.config.password}")
@@ -60,10 +61,9 @@ public class SchedulingCache {
     private String getUrl(String formatNowDate) {
         String url = null;
         long timestamp = System.currentTimeMillis();
-//        String formatDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         // 获取排班请求
         try {
-            url = String.format(getSchedulingInfoUrl, "99", formatNowDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            url = String.format(getSchedulingInfoUrl, "22", formatNowDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -424,7 +424,7 @@ public class SignInServiceImpl implements ISignInService {
         result = checkWorkDay(now, dto, globalIndex, signIn, driver.getPosts());
         // 酒精测试校验 确定 且员工工种是驾驶员
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) ) {
+        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。");
@@ -587,7 +587,7 @@ public class SignInServiceImpl implements ISignInService {
         // 单挑数据 且不在范围内
         if (BC_TYPE_IN.equals(dto.get(0).getBcType())) {
             if (!(Math.abs(nowBetween) <= 60)) {
-                signIn.setRemark(SIGN_OUT_TIMEOUT);
+                signIn.setRemark(SIGN_OUT_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                 return false;
             } else {
                 return true;
@@ -595,7 +595,7 @@ public class SignInServiceImpl implements ISignInService {
         }
         if (BC_TYPE_OUT.equals(dto.get(0).getBcType())) {
             if (!(Math.abs(nowBetween) <= 60)) {
-                signIn.setRemark(SIGN_IN_TIMEOUT);
+                signIn.setRemark(SIGN_IN_TIMEOUT + "请在" + ConstDateUtil.formatDate("HH:mm", new Date(currentScheduling.getTimestamps())) + "前后一小时内打卡。");
                 return false;
             } else {
                 return true;
@@ -228,7 +228,7 @@ public class DriverJob implements InitializingBean {
         log.info("开始获取{}的排班数据", formatDate);
         try {
-            getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "22", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -155,12 +155,12 @@ swagger:
 api:
     url:
         # all 为获取所有驾驶员信息
-        getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+        getDriverInfo: http://58.247.254.118:9089/webservice/rest/person/%s
         # 获取公司编码下的员工信息 暂时没用
-        getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+        getCompanyInfo: http://58.247.254.118:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
         # 获取排班信息
-        getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfo: http://58.247.254.118:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.247.254.118:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串