nacos 内网链接

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

@@ -248,9 +248,7 @@ public class LaserService {
         try {
             SSToBind param = new SSToBind();
             param.setBind(bind);
-            param.setPhone(phone);
             param.setSnCode(snCodes);
-            param.setUserId(0);
             Result result = laserClient.toBind(param);
             if(result.getCode() != HttpStatus.OK.value()){
                 log.error("激光场景状态同步失败!");

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

@@ -146,11 +146,11 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         this.update(wrapper);
 
         cameraDetailService.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);
-        }
+//        sceneProService.unbind(camera.getId(),null);
+//        scenePlusService.unbind(camera.getId(),null);
+//        if(cameraDetail.getType() == 10){
+//            //laserService.toBind(Arrays.asList(camera.getSnCode()),false,null);
+//        }
     }
 
     @Override
@@ -174,11 +174,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(),user.getId());
-        for (Long cameraId : cameraIds) {
-            sceneProService.unbind(cameraId, user.getId());
-            scenePlusService.unbind(cameraId,user.getId());
-
-        }
+//        for (Long cameraId : cameraIds) {
+//            sceneProService.unbind(cameraId, user.getId());
+//            scenePlusService.unbind(cameraId,user.getId());
+//
+//        }
     }
 
     @Override

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

@@ -109,8 +109,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Set<Long> roleIds = userRoleService.getByUser(user);
         if(!roleIds.contains(5L)){      //平台管理员
             param.setCompanyId(user.getCompanyId());
+            param.setUserId(user.getId());
             if(!roleIds.contains(6L)){
-                //param.setUserId(user.getId());
                 param.setIsDel(false);
             }
         }

src/main/resources/bootstrap-test.yml

@@ -4,7 +4,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 120.24.144.164:8848
+        server-addr: 172.18.156.39:8848
         file-extension: yaml
         namespace: 4dkankan-jp-v4-test
         extension-configs:

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -53,18 +53,15 @@
         <if test="param.companyName !=null and param.companyName !='' ">
             and co.company_name like concat ('%',#{param.companyName},'%')
         </if>
-        <if test="param.userId !=null ">
-            and s.user_id = #{param.userId}
-        </if>
-        <if test="param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size >0">
-            and ( co.id = #{param.companyId} or s.num in
+        <if test="param.userId !=null and param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size >0">
+            and ( s.user_id = #{param.userId} or co.id = #{param.companyId} or s.num in
             <foreach collection="param.cooperateSceneCodes" item="coNum" open="(" separator="," close=")">
                 #{coNum}
             </foreach>
             )
         </if>
-        <if test="param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size ==0 ">
-            and co.id = #{param.companyId}
+        <if test="param.userId !=null and param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size ==0 ">
+            and (co.id = #{param.companyId} or s.user_id = #{param.userId} )
         </if>
     </sql>