1

src/main/java/com/fdkankan/manage_jp/controller/TestController.java

@@ -9,9 +9,11 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage_jp.common.Result;
 import com.fdkankan.manage_jp.entity.ScenePlus;
 import com.fdkankan.manage_jp.entity.ScenePlusExt;
+import com.fdkankan.manage_jp.service.ICameraService;
 import com.fdkankan.manage_jp.service.IScenePlusExtService;
 import com.fdkankan.manage_jp.service.IScenePlusService;
 import com.fdkankan.manage_jp.service.IUserService;
+import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.LoginParam;
 import com.fdkankan.manage_jp.vo.request.UserListParam;
 import com.fdkankan.manage_jp.vo.request.UserParam;
@@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import sun.rmi.runtime.Log;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -70,6 +73,65 @@ public class TestController extends BaseController {
         }
         return Result.success();
     }
+    @Autowired
+    ICameraService cameraService;
+
+    @GetMapping("/inCameras")
+    public Result inCameras(){
+        String [] res = getCameraSncodes();
+        for (String snCode : res) {
+            CameraAddParam param = new CameraAddParam()  ;
+            param.setCameraType(10);
+            param.setOwn(0);
+            param.setSnCode(snCode);
+            param.setAddress(snCode);
+            param.setChildName(snCode);
+            param.setWifiName("4DSS_"+snCode);
+            try {
+                cameraService.add(param);
+
+            } catch (Exception e)   {
+                continue;
+            }
+        }
+
+        return Result.success();
+    }
+
+    private String []  getCameraSncodes() {
+        return new String[]{
+                "A0CRM0130",
+                "A07RNP122",
+                "A0G0U1046",
+                "A0QPH9132",
+                "A090YW021",
+                "A0BSPU003",
+                "A0M046126",
+                "A0LBEA116",
+                "A00RXW117",
+                "A0XAEL120",
+                "A0A30E127",
+                "A097RY114",
+                "A033C5128",
+                "A0FQXK111",
+                "A00JL1103",
+                "A055UW105",
+                "A0IWCU024",
+                "A04NLK025",
+                "A0S0KL026",
+                "A0WRD9028",
+                "A0GZAH023",
+                "A0LVJM029",
+                "A0U5PW011",
+                "A0CTKG007",
+                "A0RZT7012",
+                "A0JM1I002",
+                "A03AW0017",
+                "A06A0S013",
+                "A0IQS6047",
+                "A0Q6MJ009",
+        };
+    }
 
 }
 

src/main/java/com/fdkankan/manage_jp/service/IScenePlusService.java

@@ -15,7 +15,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ScenePlus getByNum(String sceneNum);
 
-    void unbind(Long cameraId);
+    void unbind(Long cameraId,Long userId);
 
     ScenePlus copyScene(ScenePlus scenePlus);
 }

src/main/java/com/fdkankan/manage_jp/service/ISceneProService.java

@@ -28,7 +28,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void deleteByNum(String sceneNum);
 
-    void unbind(Long cameraId);
+    void unbind(Long cameraId,Long userId);
 
     ScenePro copyScene(ScenePro scenePro);
 }

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

@@ -96,6 +96,7 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         camera.setSnCode(param.getSnCode());
         camera.setWifiName(param.getWifiName());
         camera.setWifiPassword(Constant.WIFI_PASSWORD_VALUE);
+       // camera.setActivatedTime(DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
         this.save(camera);
 
         CameraDetail detail = new CameraDetail();
@@ -114,6 +115,7 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         detail.setOutTime(new Date());
         detail.setAgency(Constant.DEFAULT_AGENT);
         detail.setAddress(param.getAddress());
+      //  detail.setCompanyId(112L);
         cameraDetailService.save(detail);
     }
 
@@ -145,8 +147,8 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         this.update(wrapper);
 
         cameraDetailService.unbind(camera.getId());
-        sceneProService.unbind(camera.getId());
-        scenePlusService.unbind(camera.getId());
+        sceneProService.unbind(camera.getId(),null);
+        scenePlusService.unbind(camera.getId(),null);
         if(cameraDetail.getType() == 10){
             laserService.toBind(Arrays.asList(camera.getSnCode()),false,null);
         }
@@ -173,7 +175,11 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         List<Camera> byChildNames = this.getByChildNames(param.getChildNames());
         List<Long> cameraIds = byChildNames.stream().map(Camera::getId).collect(Collectors.toList());
         cameraDetailService.bind(cameraIds,param.getCompanyId());
+        for (Long cameraId : cameraIds) {
+            sceneProService.unbind(cameraId, user.getId());
+            scenePlusService.unbind(cameraId,user.getId());
 
+        }
     }
 
     @Override

src/main/java/com/fdkankan/manage_jp/service/impl/ScenePlusServiceImpl.java

@@ -68,10 +68,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public void unbind(Long cameraId) {
+    public void unbind(Long cameraId,Long userId) {
         LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ScenePlus::getCameraId,cameraId);
-        wrapper.set(ScenePlus::getUserId,null);
+        wrapper.set(ScenePlus::getUserId,userId);
         this.update(wrapper);
     }
 

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

@@ -192,11 +192,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public void unbind(Long cameraId) {
+    public void unbind(Long cameraId,Long userId) {
         LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ScenePro::getCameraId,cameraId);
         wrapper.eq(ScenePro::getIsUpgrade,0);
-        wrapper.set(ScenePro::getUserId,null);
+        wrapper.set(ScenePro::getUserId,userId);
         this.update(wrapper);
     }