酒测未通过审核

liujun001
1 parent 2f206ef0
Showing 8 changed files with 92 additions and 15 deletions
Bsth-admin/src/main/java/com/ruoyi/common/TipEnum.java
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBeforeWorkListDTO.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/key/location/LinggangKeyWorkLocationService.java
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -23,7 +23,7 @@ public enum TipEnum {
     TIP_201(201, "Created"),
  
     TIP_401(401, "Unauthorized"),
-    TIP_403(401, "Forbidden"),
+    TIP_403(403, "Forbidden"),
     TIP_404(404, "Not Found"),
  
     TIP_500(500, "ERROR"),
 package com.ruoyi.controller;
  
 import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import java.text.ParseException;
 import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
  
 /**
  * @author liujun
@@ -27,6 +34,8 @@ public class RefreshController {
     private LinggangKeyWorkLocationService keyWorkLocationService;
     @Autowired
     private NewDriverService newDriverService;
+    @Autowired
+    private LinggangSchedulingService linggangSchedulingService;
  
     @GetMapping(value = "/scheduling")
     @ApiOperation("scheduling")
@@ -41,8 +50,17 @@ public class RefreshController {
  
     @GetMapping(value = "/key/info/local")
     @ApiOperation("/key/info/local")
-    public ResponseResult<Boolean> testKeyInfoLocal(@RequestParam("dateStr") String dateStr) {
-        keyWorkLocationService.insertJob(dateStr);
+    public ResponseResult<Boolean> testKeyInfoLocal(@RequestParam("dateStr") String dateStr) throws ParseException {
+        Date date = DateUtil.YYYY_MM_DD_LINK.parse(dateStr);
+
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setStartScheduleDate(DateUtil.shortDate(date));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+        scheduling.setType(100);
+
+        List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(scheduling);
+        Set<Long> idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+        keyWorkLocationService.insertJob(dateStr, idSets);
         return ResponseResult.success();
     }
  
@@ -22,6 +22,8 @@ public class GetBeforeWorkListDTO implements java.io.Serializable {
  
     private static final long serialVersionUID = -19813580197166104L;
  
+    private String device;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "酒测时间")
     private Date checkTime;
@@ -8,6 +8,7 @@ import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
@@ -15,6 +16,7 @@ import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.expand.domain.DriverSchedulingExpand;
 import com.ruoyi.expand.mapper.DriverSchedulingExpandMapper;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.pojo.request.PersonnelRequestVo;
 import com.ruoyi.pojo.request.TokenRequestVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
@@ -242,6 +244,7 @@ public class DriverJob implements InitializingBean {
     @Transactional(rollbackFor = Exception.class)
     public void getSchedulingInfo() {
         Date date = new Date();
+        JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRequestIdOfMDCValue());
         for (int i = 0; i < 2; i++) {
             runScheduling(DateUtils.addDays(date, i).getTime());
         }
@@ -269,31 +272,35 @@ public class DriverJob implements InitializingBean {
         scheduling.setStartScheduleDate(DateUtil.shortDate(date));
         scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
         scheduling.setType(type);
+        if(Objects.isNull(schedulingService)){
+            schedulingService = SpringUtils.getBean(LinggangSchedulingService.class);
+        }
         Integer count = schedulingService.countId(scheduling);
         if (Objects.nonNull(count) && count > 0) {
             log.info("[{}]排班数据已经存在", date);
             return;
         }
  
-
+        Set<Long> idSets = null;
         if (isSameDay) {
             scheduling.setType(100);
             List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
-            Set<Long> IdSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-            if (CollectionUtils.isNotEmpty(IdSets)) {
-                schedulingService.removeByIds(IdSets);
+            idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+            if (CollectionUtils.isNotEmpty(idSets)) {
+                schedulingService.removeByIds(idSets);
             }
         }
  
  
 //        String url = getSchedulingInfoPlan;
         try {
+            log.info("url:[{}];formatDate:[{}]；timestamp：[{}]",url,formatDate,timestamp);
             getSchedulingInfoUrl = String.format(url, "77", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type);
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type,idSets);
         // 删除两天前排班信息
         if (isSameDay) {
             deleteScheduling();
@@ -390,7 +397,7 @@ public class DriverJob implements InitializingBean {
     }
  
  
-    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type) {
+    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type,Set<Long> idSets) {
         log.info("开始拉取排班:{};[{}]", dateKey, getSchedulingInfoUrl);
         List<ResponseSchedulingDto> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
@@ -436,7 +443,7 @@ public class DriverJob implements InitializingBean {
             schedulingList.sort(Comparator.comparing(ResponseSchedulingDto::getFcsjT));
         }
         // 存入签到报表
-        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type);
+        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type,idSets);
         // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
         log.info("拉取排班完毕:{}", dateKey);
@@ -416,7 +416,7 @@ public class ThreadJobService {
      */
     @Async
     @Transactional(rollbackFor = {Exception.class})
-    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type) {
+    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type,Set<Long> IdSets) {
         //查询当天是否保存过考情表  如果不存在则保存
         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));
@@ -519,7 +519,7 @@ public class ThreadJobService {
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
-        keyWorkLocationService.insertJob(dateStr1);
+        keyWorkLocationService.insertJob(dateStr1,IdSets);
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
  
@@ -125,6 +125,22 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
  
     @Override
+    public List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Collection<Long> schedulingIds) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = null;
+        if(Objects.isNull(entity)){
+            wrapper = new LambdaQueryWrapper<>();
+        }else {
+            wrapper = new LambdaQueryWrapper<>(entity);
+        }
+        switchTime(entity, wrapper);
+
+        if(CollectionUtils.isNotEmpty(schedulingIds)){
+            wrapper.in(LinggangKeyWorkLocation::getSchedulingId,schedulingIds);
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public List<LinggangKeyWorkLocation> listRecent(Collection<Integer> keyIds, Date date) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>();
         if (CollectionUtils.isNotEmpty(keyIds)) {
@@ -235,11 +251,22 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean insertJob(String timeStr) {
+    public boolean insertJob(String timeStr,Set<Long> schedulingIds) {
         try {
+            if(CollectionUtils.isNotEmpty(schedulingIds)){
+              List<LinggangKeyWorkLocation> workLocations =  listRecent(null,schedulingIds);
+              if(CollectionUtils.isNotEmpty(workLocations)){
+                 Set<Long> ids = workLocations.stream().map(LinggangKeyWorkLocation::getId).collect(Collectors.toSet());
+                 if(CollectionUtils.isNotEmpty(ids)){
+                     removeByIds(ids);
+                 }
+              }
+            }
+
             Date date = DateUtil.YYYY_MM_DD_LINK.parse(timeStr);
             LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
-            workLocation.setScheduleDate(date);
+            workLocation.setStartScheduleDate(date);
+            workLocation.setEndScheduleDate(DateUtils.addDays(date,1));
             Integer count = countId(workLocation);
             if (Objects.nonNull(count) && count > 0) {
                 log.error("当天的数据已经存在:[{}]；[{}]", timeStr, count);
@@ -9,6 +9,7 @@ import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
  
  
 /**
@@ -27,6 +28,8 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
  
     List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Date date);
  
+    List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Collection<Long> schedulingIds);
+
     List<LinggangKeyWorkLocation> listRecent(Collection<Integer> keyIds, Date date);
  
     List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity,Collection<Integer> keyIds, Date date);
@@ -57,7 +60,7 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
     /***插入数据*/
     boolean insert(LinggangKeyWorkLocation entity);
  
-    boolean insertJob(String timeStr);
+    boolean insertJob(String timeStr, Set<Long> IdSets);
  
     /**
      * 根据主键修改数据
@@ -11,6 +11,8 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.filter.OncePerRequestFilter;
  
 import javax.servlet.FilterChain;
@@ -50,6 +52,24 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
         chain.doFilter(request, response);
     }
  
+    public static String validateDevice(String device) {
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if(Objects.isNull(loginUser)){
+//            return  "没有登陆信息";
+//        }
+//
+//        if(org.apache.commons.lang3.StringUtils.equals(device,Convert.toStr(loginUser.getDeptId()))){
+            return null;
+//        }
+//
+//        return "登陆的设备和token不匹配";
+    }
+
+    public static HttpServletRequest getRequest() {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        return Objects.isNull(servletRequestAttributes) ? (HttpServletRequest) servletRequestAttributes.getRequest() : null;
+    }
+
     public static void putMDC(String userId, String requestId) {
         if (org.apache.commons.lang3.StringUtils.isEmpty(userId)) {
             userId = getRandomValue();