优化日志

liujun001
1 parent c4e54cba
Showing 4 changed files with 140 additions and 37 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
Bsth-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
 package com.ruoyi.controller;
  
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.controller.dss.DssFaceController;
@@ -15,6 +16,7 @@ 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.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,10 +28,7 @@ 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.*;
 import java.util.stream.Collectors;
  
 /**
@@ -69,8 +68,8 @@ public class RefreshController {
     @GetMapping(value = "/key/info/local")
     @ApiOperation("/key/info/local")
     @PreAuthorize("@ss.hasPermi('refresh:key:info:local')")
-    public ResponseResult<Boolean> testKeyInfoLocal(@RequestParam(value = "dateStr",required = false) String dateStr) throws ParseException {
-        if(StringUtils.isEmpty(dateStr)){
+    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);
@@ -136,11 +135,15 @@ public class RefreshController {
             FaceRegisterDTO dto = new FaceRegisterDTO();
             dto.setDevice(device);
  
-            String jobCode = StringUtils.trim(StringUtils.substringBeforeLast(file.getName(), "."));
+            String jobCode = StringUtils.trim(StringUtils.substringBeforeLast(fs[i].getName(), "."));
             dto.setStaffCode(jobCode);
  
  
             NewDriver driver = newDriverService.getOne(jobCode);
+            if (Objects.isNull(driver)) {
+                log.info("没有人员信息:[{}]", dto);
+                continue;
+            }
             if (StringUtils.isNotEmpty(driver.getImage())) {
                 log.info("人脸数据已经存在:[{}]", dto);
                 continue;
@@ -163,6 +166,90 @@ public class RefreshController {
         return ResponseResult.success();
     }
  
+
+    @PostMapping(value = "/driver/init/image/name")
+    @ApiOperation("driver/init/image/name")
+    @PreAuthorize("@ss.hasPermi('refresh:driver:init:image:name')")
+    public ResponseResult<Object> insertDriverInitImageOfName(@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("设备号不正确，请确认设备信息");
+        }
+
+
+        List<String> errors = new ArrayList<>();
+        for (int i = 0; i < length; i++) {
+            FaceRegisterDTO dto = new FaceRegisterDTO();
+            dto.setDevice(device);
+            String name = StringUtils.trim(StringUtils.substringBeforeLast(fs[i].getName(), "."));
+
+            NewDriver source = new NewDriver();
+            source.setPersonnelName(name);
+
+            List<NewDriver> drivers = newDriverService.list(source);
+            int size = CollectionUtils.size(drivers);
+            if (size == 0) {
+                errors.add(StringUtils.join(file.getName(), "没有找到用户"));
+                continue;
+            } else if (size > 1) {
+                errors.add(StringUtils.join(file.getName(), "找到多个数据:", JSON.toJSONString(drivers)));
+                continue;
+            }
+
+            NewDriver driver = drivers.get(0);
+            if (StringUtils.isNotEmpty(driver.getImage())) {
+                log.info("人脸数据已经存在:[{}]", driver);
+                continue;
+            }
+            dto.setRegTime(DateUtil.shortDate(new Date()));
+            dto.setStaffCode(driver.getJobCode());
+            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);
+                errors.add(StringUtils.join(file.getName(), "数据没有执行成功:", JSON.toJSONString(driver)));
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(errors)) {
+            return ResponseResult.error(JSON.toJSONString(errors));
+        }
+
+        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");
 package com.ruoyi.common.core.domain.entity;
  
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
@@ -12,6 +8,12 @@ import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
  
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 用户对象 sys_user
  * 
@@ -299,26 +301,10 @@ public class SysUser extends BaseEntity
  
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
+        String pwd = this.getPassword();
+        this.setPassword(null);
+        String str = JSON.toJSONString(this);
+        this.setPassword(pwd);
+        return str;
     }
 }
 package com.ruoyi.common.core.domain.model;
  
-import java.util.Collection;
-import java.util.Set;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.Set;
  
 /**
  * 登录用户身份权限
@@ -263,4 +264,21 @@ public class LoginUser implements UserDetails
     {
         return null;
     }
+
+    @Override
+    public String toString() {
+        return "LoginUser{" +
+                "userId=" + userId +
+                ", deptId=" + deptId +
+                ", token='" + token + '\'' +
+                ", loginTime=" + loginTime +
+                ", expireTime=" + expireTime +
+                ", ipaddr='" + ipaddr + '\'' +
+                ", loginLocation='" + loginLocation + '\'' +
+                ", browser='" + browser + '\'' +
+                ", os='" + os + '\'' +
+                ", permissions=" + permissions +
+                ", user=" + user +
+                '}';
+    }
 }
@@ -5,6 +5,8 @@ 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.Logger;
+import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -36,6 +38,8 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     private final static String USER_ID_KEY = "userId";
     private final static String REQUEST_ID_KEY = "requestId";
  
+    private final static Logger LOGGER = LoggerFactory.getLogger(JwtAuthenticationTokenFilter.class);
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {
@@ -62,6 +66,14 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
             return null;
         }
  
+        String authorization = null;
+        HttpServletRequest request = getRequest();
+        if(Objects.nonNull(request)){
+            authorization = request.getHeader("Authorization");
+        }
+
+        LOGGER.warn("device:[{}],authorization：[{}],loginUser:[{}]",device,authorization,loginUser);
+
         return "登陆的设备和token不匹配";
     }