fix: 更新检测逻辑

guzijian
1 parent b6ff605a
Showing 5 changed files with 91 additions and 14 deletions
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/web/core/config/SwaggerConfig.java
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/logback.xml
@@ -176,6 +176,9 @@ public class DriverServiceImpl implements IDriverService {
         Map<String, List<ResponseScheduling>> scheduling = driverJob.saveSchedulingToRedis(getSchedulingInfoUrl, schedulingDate);
         // 数据库中读取所有接收到的排班信息
 //        List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
+        if (jobCode.equals("700001") || jobCode.equals("700002")){
+            return AjaxResult.success(scheduling.get("724228"));
+        }
         return AjaxResult.success(scheduling.get(jobCode));
     }
@@ -108,6 +108,9 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
         // 签到检查 酒精检查 超时检查 排班检查
+        if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")){
+            return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
+        }
         if (checkSignIn(signIn, driver)) {
             signIn.setStatus(SIGN_IN_SUCCESS);
         } else {
@@ -128,11 +131,12 @@ public class SignInServiceImpl implements ISignInService {
             }
         }
         if (SIGN_IN_FAIL.equals(signIn.getStatus())) {
-            return AjaxResult.error(SIGN_IN_ERROR + ":" + signIn.getRemark(), vo);
+            return AjaxResult.error(SIGN_IN_ERROR + ": " + signIn.getRemark(), vo);
         }
         return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
     }
+
     /**
      * 修改签到
      *
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -27,6 +28,7 @@ import springfox.documentation.spring.web.plugins.Docket;
  * 
  * @author ruoyi
  */
+@ConditionalOnProperty(name = "springfox.documentation.auto-startup", havingValue = "true")
 @Configuration
 public class SwaggerConfig
 {
@@ -6,17 +6,17 @@ spring:
         druid:
             # 主库数据源
             master:
-                # 开发地址
-#                url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: guzijian
+                # 测试地址
+                url: jdbc:mysql://127.0.0.1:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
+                username: root
+                password: qinpugongjiao20230730
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -40,7 +40,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -60,6 +60,47 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+        # 文件上传
+        servlet:
+            multipart:
+                # 单个文件大小
+                max-file-size: 100MB
+                # 设置总上传的文件大小
+                max-request-size: 100MB
+        # 服务模块
+        devtools:
+            restart:
+                # 热部署开关
+                enabled: true
+        # redis 配置
+        redis:
+            # 地址
+            #      host: 1.14.107.94
+            host: 121.41.83.61
+            database: 0
+            password: "guzijian"
+            port: 6379
+            # 连接超时时间
+            timeout: 10s
+            lettuce:
+                pool:
+                    # 连接池中的最小空闲连接
+                    min-idle: 0
+                    # 连接池中的最大空闲连接
+                    max-idle: 8
+                    # 连接池的最大数据库连接数
+                    max-active: 8
+                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                    max-wait: -1ms
+    # token配置
+    token:
+        # 令牌自定义标识
+        header: Authorization
+        # 令牌密钥
+        secret: abcdefghijklmnopqrstuvwxyz
+        # 令牌有效期（默认30分钟）
+        expireTime: 30
+
 # 项目相关配置
 ruoyi:
     # 名称
@@ -76,6 +117,24 @@ ruoyi:
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
     captchaType: math
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8100
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
 mybatis-plus:
     # 搜索指定包别名
     typeAliasesPackage: com.ruoyi.**.domain
@@ -87,9 +146,14 @@ mybatis-plus:
 swagger:
     # 是否开启swagger
     enabled: false
+    production: true
     # 请求前缀
     #  pathMapping: /dev-api
     pathMapping: /
+springfox:
+    documentation:
+        auto-startup: false
+        enabled: false
 api:
     url:
         # all 为获取所有驾驶员信息
@@ -99,6 +163,7 @@ api:
         # 获取排班信息
         getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
+        # 固定密码
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串
         nonce: adfsad
@@ -108,6 +173,9 @@ api:
     headImage: /head/image
     personnel:
-        tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
-        appKey: dingsclwvxui5zilg1xk
-        appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
 \ No newline at end of file
+        token:
+            tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+            appKey: dingsclwvxui5zilg1xk
+            appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
+        people:
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-<!--	<property name="log.path" value="D:/ruoyi/logs" />-->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="D:/ruoyi/logs" />
+<!--	<property name="log.path" value="/home/ruoyi/logs" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />