传感器-摄像头-公有名称不重复

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/CameraCtrl.java

@@ -83,7 +83,11 @@ public class CameraCtrl {
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
         ResponseBodyVO<CameraPO> response = new ResponseBodyVO<CameraPO>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(cameraService.shareCamera(cameraPO));
+        CameraPO po = cameraService.shareCamera(cameraPO);
+        if(ObjectUtil.isNull(po.getId())){
+            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+        }
+        response.setInfo(po);
         return response;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/CameraService.java

@@ -49,6 +49,7 @@ public class CameraService {
         cameraPO.setModifyUserId(currentUserId);
         cameraPO.setModifyTime(currentTime);
         cameraPO.setIsDeleted(DictConstants.NO);
+        cameraPO.setShare(DictConstants.NO);//私有
         //名称校验
         List<CameraVO> list = cameraMapper.checkCameraName(cameraPO);
         if(ObjectUtil.isNotNull(list)){
@@ -59,7 +60,6 @@ public class CameraService {
         if(ObjectUtil.isNull(id)){//新增
             cameraPO.setId(StringUtil.getRandomUUID());
             cameraPO.setSensorCode(StringUtil.getRandomCode());
-            cameraPO.setShare(DictConstants.NO);//私有
             cameraMapper.insert(cameraPO);
         }else{//修改
             cameraMapper.update(cameraPO);
@@ -68,6 +68,14 @@ public class CameraService {
     }
 
     public CameraPO shareCamera(CameraPO cameraPO) {
+        cameraPO.setShare(DictConstants.YES);//转公有
+        cameraPO.setCreateUserId(null);
+        //名称校验
+        List<CameraVO> list = cameraMapper.checkCameraName(cameraPO);
+        if(ObjectUtil.isNotNull(list)){
+            cameraPO.setId(null);
+            return cameraPO;
+        }
         //常规字段赋值
         String currentUserId = AuthUtil.getCurrentUserId();
         Timestamp currentTime = TimeUtil.getNowForMysql();
@@ -76,8 +84,6 @@ public class CameraService {
         cameraPO.setModifyUserId(currentUserId);
         cameraPO.setModifyTime(currentTime);
         cameraPO.setIsDeleted(DictConstants.NO);
-
-        cameraPO.setShare(DictConstants.YES);//转公有
         cameraPO.setId(StringUtil.getRandomUUID());
         cameraPO.setSensorCode(StringUtil.getRandomCode());
         cameraMapper.insert(cameraPO);

simulation-resource-server/src/main/resources/mapper/model/CameraMapper.xml

@@ -61,10 +61,15 @@
         select
             id
         from model_sensor_camera
-        where is_deleted = '0' and share = '0'
+        where is_deleted = '0'
           and sensor_name = #{sensorName,jdbcType=VARCHAR}
-          and create_user_id = #{createUserId,jdbcType=VARCHAR}
-          and id <> #{id,jdbcType=VARCHAR}
+        <if test="share != null and share != ''">
+            and share = #{share,jdbcType=VARCHAR}
+        </if>
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id = #{createUserId,jdbcType=VARCHAR}
+            and id &lt;&gt; #{id,jdbcType=VARCHAR}
+        </if>
     </select>
 
     <insert id="insert" parameterType="api.common.pojo.po.model.CameraPO">