酒测未通过审核

liujun001
1 parent fc89a99b
Showing 6 changed files with 199 additions and 11 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssCarInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
 package com.ruoyi.controller.dss;
  
+import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.dss.car.info.dto.GetPlatesDTO;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.service.carinfo.CarInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +27,7 @@ import java.util.stream.Collectors;
  * @author liujun
  * @date 2024年07月16日 15:13
  */
+@Slf4j
 @RestController
 @RequestMapping("/dss")
 @Api(tags = "【蓝斯一期】车辆信息")
@@ -38,6 +42,12 @@ public class DssCarInfoController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+           log.info(msg);
+           return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         CarInfo carInfo = convertCarInfo(dto);
         if (StringUtils.isEmpty(carInfo.getPlateNum())) {
             return ResponseResult.success();
@@ -3,6 +3,7 @@ package com.ruoyi.controller.dss;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.ResponseResult;
@@ -33,6 +34,7 @@ import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.exception.InterruptException;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.response.SignInResponseVo;
@@ -92,6 +94,13 @@ public class DssDriverController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(loginDriverDTO.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         NewDriver driver = null;
         if (Objects.equals(loginDriverDTO.getAuthType(), 1)) {
             NewDriver sDriver = new NewDriver();
@@ -113,6 +122,13 @@ public class DssDriverController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         SignIn signIn = convertSignIn(dto);
         try {
             AjaxResult ajaxResult = signInService.addSignIn(signIn);
@@ -150,6 +166,12 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         SignIn signIn = convertSignIn(dto);
         try {
             AjaxResult ajaxResult = signInService.addSignIn(signIn);
@@ -176,6 +198,11 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
  
         SignIn signIn = convertSignIn(dto);
         SignIn dataSignIn = signInService.getLastOne(signIn);
@@ -189,6 +216,12 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         LinggangScheduling scheduling = convertScheduling(dto);
         IPage<LinggangScheduling> iPage = schedulingService.pageList(new Page<LinggangScheduling>(dto.getPageNumber(), dto.getPageRow()), scheduling, new OrderEntity());
  
@@ -213,6 +246,12 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         NewDriver newDriver = convertGetBeforeWorkListDTO(dto);
         SignIn signIn = convertSignIn(dto);
  
@@ -251,6 +290,13 @@ public class DssDriverController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         List<LinggangSignInResource> convertLinggangSignInResources = convertLinggangSignInResource(dto);
         try {
             boolean flag = signInResourceService.insertImage(convertLinggangSignInResources);
@@ -268,6 +314,13 @@ public class DssDriverController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         LinggangSignInResource resource = cconvertLinggangSignInResource(dto);
         try {
             boolean flag = signInResourceService.insertVoide(resource);
@@ -2,6 +2,7 @@ package com.ruoyi.controller.dss;
  
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.ResponseResult;
@@ -24,6 +25,7 @@ import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.framework.security.context.AuthenticationContextHolder;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.service.equipment.heartbeat.LingangEquipmentHeartbeatService;
 import com.ruoyi.service.equipment.self.check.LingangEquimentSelfCheckService;
@@ -113,6 +115,13 @@ public class DssEquipmentController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(heartbeatDTO.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         List<LingangEquipmentHeartbeat> heartbeats = convertHeartbeatDTO(heartbeatDTO);
         if (CollectionUtils.isNotEmpty(heartbeats)) {
             lingangEquipmentHeartbeatService.saveBatch(heartbeats);
@@ -128,6 +137,13 @@ public class DssEquipmentController extends BaseController {
             return ResponseResult.error("设备号不能为空");
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(device);
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
+
         Set<String> keys = Arrays.stream(GET_CONFIG_DICT_KEY).collect(Collectors.toSet());
  
         SysDictData sysDictData = new SysDictData();
@@ -144,6 +160,13 @@ public class DssEquipmentController extends BaseController {
     @ApiOperation("设备获取远程参数配置")
     @Parameter(name = "device", description = "设备号", required = true)
     public ResponseResult<EquipmentConfigVo> getConfigV1_1(@RequestParam(value = "device") String device) {
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(device);
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         return getConfig(device);
     }
  
@@ -154,6 +177,13 @@ public class DssEquipmentController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(equipmentSelfcheckDto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         LingangEquimentSelfCheck selfCheck = convertLingangEquimentSelfCheck(equipmentSelfcheckDto);
         lingangEquimentSelfCheckServicelingangEquimentSelfCheckService.insert(selfCheck);
         return ResponseResult.success();
@@ -17,6 +17,7 @@ import com.ruoyi.domain.driver.dss.syn.res.dto.ResDataDriveDTO;
 import com.ruoyi.domain.driver.dss.syn.res.vo.FaceCheckVo;
 import com.ruoyi.domain.driver.dss.syn.res.vo.ReqDataVo;
 import com.ruoyi.domain.driver.dss.syn.vo.DssDriveVo;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.FaceService;
 import com.ruoyi.utils.HttpClientUtil;
@@ -68,6 +69,12 @@ public class DssFaceController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         NewDriver driver = new NewDriver();
         driver.setPosts("驾驶员");
         List<NewDriver> drivers = newDriverService.list(driver);
@@ -77,10 +84,18 @@ public class DssFaceController extends BaseController {
  
     @PostMapping("/Driver/syn/reqData")
     @ApiOperation("获取数据库人员信息")
-    public List<DssDriveVo> queryDriver(@Valid @RequestBody DssDriveQueryDTO dto, BindingResult bindingResult) {
+    public ResponseResult<List<DssDriveVo>> queryDriver(@Valid @RequestBody DssDriveQueryDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
  
         List<NewDriver> drivers = newDriverService.list();
-        return convertDssDriveVo(drivers);
+        return  ResponseResult.success(convertDssDriveVo(drivers));
     }
  
     @ApiOperation("终端同步人脸数据结果上报")
@@ -89,6 +104,13 @@ public class DssFaceController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         log.info("client data:[{}]",dto);
 //        NewDriver newDriver = convertNewDriver(dto);
 //        TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
@@ -102,6 +124,12 @@ public class DssFaceController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         Map<String, Object> parentMap = new HashMap<>();
         parentMap.put("method", "getfacelitefeature");
         parentMap.put("faceid", "1");
@@ -152,6 +180,12 @@ public class DssFaceController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         NewDriver driver = convertNewDriver(dto);
         driver = faceService.checkFace(driver);
  
@@ -25,6 +25,7 @@ import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.KeyBoxVoService;
@@ -36,6 +37,7 @@ import com.ruoyi.service.venue.info.LinggangVenueInfoService;
 import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,7 @@ import java.util.stream.Collectors;
  * @author liujun
  * @date 2024年06月25日 13:04
  */
+@Slf4j
 @RestController
 @RequestMapping("/dss")
 @Api(tags = "【蓝斯一期】钥匙信息")
@@ -88,6 +91,12 @@ public class KeyBoxController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(request.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         LingangEquipmentLinkeLog linkeLog = saveLog(request);
  
         return keyBoxVoService.listSelect(request, linkeLog);
@@ -99,6 +108,14 @@ public class KeyBoxController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
+
         try {
             LinggangScheduling scheduling = queryScheduling(dto);
             if (Objects.isNull(scheduling)) {
@@ -141,6 +158,12 @@ public class KeyBoxController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         try {
  
             Equipment equipment = queryEquipment(dto.getDevice());
@@ -216,6 +239,13 @@ public class KeyBoxController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
         Equipment equipment = queryEquipment(dto.getDevice());
         if (Objects.isNull(equipment)) {
             logger.info("根据DTO的数据无法查询设备信息:[{}]", dto);
@@ -233,6 +263,14 @@ public class KeyBoxController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
+
+
         LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
@@ -267,6 +305,14 @@ public class KeyBoxController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
+
         LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
         entity.setDevice(dto.getDevice());
         entity.setType(2);
@@ -324,6 +370,14 @@ public class KeyBoxController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
+
+
         LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
         entity.setDevice(dto.getDevice());
         entity.setType(2);
@@ -366,6 +420,13 @@ public class KeyBoxController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
  
+        String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
+        if(StringUtils.isNotEmpty(msg)){
+            log.info(msg);
+            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+        }
+
+
         Set<Integer> keyInfoIds = null;
         List<KeyInfo> keyInfos = null;
         LinggangKeyWorkLocation keyWorkLocation = new LinggangKeyWorkLocation();
@@ -53,16 +53,16 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     }
  
     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()))){
+        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不匹配";
+        }
+
+        return "登陆的设备和token不匹配";
     }
  
     public static HttpServletRequest getRequest() {