Merge branch 'test'

src/main/java/com/fdkankan/manage/ManageApplication.java

@@ -27,6 +27,10 @@ public class ManageApplication implements CommandLineRunner {
     private String cameraUnit;
     @Value("${camera.space.num:10737418240}")
     private String cameraSpaceNum;
+    @Value("${camera.snCode.publicKey:1}")
+    private String publicKey;
+    @Value("${camera.snCode.privateKey:1}")
+    private String privateKey;
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
@@ -38,6 +42,8 @@ public class ManageApplication implements CommandLineRunner {
         CacheUtil.bucket = bucket;
         CacheUtil.cameraUnit = cameraUnit;
         CacheUtil.cameraSpaceNum = cameraSpaceNum;
+        CacheUtil.publicKey = publicKey;
+        CacheUtil.privateKey = privateKey;
 
     }
 }

src/main/java/com/fdkankan/manage/common/CacheUtil.java

@@ -9,6 +9,8 @@ public class CacheUtil {
     public static String bucket;
     public static String cameraUnit;
     public static String cameraSpaceNum;
+    public static String publicKey;
+    public static String privateKey;
     public static OrderParam orderParam = new OrderParam();
     public static AgentNewLogParam agentParam = new AgentNewLogParam();
 

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

@@ -95,6 +95,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     public Long getCountByCameraId(Long cameraId) {
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePlus::getCameraId,cameraId);
+        wrapper.eq(ScenePlus::getSceneStatus,-2);
         return this.count(wrapper);
     }
 }

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

@@ -681,6 +681,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePro::getIsUpgrade,0);
         wrapper.eq(ScenePro::getCameraId,cameraId);
+        wrapper.eq(ScenePro::getStatus,-2);
         return this.count(wrapper);
     }
 }

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -32,6 +32,6 @@
         GROUP BY camera_id
     </select>
     <select id="getSpaceSumByCameraId" resultType="java.lang.Long">
-        select  sum(space) from  t_scene_plus p left join t_scene_plus_ext e on p.id = e.plus_id and p.rec_status = 'A' and p.camera_id = #{cameraId}
+        select  sum(space) from  t_scene_plus p left join t_scene_plus_ext e on p.id = e.plus_id where p.rec_status = 'A' and p.scene_status = -2 and p.camera_id = #{cameraId}
     </select>
 </mapper>

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

@@ -104,7 +104,7 @@
     </select>
 
     <select id="getSpaceSumByCameraId" resultType="java.lang.Long">
-        select sum(space) from t_scene_pro where rec_status= 'A' and is_upgrade = 0 and camera_id = #{cameraId}
+        select sum(space) from t_scene_pro where rec_status= 'A' and status = -2 and is_upgrade = 0 and camera_id = #{cameraId}
     </select>