addUcenterUser 添加同步锁

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -187,13 +187,18 @@ public class LaserService {
     }
 
     public void delete(String num) {
-        Map<String,Object> params = new HashMap<>();
-        params.put("sceneCode", num);
-        params.put("status", -1);
-        Result result = laserClient.saveOrEdit(num, params);
-        if(result.getCode() != HttpStatus.OK.value()){
-            log.error("激光场景状态同步失败!");
+        try {
+            Map<String,Object> params = new HashMap<>();
+            params.put("sceneCode", num);
+            params.put("status", -1);
+            Result result = laserClient.saveOrEdit(num, params);
+            if(result.getCode() != HttpStatus.OK.value()){
+                log.error("激光场景状态同步失败!");
+            }
+        }catch (Exception e){
+            log.error("激光场景状态同步失败!",e);
         }
+
     }
 
 

src/main/java/com/fdkankan/manage/service/IScenePlusExtService.java

@@ -19,4 +19,6 @@ public interface IScenePlusExtService extends IService<ScenePlusExt> {
     ScenePlusExt getByPlusId(Long plusId);
 
     HashMap<Long, ScenePlusExt> getByPlusIds(List<Long> plusIds);
+
+    void delByPlus(Long plusId);
 }

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -122,6 +122,9 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         List<Camera> cameraList = new ArrayList<>();
         for (String wifiName : wifiNameSet) {
             String[] res = wifiName.split("_");
+            if(res.length !=2 && StringUtils.isBlank(res[1])){
+                throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
+            }
             Camera camera = new Camera();
             camera.setWifiName(wifiName);
             camera.setSnCode(res[1]);

src/main/java/com/fdkankan/manage/service/impl/ScenePlusExtServiceImpl.java

@@ -40,4 +40,11 @@ public class ScenePlusExtServiceImpl extends ServiceImpl<IScenePlusExtMapper, Sc
         list.forEach(entity -> map.put(entity.getPlusId(),entity));
         return map;
     }
+
+    @Override
+    public void delByPlus(Long plusId) {
+        LambdaQueryWrapper<ScenePlusExt> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlusExt::getPlusId,plusId);
+        this.remove(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -447,8 +447,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         ScenePlus scenePlus = scenePlusService.getByNum(num);
         if(scenePlus!=null){
             scenePlusService.removeById(scenePlus.getId());
+            scenePlusExtService.delByPlus(scenePlus.getId());
+        }
+        if(num.contains("SS")){
+            laserService.delete(num);
         }
-        laserService.delete(num);
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -174,7 +174,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public void addUcenterUser(UserParam param) {
+    public synchronized void addUcenterUser(UserParam param) {
         if(StringUtils.isBlank(param.getUserName()) || StringUtils.isBlank(param.getNickName()) || StringUtils.isBlank(param.getPassword())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }