Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/common/utils/ImageUtil.java

@@ -94,5 +94,11 @@ public class ImageUtil {
         return new String(Base64.getEncoder().encode(bytes), StandardCharsets.UTF_8);
     }
 
+    // base64图片去掉前缀
+    public static String base64RemovePrefix(String baseStr) {
+        return baseStr.replace("data:image/jpg;base64,", "")
+                .replace("data:image/jpeg;base64,", "")
+                .replace("data:image/png;base64,", "");
+    }
 
 }

src/main/java/com/xjrsoft/module/mqtt/face/service/FaceImageVerifySuccess.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xjrsoft.common.mqtt.EmqClient;
 import com.xjrsoft.common.mqtt.MqttSubscribe;
+import com.xjrsoft.common.utils.ImageUtil;
 import com.xjrsoft.module.personnel.entity.CarManagement;
 import com.xjrsoft.module.personnel.entity.FaceManagement;
 import com.xjrsoft.module.personnel.service.IFaceManagementService;
@@ -48,7 +49,7 @@ public class FaceImageVerifySuccess implements IMqttMessageListener {
                         .put("sex", f.getSex())
                         .put("peoplestadate", DateUtil.format(f.getPeopleStartDate(), "yyyy-MM-dd HH:mm:ss"))
                         .put("peopleenddate", DateUtil.format(f.getPeopleEndDate(), "yyyy-MM-dd HH:mm:ss"))
-                        .put("register_base64", f.getRegisterBase64().replace("data:image/jpeg;base64,", ""));
+                        .put("register_base64", ImageUtil.base64RemovePrefix(f.getRegisterBase64()));
 
                 try {
                     emqClient.publish("/face/device/personnel/add", jsonObject);

src/main/java/com/xjrsoft/module/personnel/service/impl/FaceManagementServiceImpl.java

@@ -8,6 +8,7 @@ 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.common.utils.ImageUtil;
 import com.xjrsoft.module.app.entity.AppPageDesign;
 import com.xjrsoft.module.personnel.entity.CarManagement;
 import com.xjrsoft.module.personnel.entity.FaceManagement;
@@ -44,7 +45,7 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
         // 推送数据客户端
         JSONObject jsonObject = JSONUtil.createObj()
                 .put("id", faceManagement.getId().toString())
-                .put("register_base64", base64Handler(faceManagement.getRegisterBase64()));
+                .put("register_base64", ImageUtil.base64RemovePrefix(faceManagement.getRegisterBase64()));
 
         try {
             emqClient.publish("/face/device/personnel/image/verify", jsonObject);
@@ -69,7 +70,7 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
         // 推送数据客户端
         JSONObject jsonObject = JSONUtil.createObj()
                 .put("id", faceManagement.getId().toString())
-                .put("register_base64", base64Handler(faceManagement.getRegisterBase64()));
+                .put("register_base64", ImageUtil.base64RemovePrefix(faceManagement.getRegisterBase64()));
 
         try {
             emqClient.publish("/face/device/personnel/image/verify", jsonObject);
@@ -80,12 +81,7 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
         return true;
     }
 
-    // base64图片处理
-    private String base64Handler(String baseStr) {
-        return baseStr.replace("data:image/jpg;base64,", "")
-                .replace("data:image/jpeg;base64,", "")
-                .replace("data:image/png;base64,", "");
-    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -101,9 +97,9 @@ public class FaceManagementServiceImpl extends MPJBaseServiceImpl<FaceManagement
                     .put("employee_number", item.getFaceCode());
 
             try {
-                emqClient.publish("/car/identify/delete", jsonObject);
+                emqClient.publish("/face/device/personnel/delete", jsonObject);
             } catch (MqttException e) {
-                log.error("mqtt", "publish", "/car/identify/delete", e.getMessage());
+                log.error("mqtt", "publish", "/face/device/personnel/delete", e.getMessage());
             }
         }