酒测未通过审核

liujun001
1 parent fb614af4
Showing 13 changed files with 93 additions and 33 deletions
Bsth-admin/pom.xml
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application.yml
Bsth-admin/src/main/resources/logback.xml
Bsth-common/src/main/java/com/ruoyi/common/core/domain/ResponseResult.java
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -143,6 +143,11 @@
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
     </dependencies>
     <build>
@@ -153,7 +153,7 @@ public class KeyBoxController extends BaseController {
             Equipment eq = new Equipment();
             eq.setYardId(equipment.getYardId());
-            eq.setStatus(1);
+
             List<Equipment> equipmentList = equipmentService.list(eq);
             LinggangVenueInfo venueInfo = venueInfoService.getById(equipment.getYardId());
@@ -141,6 +141,7 @@ public class EquipmentExceptionReportController extends BaseController {
 //        entity.setUpdateBy(getUserId());
         entity.setUpdateTime(new Date());
         entity.setStatus(status);
+        entity.setReportTime(new Date());
         boolean flag = equipmentExceptionReportService.updateByPrimaryKey(entity);
         return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
@@ -11,6 +11,8 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
+import java.util.Date;
+
 @Data
 @Slf4j
@@ -99,7 +101,7 @@ public class EquipmentExceptionReport {
     /***处理时间*/
     @Excel(name = "处理时间")
-    private String reportTime;
+    private Date reportTime;
     /***报告状态*/
@@ -61,7 +61,7 @@ public class EquipmentExceptionReportAddDTO implements java.io.Serializable {
     private String reportId;
     /***处理时间*/
     @ApiModelProperty(value = "处理时间")
-    private String reportTime;
+    private java.util.Date reportTime;
     /***报告状态*/
     @ApiModelProperty(value = "报告状态", example = "1")
     private Integer reportOldStatus;
@@ -115,9 +115,6 @@ public class EquipmentExceptionReportAddDTO implements java.io.Serializable {
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.reportId)) {
             this.reportId = null;
         }
-        if (org.apache.commons.lang3.StringUtils.isEmpty(this.reportTime)) {
-            this.reportTime = null;
-        }
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.operator)) {
             this.operator = null;
         }
@@ -61,7 +61,7 @@ public class EquipmentExceptionReportQueryDTO implements java.io.Serializable {
     private String reportId;
     /***处理时间*/
     @ApiModelProperty(value = "处理时间")
-    private String reportTime;
+    private java.util.Date reportTime;
     /***报告状态*/
     @ApiModelProperty(value = "报告状态", example = "1")
     private Integer reportOldStatus;
@@ -112,9 +112,6 @@ public class EquipmentExceptionReportQueryDTO implements java.io.Serializable {
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.reportId)) {
             this.reportId = null;
         }
-        if (org.apache.commons.lang3.StringUtils.isEmpty(this.reportTime)) {
-            this.reportTime = null;
-        }
     }
@@ -61,7 +61,7 @@ public class EquipmentExceptionReportUpdateDTO implements java.io.Serializable {
     private String reportId;
     /***处理时间*/
     @ApiModelProperty(value = "处理时间")
-    private String reportTime;
+    private java.util.Date reportTime;
     /***报告状态*/
     @ApiModelProperty(value = "报告状态", example = "1")
     private Integer reportOldStatus;
@@ -116,9 +116,7 @@ public class EquipmentExceptionReportUpdateDTO implements java.io.Serializable {
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.reportId)) {
             this.reportId = null;
         }
-        if (org.apache.commons.lang3.StringUtils.isEmpty(this.reportTime)) {
-            this.reportTime = null;
-        }
+       
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.operator)) {
             this.operator = null;
         }
@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.config.domain.LineConfig;
 import com.ruoyi.config.service.ILineConfigService;
 import com.ruoyi.domain.RuleAttendanceMain;
+import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
@@ -31,6 +32,7 @@ import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
@@ -107,6 +109,8 @@ public class ThreadJobService {
     @Autowired
     private EquipmentMapper equipmentMapper;
+    @Autowired
+    private EquipmentExceptionReportService equipmentExceptionReportService;
     @Value("${api.headImage}")
     private String headImagePre;
@@ -190,6 +194,12 @@ public class ThreadJobService {
             exceptionMapper.insertEquipmentException(exception);
             // 发送通知
             sendNotice(signIn, driver, dto, globalIndex);
+
+
+            EquipmentExceptionReport exceptionReport =new EquipmentExceptionReport();
+            BeanUtils.copyProperties(exception,exceptionReport);
+            exceptionReport.setSignId(signIn.getId());
+            equipmentExceptionReportService.save(exceptionReport);
         }
     }
@@ -199,6 +199,16 @@ netty:
             image: device/image
             speech: device/speech
         port: 8989
+management:
+    endpoints:
+        web:
+            exposure:
+                    include: "*"
+        shutdown:
+            enabled: true
+    endpoint:
+        shutdown:
+            enabled: true
 bsth:
     face:
         app:
@@ -210,5 +220,5 @@ bsth:
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     skip:
-        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/test/**;/login/no/code
+        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/test/**;/login/no/code;/actuator/health;
@@ -38,6 +38,14 @@ logging:
   level:
     com.ruoyi: debug
     org.springframework: warn
+    org:
+      springframework:
+        web:
+          servlet:
+            mvc:
+              method:
+                annotation:
+                  RequestResponseBodyMethodProcessor: TRACE
 # 用户配置
 user:
@@ -5,7 +5,7 @@
     />
 <!--	<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" />
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS}[%X{userId}][%X{requestId}][%thread][%logger{20}]-[%method,%line]-%msg%n" />
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 package com.ruoyi.common.core.domain;
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.constant.HttpStatus;
 import java.util.Objects;
@@ -214,5 +215,8 @@ public class ResponseResult&lt;T&gt; {
         return Objects.equals(HttpStatus.ERROR, this.getCode());
     }
-
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.framework.security.filter;
-import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.TokenService;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Objects;
+import java.util.UUID;
 /**
  * token过滤器 验证token有效性
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
-{
+public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     @Autowired
     private TokenService tokenService;
+    private final static String USER_ID_KEY = "userId";
+    private final static String REQUEST_ID_KEY = "requestId";
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-            throws ServletException, IOException
-    {
+            throws ServletException, IOException {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
-        {
+        String userId = Objects.isNull(loginUser) ? getRandomValue() : Convert.toStr(loginUser.getUserId());
+        putMDC(userId, getRandomValue());
+
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
             tokenService.verifyToken(loginUser);
             UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
@@ -41,4 +49,24 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
         }
         chain.doFilter(request, response);
     }
+
+    public static void putMDC(String userId, String requestId) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(userId)) {
+            userId = getRandomValue();
+        }
+        MDC.put(USER_ID_KEY, userId);
+        MDC.put(REQUEST_ID_KEY, requestId);
+    }
+
+    public static String getUserOfMDCValue() {
+        return MDC.get(USER_ID_KEY);
+    }
+
+    public static String getRequestIdOfMDCValue() {
+        return MDC.get(REQUEST_ID_KEY);
+    }
+
+    private static String getRandomValue() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
 }