厨房员工新增修改发送MQTT

bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java

@@ -149,7 +149,7 @@ public interface LeMqConstant {
       DEVICE_STALL_UPDATE_WEIGHTINFO_V2("device-stall-update-weightinfo-v2", "通知计量主机状态(余量看板)"),
       DEVICE_TIME_CALIBRATION_V4("time-calibration-v4", "设备时间校准"),
       DEVICE_UPDATE_PERSONAL_CONFIG_V4("device-update-person-config-v4", "通知设备人员和特征值更新"),
-      MORNING_INSPECTION_DEVICE_UPDATE_PERSONAL_CONFIG_V4(" morning_inspection_device_update_person_config_v4", "通知晨检设备人员和特征值更新"),
+      MORNING_INSPECTION_DEVICE_UPDATE_PERSONAL_CONFIG_V4("morning-inspection-device-update-person-config-v4", "通知晨检设备人员和特征值更新"),
       DEVICE_SYNC_ACCOUNT_BALANCE_V1("device-sync-acc-balance-v1", "设备实时同步账户余额v1"),
       DEVICE_SYNC_ACCOUNT_BALANCE_V4("device-sync-acc-balance-v4", "设备实时同步账户余额v4"),
       DEVICE_UPDATE_MENU_CONFIG_V4("device-update-menu-config-v4", "设备下发菜谱通知"),

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/healthmachine/controller/HealthMachineController.java

@@ -23,8 +23,8 @@ import javax.validation.Valid;
 public class HealthMachineController extends BaseController {
 
     @ApiOperation("检查人员是否存在并获取人员信息")
-    @PostMapping({"/getPhoneUser/restful"})
+    @GetMapping({"/getPhoneUser/restful"})
-    public BaseUserResponse<UserData> checkUserIsExist(@RequestBody @Valid UserDTO dto) {
+    public BaseUserResponse<UserData> checkUserIsExist(@Valid UserDTO dto) {
         UserData userData = new UserData("1","张三","13800138000","http://example.com/photo.jpg",22,false);
         System.out.println("dto = " + dto);
         return BaseUserResponse.success(userData);

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffFaceServiceImpl.java

@@ -54,8 +54,8 @@ public class KitchenStaffFaceServiceImpl implements IKitchenStaffFaceService {
         if (StringUtils.isEmpty(dto.getPhotoUrl())) {
             kitchenStaffFaceMapper.deleteStaffFace(dto);
 //            //发送mq
-//            DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePersonPhoto(dto.getStaffId().intValue(),"del");
+            DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePersonPhoto(dto.getStaffId().intValue(),"del");
-//            MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4);
+            MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.MORNING_INSPECTION_DEVICE_UPDATE_PERSONAL_CONFIG_V4);
         } else {
             log.info("开始采集虹软人脸");
             ArcFaceHelper arcFaceHelper = new ArcFaceHelper();

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffInfoServiceImpl.java

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 
 import cn.hutool.core.collection.CollUtil;
+import com.bonus.canteen.core.common.utils.MqUtil;
 import com.bonus.canteen.core.kitchen.domain.*;
 import com.bonus.canteen.core.kitchen.domain.constants.StaffFaceStateEnum;
 import com.bonus.canteen.core.kitchen.mapper.*;
@@ -12,12 +13,14 @@ import com.bonus.canteen.core.kitchen.domain.constants.HealthCertStatusEnum;
 import com.bonus.canteen.core.kitchen.service.IKitchenStaffDevicePrivilegeService;
 import com.bonus.canteen.core.kitchen.service.IKitchenStaffFaceService;
 import com.bonus.canteen.core.kitchen.vo.KitchenDeviceListVO;
+import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO;
 import com.bonus.canteen.core.user.domain.UserFace;
 import com.bonus.canteen.core.user.service.IUserFaceService;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.houqin.constant.DeviceTypeEnum;
+import com.bonus.common.houqin.mq.constant.LeMqConstant;
 import com.bonus.common.houqin.utils.SM4EncryptUtils;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.mysql.cj.x.protobuf.MysqlxDatatypes;
@@ -262,9 +265,16 @@ public class KitchenStaffInfoServiceImpl implements IKitchenStaffInfoService {
      */
     @Override
     public int deleteKitchenStaffInfoByStaffIds(Long[] staffIds) {
-        kitchenStaffDevicePrivilegeMapper.deleteKitchenStaffDevicePrivilegeByStaffIds(staffIds);
+        try {
-        kitchenStaffFaceMapper.deleteStaffFaces(staffIds);
+            kitchenStaffDevicePrivilegeMapper.deleteKitchenStaffDevicePrivilegeByStaffIds(staffIds);
-        return kitchenStaffInfoMapper.deleteKitchenStaffInfoByStaffIds(staffIds);
+            kitchenStaffFaceMapper.deleteStaffFaces(staffIds);
+            kitchenStaffInfoMapper.deleteKitchenStaffInfoByStaffIds(staffIds);
+            DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePersonPhoto(staffIds[0].intValue(),"del");
+            MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.MORNING_INSPECTION_DEVICE_UPDATE_PERSONAL_CONFIG_V4);
+        }catch (Exception w){
+            throw new ServiceException("删除失败！");
+        }
+        return 1;
     }
 
     /**
@@ -275,10 +285,17 @@ public class KitchenStaffInfoServiceImpl implements IKitchenStaffInfoService {
      */
     @Override
     public int deleteKitchenStaffInfoByStaffId(Long staffId) {
-        kitchenStaffDevicePrivilegeMapper.deleteKitchenStaffDevicePrivilegeByStaffId(staffId);
+        try {
-        KitchenStaffFace kitchenStaffFace = new KitchenStaffFace();
+            kitchenStaffDevicePrivilegeMapper.deleteKitchenStaffDevicePrivilegeByStaffId(staffId);
-        kitchenStaffFace.setStaffId(staffId);
+            KitchenStaffFace kitchenStaffFace = new KitchenStaffFace();
-        kitchenStaffFaceMapper.deleteStaffFace(kitchenStaffFace);
+            kitchenStaffFace.setStaffId(staffId);
-        return kitchenStaffInfoMapper.deleteKitchenStaffInfoByStaffId(staffId);
+            kitchenStaffFaceMapper.deleteStaffFace(kitchenStaffFace);
+            kitchenStaffInfoMapper.deleteKitchenStaffInfoByStaffId(staffId);
+            DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePersonPhoto(staffId.intValue(),"del");
+            MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.MORNING_INSPECTION_DEVICE_UPDATE_PERSONAL_CONFIG_V4);
+        }catch (Exception w){
+            throw new ServiceException("删除失败！");
+        }
+        return 1;
     }
 }