修改

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java

@@ -186,10 +186,13 @@ public interface ErrorCodeConstants {
     ErrorCode BUSINESS_NOT_EXISTS = new ErrorCode(1_002_036_002, "营业统计不存在");
     // ========== 门店 流水 1_002_037_002 ==========
     ErrorCode DEVUCE_NOT_EXISTS = new ErrorCode(1_002_037_002, "设备不存在");
-    // ========== 门店 设备日流水 1_002_038_002 ==========
+    ErrorCode DEVUCE_EXISTS = new ErrorCode(1_002_037_002, "设备已存在");
     ErrorCode DEVICE_MONEY_NOT_EXISTS = new ErrorCode(1_002_038_002, "门店设备流水不存在");
     // ========== 门店 设备日流水 1_002_039_002 ==========
     ErrorCode MATERIAL_NOT_EXISTS = new ErrorCode(1_002_039_002, "门店材料库存不存在");
 
     ErrorCode FACE_DEVICE_INFO_NOT_EXISTS = new ErrorCode(1_002_040_002, "人脸设备信息关联门店不存在");
+
+    ErrorCode FACE_DEVICE_INFO_EXISTS = new ErrorCode(1_002_040_003, "设备码已存在");
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.deviceinfo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 设备信息关联门店新增/修改 Request VO")
 @Data
@@ -19,6 +19,7 @@ public class DeviceInfoSaveReqVO {
     private Long carteenId;
 
     @Schema(description = "设备ip")
+    @NotNull(message = "设备码不能为空")
     private String deviceIp;
 
     @Schema(description = "设备名称", example = "张三")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.facedeviceinfo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 人脸设备信息关联门店新增/修改 Request VO")
 @Data
@@ -13,6 +13,7 @@ public class FaceDeviceInfoSaveReqVO {
     private Long id;
 
     @Schema(description = "设备mac码")
+    @NotNull(message = "设备码不能为空")
     private String mac;
 
     @Schema(description = "门店编号", example = "29678")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/deviceinfo/AppDeviceInfoController.java

@@ -29,7 +29,6 @@ public class AppDeviceInfoController {
 
     @PostMapping("/create")
     @Operation(summary = "创建设备信息关联门店")
-    @PreAuthorize("@ss.hasPermission('t:device-info:create')")
     public CommonResult<Long> createDeviceInfo(@Valid @RequestBody DeviceInfoSaveReqVO createReqVO) {
         return success(deviceInfoService.createDeviceInfo(createReqVO));
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java

@@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.facedeviceinfo.FaceDeviceIn
 import cn.iocoder.yudao.module.system.dal.mysql.deviceInfo.DeviceInfoMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.facedeviceinfo.FaceDeviceInfoMapper;
 import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.system.service.facedeviceinfo.FaceDeviceInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -50,6 +50,10 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
     public Long createDeviceInfo(DeviceInfoSaveReqVO createReqVO) {
         // 插入
         DeviceInfoDO deviceInfo = BeanUtils.toBean(createReqVO, DeviceInfoDO.class);
+        List<DeviceInfoDO> deviceInfoDOS = deviceInfoMapper.selectList(new LambdaQueryWrapper<DeviceInfoDO>().eq(DeviceInfoDO::getDeviceIp, createReqVO.getDeviceIp()));
+        if (CollectionUtil.isNotEmpty(deviceInfoDOS)){
+            throw exception(ErrorCodeConstants.DEVUCE_EXISTS);
+        }
         deviceInfoMapper.insert(deviceInfo);
         // 返回
         return deviceInfo.getId();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/facedeviceinfo/FaceDeviceInfoServiceImpl.java

@@ -16,6 +16,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.FACE_DEVICE_INFO_EXISTS;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.FACE_DEVICE_INFO_NOT_EXISTS;
 
 
@@ -38,6 +39,11 @@ public class FaceDeviceInfoServiceImpl implements FaceDeviceInfoService {
     public Long createFaceDeviceInfo(FaceDeviceInfoSaveReqVO createReqVO) {
         // 插入
         FaceDeviceInfoDO faceDeviceInfo = BeanUtils.toBean(createReqVO, FaceDeviceInfoDO.class);
+        List<FaceDeviceInfoDO> faceDeviceInfoDOS = faceDeviceInfoMapper.selectList(new LambdaQueryWrapper<FaceDeviceInfoDO>().eq(FaceDeviceInfoDO::getMac, createReqVO.getMac()));
+        if (CollectionUtil.isNotEmpty(faceDeviceInfoDOS)){
+            throw exception(FACE_DEVICE_INFO_EXISTS);
+        }
+
         faceDeviceInfoMapper.insert(faceDeviceInfo);
         // 返回
         return faceDeviceInfo.getId();