酒测未通过审核

liujun001
1 parent 41f21df0
Showing 10 changed files with 61 additions and 23 deletions
Bsth-admin/src/main/java/com/ruoyi/common/TipEnum.java
Bsth-admin/src/main/java/com/ruoyi/controller/TestController.java → Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/interceptor/MyExceptionHandler.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ResponseSchedulingDto.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/resource/LinggangSignInResourceServiceImpl.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
@@ -27,6 +27,7 @@ public enum TipEnum {
     TIP_404(404, "Not Found"),
  
     TIP_500(500, "ERROR"),
+    TIP_504(504, "EXCEPTION"),
     ;
     private int code;
     private String msg;
@@ -19,8 +19,8 @@ import java.util.Date;
  * @date 2024年07月30日 14:37
  */
 @RestController
-@RequestMapping("/test")
-public class TestController {
+@RequestMapping("/refresh")
+public class RefreshController {
     @Autowired
     private DriverJob driverJob;
     @Autowired
@@ -28,19 +28,12 @@ public class TestController {
     @Autowired
     private NewDriverService newDriverService;
  
-    @GetMapping(value = "/test")
-    @ApiOperation("test")
+    @GetMapping(value = "/scheduling")
+    @ApiOperation("scheduling")
     public ResponseResult<Boolean> test() {
-       // driverJob.getSchedulingInfo("02:30:30");
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.setTime(new Date());
-//        calendar.set(Calendar.HOUR,2);
-//        calendar.set(Calendar.MINUTE,30);
-//        calendar.set(Calendar.SECOND,30);
-//        Date date = calendar.getTime();
         Date date = new Date();
         for (int i = 0; i < 2; i++) {
-            driverJob.runScheduling(DateUtils.addDays(date,i).getTime());
+            driverJob.runScheduling(DateUtils.addDays(date, i).getTime());
         }
  
         return ResponseResult.success();
@@ -54,7 +47,8 @@ public class TestController {
     }
  
     @GetMapping(value = "/driver")
-    public  ResponseResult<Boolean> insertDriver(){
+    @ApiOperation("driver")
+    public ResponseResult<Boolean> insertDriver() {
         newDriverService.insertJob();
         return ResponseResult.success();
     }
@@ -244,14 +244,15 @@ public class DssDriverController extends BaseController {
  
     @PostMapping(value = "Driver/UpLoadPicture")
     @ApiOperation(value = "25.酒测照片上传")
-    public ResponseResult<Boolean> UpLoadPicture(@Valid @RequestBody UpLoadPictureDTO dto, BindingResult bindingResult) {
+    public ResponseResult<Set<String>> UpLoadPicture(@Valid @RequestBody UpLoadPictureDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         List<LinggangSignInResource> convertLinggangSignInResources = convertLinggangSignInResource(dto);
         try {
             boolean flag = signInResourceService.insertImage(convertLinggangSignInResources);
-            return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("上传失败，请稍后再试");
+           Set<String> paths = convertLinggangSignInResources.stream().map(LinggangSignInResource::getPath).collect(Collectors.toSet());
+            return flag ? ResponseResult.success(paths) : ResponseResult.error("上传失败，请稍后再试");
         } catch (InterruptException e) {
             log.error("图片上传失败,[{}]", dto);
             return ResponseResult.error("上传失败，请稍后再试");
@@ -260,14 +261,14 @@ public class DssDriverController extends BaseController {
  
     @PostMapping(value = "/Driver/UpLoadVideo")
     @ApiOperation(value = "26.酒测视频上传")
-    public ResponseResult<Boolean> UpLoadVideo(@Valid @RequestBody UpLoadVideoDTO dto, BindingResult bindingResult) {
+    public ResponseResult<String> UpLoadVideo(@Valid @RequestBody UpLoadVideoDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         LinggangSignInResource resource = cconvertLinggangSignInResource(dto);
         try {
             boolean flag = signInResourceService.insertVoide(resource);
-            return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("上传失败，请稍后再试");
+            return flag ? ResponseResult.success(resource.getPath()) : ResponseResult.error("上传失败，请稍后再试");
         } catch (InterruptException e) {
             log.error("视频上传失败,[{}]", dto);
             return ResponseResult.error("上传失败，请稍后再试");
@@ -474,6 +475,8 @@ public class DssDriverController extends BaseController {
             resource.setCreateTime(new Date());
             resource.setDevice(dto.getDevice());
             resource.setContent(pic.getPic());
+
+            resources.add(resource);
         }
  
         return resources;
+package com.ruoyi.interceptor;
+
+import com.ruoyi.common.TipEnum;
+import com.ruoyi.common.core.domain.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * @author liujun
+ * @date 2024年08月14日 10:52
+ */
+@Slf4j
+@ControllerAdvice
+public class MyExceptionHandler {
+    @ExceptionHandler(value = Exception.class)
+    public <T> ResponseResult<T> exceptionHandler(Exception e) {
+        log.error(e.getMessage(), e);
+        return ResponseResult.error(TipEnum.TIP_504.getCode(), TipEnum.TIP_504.getMsg());
+    }
+}
@@ -420,6 +420,19 @@ public class DriverJob implements InitializingBean {
         List<String> keys = new ArrayList<>(driverSchedulingMap.keySet());
         for (String key : keys) {
             List<ResponseSchedulingDto> schedulingList = driverSchedulingMap.get(key);
+            if(CollectionUtils.isNotEmpty(schedulingList)){
+                schedulingList = schedulingList.stream().map(s->{
+                    if(Objects.isNull(s.getFcsjT())){
+                        s.setFcsjT(0L);
+                    }
+
+                    if(Objects.isNull(s.getZdsjT())){
+                        s.setZdsjT(0L);
+                    }
+
+                    return s;
+                }).collect(Collectors.toList());
+            }
             schedulingList.sort(Comparator.comparing(ResponseSchedulingDto::getFcsjT));
         }
         // 存入签到报表
@@ -49,4 +49,6 @@ public class ResponseSchedulingDto implements Serializable {
     private String remarks;
     private List<CTasks> cTasks;
     private String name;
+
+
 }
 \ No newline at end of file
@@ -420,7 +420,7 @@ public class ThreadJobService {
         //查询当天是否保存过考情表  如果不存在则保存
         List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date),DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date,1)), null, null, null);
         Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(date));
-        if(CollectionUtils.isNotEmpty(bcList) && MapUtils.isEmpty(dto)){
+        if(CollectionUtils.isNotEmpty(bcList) && MapUtils.isEmpty(dto) && Objects.equals(1,type)){
             String dateStr = DateUtil.YYYY_MM_DD.format(date);
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
             NowSchedulingCache.handlerResultMap(resultMap, bcList);
@@ -433,8 +433,10 @@ public class ThreadJobService {
             log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(),bcList.size(),date);
             return;
         }
-        // TODO maybe delete
-        TempCache.resetMapStatus();
+
+        if(Objects.equals(1,type)) {
+            TempCache.resetMapStatus();
+        }
         bcList = getBcList(originSchedulingMap, type);
  
         // 处理非司售人员的排班明细
@@ -483,7 +485,7 @@ public class ThreadJobService {
         bcList = schedulingMapper.queryToDay(dateStr1, DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date,1)), null, null, null);
         // 处理缓存和错误排班
         String dateStr = DateUtil.YYYY_MM_DD.format(date);
-        if (!CollectionUtil.isEmpty(bcList)) {
+        if (!CollectionUtil.isEmpty(bcList) && Objects.equals(1,type)) {
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
             NowSchedulingCache.handlerResultMap(resultMap, bcList);
             // 更新缓存
@@ -166,6 +166,7 @@ public class LinggangSignInResourceServiceImpl extends ServiceImpl&lt;LinggangSignI
         builder.append(UUID.randomUUID().toString().replace("-", ""));
         builder.append(".mp4");
  
+        entity.setPath(builder.toString());
         boolean flag = save(entity);
         if (flag) {
             ResponseResult<Boolean> result = uploadUtil.uploadVideoOfBase64(entity.getContent(), entity.getPath());
@@ -215,4 +215,4 @@ 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;/login/no/code
 package com.ruoyi.common.utils;
  
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import org.apache.commons.lang3.exception.ExceptionUtils;
  
 /**
  * 错误信息处理类。