传感器-公有名称不重复

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

@@ -83,7 +83,11 @@ public class GpsCtrl {
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
         ResponseBodyVO<GpsPO> response = new ResponseBodyVO<GpsPO>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(gpsService.shareGps(gpsPO));
+        GpsPO po = gpsService.shareGps(gpsPO);
+        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/ctrl/LidarCtrl.java

@@ -83,7 +83,11 @@ public class LidarCtrl {
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
         ResponseBodyVO<LidarPO> response = new ResponseBodyVO<LidarPO>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(lidarService.shareLidar(lidarPO));
+        LidarPO po = lidarService.shareLidar(lidarPO);
+        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/ctrl/OgtCtrl.java

@@ -82,7 +82,11 @@ public class OgtCtrl {
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
         ResponseBodyVO<OgtPO> response = new ResponseBodyVO<OgtPO>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(ogtService.shareOgt(ogtPO));
+        OgtPO po = ogtService.shareOgt(ogtPO);
+        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/GpsService.java

@@ -48,6 +48,7 @@ public class GpsService {
         gpsPO.setModifyUserId(currentUserId);
         gpsPO.setModifyTime(currentTime);
         gpsPO.setIsDeleted(DictConstants.NO);
+        gpsPO.setShare(DictConstants.NO);//私有
         //名称校验
         List<GpsVO> list = gpsMapper.checkGpsName(gpsPO);
         if(ObjectUtil.isNotNull(list)){
@@ -58,7 +59,6 @@ public class GpsService {
         if(ObjectUtil.isNull(id)){//新增
             gpsPO.setId(StringUtil.getRandomUUID());
             gpsPO.setSensorCode(StringUtil.getRandomUUID());
-            gpsPO.setShare(DictConstants.NO);//私有
             gpsMapper.insert(gpsPO);
         }else{//修改
             gpsMapper.update(gpsPO);
@@ -67,6 +67,14 @@ public class GpsService {
     }
 
     public GpsPO shareGps(GpsPO gpsPO) {
+        gpsPO.setShare(DictConstants.YES);//转公有
+        gpsPO.setCreateUserId(null);
+        //名称校验
+        List<GpsVO> list = gpsMapper.checkGpsName(gpsPO);
+        if(ObjectUtil.isNotNull(list)){
+            gpsPO.setId(null);
+            return gpsPO;
+        }
         //常规字段赋值
         String currentUserId = AuthUtil.getCurrentUserId();
         Timestamp currentTime = TimeUtil.getNowForMysql();
@@ -75,8 +83,6 @@ public class GpsService {
         gpsPO.setModifyUserId(currentUserId);
         gpsPO.setModifyTime(currentTime);
         gpsPO.setIsDeleted(DictConstants.NO);
-
-        gpsPO.setShare(DictConstants.YES);//转公有
         gpsPO.setId(StringUtil.getRandomUUID());
         gpsPO.setSensorCode(StringUtil.getRandomCode());
         gpsMapper.insert(gpsPO);

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

@@ -48,6 +48,7 @@ public class LidarService {
         lidarPO.setModifyUserId(currentUserId);
         lidarPO.setModifyTime(currentTime);
         lidarPO.setIsDeleted(DictConstants.NO);
+        lidarPO.setShare(DictConstants.NO);//私有
         //名称校验
         List<LidarVO> list = lidarMapper.checkLidarName(lidarPO);
         if(ObjectUtil.isNotNull(list)){
@@ -58,7 +59,6 @@ public class LidarService {
         if(ObjectUtil.isNull(id)){//新增
             lidarPO.setId(StringUtil.getRandomUUID());
             lidarPO.setSensorCode(StringUtil.getRandomCode());
-            lidarPO.setShare(DictConstants.NO);//私有
             lidarMapper.insert(lidarPO);
         }else{//修改
             lidarMapper.update(lidarPO);
@@ -67,6 +67,14 @@ public class LidarService {
     }
 
     public LidarPO shareLidar(LidarPO lidarPO) {
+        lidarPO.setShare(DictConstants.YES);//转公有
+        lidarPO.setCreateUserId(null);
+        //名称校验
+        List<LidarVO> list = lidarMapper.checkLidarName(lidarPO);
+        if(ObjectUtil.isNotNull(list)){
+            lidarPO.setId(null);
+            return lidarPO;
+        }
         //常规字段赋值
         String currentUserId = AuthUtil.getCurrentUserId();
         Timestamp currentTime = TimeUtil.getNowForMysql();
@@ -75,8 +83,6 @@ public class LidarService {
         lidarPO.setModifyUserId(currentUserId);
         lidarPO.setModifyTime(currentTime);
         lidarPO.setIsDeleted(DictConstants.NO);
-
-        lidarPO.setShare(DictConstants.YES);//转公有
         lidarPO.setId(StringUtil.getRandomUUID());
         lidarPO.setSensorCode(StringUtil.getRandomCode());
         lidarMapper.insert(lidarPO);

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

@@ -50,6 +50,7 @@ public class OgtService {
         ogtPO.setModifyUserId(currentUserId);
         ogtPO.setModifyTime(currentTime);
         ogtPO.setIsDeleted(DictConstants.NO);
+        ogtPO.setShare(DictConstants.NO);//私有
         //名称校验
         List<OgtVO> list = ogtMapper.checkOgtName(ogtPO);
         if(ObjectUtil.isNotNull(list)){
@@ -60,7 +61,6 @@ public class OgtService {
         if(ObjectUtil.isNull(id)){//新增
             ogtPO.setId(StringUtil.getRandomUUID());
             ogtPO.setSensorCode(StringUtil.getRandomCode());
-            ogtPO.setShare(DictConstants.NO);//私有
             ogtMapper.insert(ogtPO);
         }else{//修改
             ogtMapper.update(ogtPO);
@@ -69,6 +69,14 @@ public class OgtService {
     }
 
     public OgtPO shareOgt(OgtPO ogtPO) {
+        ogtPO.setShare(DictConstants.YES);//转公有
+        ogtPO.setCreateUserId(null);
+        //名称校验
+        List<OgtVO> list = ogtMapper.checkOgtName(ogtPO);
+        if(ObjectUtil.isNotNull(list)){
+            ogtPO.setId(null);
+            return ogtPO;
+        }
         //常规字段赋值
         String currentUserId = AuthUtil.getCurrentUserId();
         Timestamp currentTime = TimeUtil.getNowForMysql();
@@ -77,8 +85,6 @@ public class OgtService {
         ogtPO.setModifyUserId(currentUserId);
         ogtPO.setModifyTime(currentTime);
         ogtPO.setIsDeleted(DictConstants.NO);
-
-        ogtPO.setShare(DictConstants.YES);//转公有
         ogtPO.setId(StringUtil.getRandomUUID());
         ogtPO.setSensorCode(StringUtil.getRandomCode());
         ogtMapper.insert(ogtPO);

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

@@ -45,10 +45,15 @@
         select
             id
         from model_sensor_gps
-        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.GpsPO">

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

@@ -50,10 +50,15 @@
         select
             id
         from model_sensor_lidar
-        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.LidarPO">

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

@@ -52,10 +52,15 @@
         select
             id
         from model_sensor_ogt
-        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.OgtPO">