fanxp 1 year ago
parent
commit
d7248c0b10

+ 1 - 1
src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -156,6 +156,6 @@ public class FaceManagementController {
         Long maxSize = 1048576L; // 最大文件1M
         byte[] resultImg = ImageUtil.compressUnderSize(file.getBytes(), maxSize);
 
-        return map.get(imgSuffix) + ImageUtil.bytesEncode2Base64(resultImg);
+        return map.get(suffix) + ImageUtil.bytesEncode2Base64(resultImg);
     }
 }

+ 12 - 4
src/main/java/com/xjrsoft/module/personnel/service/impl/FaceManagementServiceImpl.java

@@ -4,8 +4,11 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.mqtt.EmqClient;
+import com.xjrsoft.module.app.entity.AppPageDesign;
 import com.xjrsoft.module.personnel.entity.CarManagement;
 import com.xjrsoft.module.personnel.entity.FaceManagement;
 import com.xjrsoft.module.personnel.mapper.FaceManagementMapper;
@@ -31,12 +34,17 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(FaceManagement faceManagement) {
+        FaceManagement old = faceManagementMapper.selectOne(Wrappers.<FaceManagement>query().lambda().eq(FaceManagement::getFaceCode, faceManagement.getFaceCode()));
+        if (old != null) {
+            throw new MyException(String.format("人脸编码【%s】已存在!", faceManagement.getFaceCode()));
+        }
+
         faceManagementMapper.insert(faceManagement);
 
         // 推送数据客户端
         JSONObject jsonObject = JSONUtil.createObj()
                 .put("id", faceManagement.getId().toString())
-                .put("register_base64", faceManagement.getRegisterBase64().replace("data:image/jpeg;base64,",""));
+                .put("register_base64", faceManagement.getRegisterBase64().replace("data:image/jpeg;base64,", ""));
 
         try {
             emqClient.publish("/face/device/personnel/image/verify", jsonObject);
@@ -52,7 +60,7 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
     public Boolean update(FaceManagement faceManagement) {
         faceManagement.setVerifyStatus(1);
         faceManagement.setSyncStatus(1);
-        if (faceManagement.getRegisterBase64()==null){
+        if (faceManagement.getRegisterBase64() == null) {
             FaceManagement old = faceManagementMapper.selectById(faceManagement.getId());
             faceManagement.setRegisterBase64(old.getRegisterBase64());
         }
@@ -61,7 +69,7 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
         // 推送数据客户端
         JSONObject jsonObject = JSONUtil.createObj()
                 .put("id", faceManagement.getId().toString())
-                .put("register_base64", faceManagement.getRegisterBase64().replace("data:image/jpeg;base64,",""));
+                .put("register_base64", faceManagement.getRegisterBase64().replace("data:image/jpeg;base64,", ""));
 
         try {
             emqClient.publish("/face/device/personnel/image/verify", jsonObject);
@@ -75,7 +83,7 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(List<Long> ids) {
-        LambdaQueryWrapper<FaceManagement> queryWrapper = new LambdaQueryWrapper<FaceManagement>().in(FaceManagement::getId,ids);
+        LambdaQueryWrapper<FaceManagement> queryWrapper = new LambdaQueryWrapper<FaceManagement>().in(FaceManagement::getId, ids);
         List<FaceManagement> oldCars = faceManagementMapper.selectList(queryWrapper);
         // 删除数据
         faceManagementMapper.deleteBatchIds(ids);