添加设备操作异常警报

liujun001
1 parent 13160947
Showing 5 changed files with 167 additions and 49 deletions
Bsth-admin/src/main/java/com/ruoyi/config/FaceEngineConfig.java
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/application.yml
@@ -64,7 +64,7 @@ public class FaceEngineConfig {
         errorCode = faceEngine.init(engineConfiguration);
  
         if (errorCode != ErrorInfo.MOK.getValue()) {
-            throw new InterruptException("初始化引擎失败,错误编码:"+errorCode);
+           throw new InterruptException("初始化引擎失败,错误编码:"+errorCode);
         }
  
         return faceEngine;
 package com.ruoyi.controller;
  
 import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.controller.dss.DssFaceController;
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.driver.dss.syn.res.dto.FaceRegisterDTO;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.service.IEquipmentService;
 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 lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
  
+import java.io.File;
+import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
  
@@ -25,6 +36,7 @@ import java.util.stream.Collectors;
  * @author liujun
  * @date 2024年07月30日 14:37
  */
+@Slf4j
 @RestController
 @RequestMapping("/refresh")
 public class RefreshController {
@@ -36,21 +48,31 @@ public class RefreshController {
     private NewDriverService newDriverService;
     @Autowired
     private LinggangSchedulingService linggangSchedulingService;
+    @Autowired
+    private DssFaceController dssFaceController;
+    @Autowired
+    private IEquipmentService equipmentService;
  
     @GetMapping(value = "/scheduling")
     @ApiOperation("scheduling")
+    @PreAuthorize("@ss.hasPermi('refresh:scheduling')")
     public ResponseResult<Boolean> test() {
         Date date = new Date();
         for (int i = 0; i < 2; i++) {
             driverJob.runScheduling(DateUtils.addDays(date, i).getTime());
         }
  
+
         return ResponseResult.success();
     }
  
     @GetMapping(value = "/key/info/local")
     @ApiOperation("/key/info/local")
-    public ResponseResult<Boolean> testKeyInfoLocal(@RequestParam("dateStr") String dateStr) throws ParseException {
+    @PreAuthorize("@ss.hasPermi('refresh:key:info:local')")
+    public ResponseResult<Boolean> testKeyInfoLocal(@RequestParam(value = "dateStr",required = false) String dateStr) throws ParseException {
+        if(StringUtils.isEmpty(dateStr)){
+            dateStr = DateUtil.YYYY_MM_DD_LINK.format(new Date());
+        }
         Date date = DateUtil.YYYY_MM_DD_LINK.parse(dateStr);
  
         LinggangScheduling scheduling = new LinggangScheduling();
@@ -60,14 +82,94 @@ public class RefreshController {
  
         List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(scheduling);
         Set<Long> idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-        keyWorkLocationService.insertJob(dateStr,null, idSets);
+        keyWorkLocationService.insertJob(dateStr, null, idSets);
+
+        log.info("钥匙存放信息处理完毕");
         return ResponseResult.success();
     }
  
     @GetMapping(value = "/driver")
     @ApiOperation("driver")
+    @PreAuthorize("@ss.hasPermi('refresh:driver')")
     public ResponseResult<Boolean> insertDriver() {
         newDriverService.insertJob();
+        log.info("人员信息同步完毕");
         return ResponseResult.success();
     }
+
+    @PostMapping(value = "/driver/init/image")
+    @ApiOperation("driver/init/image")
+    @PreAuthorize("@ss.hasPermi('refresh:driver:init:image')")
+    public ResponseResult<Boolean> insertDriverInitImage(@RequestParam("imagePath") String imagePath, @RequestParam("device") String device) {
+        if (StringUtils.isEmpty(device)) {
+            return ResponseResult.error("注册设备号不能为空");
+        }
+
+        if (StringUtils.isEmpty(imagePath)) {
+            String path = StringUtils.join(System.getProperty("user.dir"), File.pathSeparator, "images");
+            ;
+            log.info("[{}]", path);
+            imagePath = path;
+        }
+
+        File file = new File(imagePath);
+        if (!file.exists()) {
+            return ResponseResult.error("文件路径不存在");
+        }
+        if (!file.isDirectory()) {
+            return ResponseResult.error("文件路径不是文件夹路径");
+        }
+
+        File[] fs = file.listFiles();
+        int length = ArrayUtils.getLength(fs);
+        if (0 == length) {
+            return ResponseResult.error("文件路径下没有文件");
+        }
+
+        Equipment equipment = equipmentService.getOneByDeviceId(device);
+        if (Objects.isNull(equipment)) {
+            return ResponseResult.error("设备号不正确，请确认设备信息");
+        }
+
+
+        for (int i = 0; i < length; i++) {
+            FaceRegisterDTO dto = new FaceRegisterDTO();
+            dto.setDevice(device);
+
+            String jobCode = StringUtils.trim(StringUtils.substringBeforeLast(file.getName(), "."));
+            dto.setStaffCode(jobCode);
+
+
+            NewDriver driver = newDriverService.getOne(jobCode);
+            if (StringUtils.isNotEmpty(driver.getImage())) {
+                log.info("人脸数据已经存在:[{}]", dto);
+                continue;
+            }
+            dto.setRegTime(DateUtil.shortDate(new Date()));
+            try {
+                byte[] bytes = FileUtils.readFileToByteArray(fs[i]);
+                String imageContent = Base64.encode(bytes);
+                dto.setFaceValue(imageContent);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            ResponseResult<Object> responseResult = dssFaceController.faceRegister(dto);
+            if (Objects.isNull(responseResult) || !responseResult.isSuccess()) {
+                log.warn("[{}]数据没有执行成功；返回值为:[{}]", dto, responseResult);
+            }
+        }
+
+        log.info("人员信息同步完毕");
+        return ResponseResult.success();
+    }
+
+    @GetMapping(value = "/jar/class/path")
+    public ResponseResult<String> getJarClassPath() {
+        String path = StringUtils.join(System.getProperty("user.dir"), File.separator, "images");
+
+        ResponseResult<String> responseResult = ResponseResult.success();
+        responseResult.setData(path);
+        return responseResult;
+    }
+
 }
@@ -70,9 +70,9 @@ public class DssFaceController extends BaseController {
         }
  
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
  
         NewDriver driver = new NewDriver();
@@ -91,13 +91,13 @@ public class DssFaceController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
  
         List<NewDriver> drivers = newDriverService.list();
-        return  ResponseResult.success(convertDssDriveVo(drivers));
+        return ResponseResult.success(convertDssDriveVo(drivers));
     }
  
     @ApiOperation("终端同步人脸数据结果上报")
@@ -108,12 +108,12 @@ public class DssFaceController extends BaseController {
         }
  
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
  
-        log.info("client data:[{}]",dto);
+        log.info("client data:[{}]", dto);
 //        NewDriver newDriver = convertNewDriver(dto);
 //        TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
         return ResponseResult.success();
@@ -127,11 +127,36 @@ public class DssFaceController extends BaseController {
         }
  
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
  
+        return faceRegister(dto);
+    }
+
+
+
+    @ApiOperation("人脸校验")
+    @PostMapping(value = "/Driver/FaceCheck")
+    public ResponseResult<FaceCheckVo> faceCheck(@Valid @RequestBody FaceCheckDTO 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());
+        }
+
+        NewDriver driver = convertNewDriver(dto);
+        driver = faceService.checkFace(driver);
+
+        return Objects.isNull(driver) ? ResponseResult.error("登陆匹配失败") : ResponseResult.success(convertFaceCheckVo(driver));
+    }
+
+    public ResponseResult<Object> faceRegister(FaceRegisterDTO dto) {
         Map<String, Object> parentMap = new HashMap<>();
         parentMap.put("method", "getfacelitefeature");
         parentMap.put("faceid", "1");
@@ -146,15 +171,15 @@ public class DssFaceController extends BaseController {
                 log.warn("获取面部特征失败，请检查数据:[{}]", json);
                 return ResponseResult.error("获取面部特征失败，请稍后再试");
             }
-            json = StringUtils.substringAfter(json,"{");
-            json = StringUtils.substringBeforeLast(json,"}");
-            String [] results = StringUtils.split(json,",");
-            Map<String,String> resultMap = new HashMap<>();
+            json = StringUtils.substringAfter(json, "{");
+            json = StringUtils.substringBeforeLast(json, "}");
+            String[] results = StringUtils.split(json, ",");
+            Map<String, String> resultMap = new HashMap<>();
             for (String result : results) {
-                result = StringUtils.replace(result,"\\\"","");
-                String key = StringUtils.trim(StringUtils.substringBefore(result,":"));
-                String value = StringUtils.trim(StringUtils.substringAfter(result,":"));
-                resultMap.put(key,value);
+                result = StringUtils.replace(result, "\\\"", "");
+                String key = StringUtils.trim(StringUtils.substringBefore(result, ":"));
+                String value = StringUtils.trim(StringUtils.substringAfter(result, ":"));
+                resultMap.put(key, value);
             }
  
  
@@ -163,37 +188,18 @@ public class DssFaceController extends BaseController {
                 return ResponseResult.error("获取面部特征失败，请稍后再试");
             }
             faceFeature = Convert.toStr(resultMap.get("strlitefeature"));
-        }catch (Exception e){
-            log.error("获取面部特征异常,返回的结果是：[{}]",json,e);
+        } catch (Exception e) {
+            log.error("获取面部特征异常,返回的结果是：[{}]", json, e);
             return ResponseResult.error("获取面部特征异常，请稍后再试");
         }
  
  
-        NewDriver newDriver = convertFaceRegister(dto,faceFeature);
+        NewDriver newDriver = convertFaceRegister(dto, faceFeature);
  
         TipEnum errorTipEnum = newDriverService.faceRegister(newDriver);
         return new ResponseResult<>(errorTipEnum.getCode(), errorTipEnum.getMsg());
     }
  
-    @ApiOperation("人脸校验")
-    @PostMapping(value = "/Driver/FaceCheck")
-    public ResponseResult<FaceCheckVo> faceCheck(@Valid @RequestBody FaceCheckDTO 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());
-        }
-
-        NewDriver driver = convertNewDriver(dto);
-        driver = faceService.checkFace(driver);
-
-        return Objects.isNull(driver) ? ResponseResult.error("登陆匹配失败") : ResponseResult.success(convertFaceCheckVo(driver));
-    }
-
  
     private List<DssDriveVo> convertDssDriveVo(List<NewDriver> newDrivers) {
         if (CollectionUtils.isEmpty(newDrivers)) {
@@ -238,7 +244,7 @@ public class DssFaceController extends BaseController {
         return newDriver;
     }
  
-    private NewDriver convertFaceRegister(FaceRegisterDTO dto,String faceFeature) {
+    private NewDriver convertFaceRegister(FaceRegisterDTO dto, String faceFeature) {
         NewDriver newDriver = new NewDriver();
         newDriver.setIcCardCode(dto.getDriverCode());
         newDriver.setFaceSignIn(1);
@@ -285,6 +291,8 @@ public class DssFaceController extends BaseController {
         }).collect(Collectors.toList());
     }
  
+
+
     private Set<Integer> switchPostion(String post) {
  
         Set<Integer> postSet = new LinkedHashSet<>();
@@ -548,6 +548,8 @@ public class ThreadJobService {
             keyWorkLocationService.insertJob(dateStr1, schedulings, null);
         }
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
+
+        log.info("排班信息同步完毕");
     }
  
     private <T> String combitionKey(T s1) {
@@ -167,4 +167,10 @@ api:
     appKey: dingsclwvxui5zilg1xk
     appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
 log:
-  path: E:/ruoyi/logs
 \ No newline at end of file
+  path: E:/ruoyi/logs
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
 \ No newline at end of file