修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -364,10 +364,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
     }
 
     @PersonIdentify
-    @RequestMapping(value = "/addVideo", method = RequestMethod.GET)
+    @RequestMapping(value = "/replaceVideo", method = RequestMethod.POST)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "添加视频", produces = "application/json;charset=UTF-8", notes = "添加视频")
-    public ResponseModel addVideo(@RequestParam String ids, @RequestParam(required = false) String bizOrgCode) {
+    @ApiOperation(httpMethod = "POST", value = "添加视频", produces = "application/json;charset=UTF-8", notes = "添加视频")
+    public ResponseModel replaceVideo(@RequestBody String ids, @RequestParam(required = false) String bizOrgCode) {
         ReginParams reginParams = getSelectedOrgInfo();
         ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
         if (!ValidationUtil.isEmpty(personIdentity)) {
@@ -375,7 +375,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
-        return CommonResponseUtil.success(supervisionVideoService.addVide(ids, bizOrgCode));
+        return CommonResponseUtil.success(supervisionVideoService.replaceVideo(ids, bizOrgCode));
     }
 
     @PersonIdentify
@@ -394,14 +394,6 @@ public class SupervisionConfigureController extends AbstractBaseController {
     }
 
     @PersonIdentify
-    @RequestMapping(value = "/delVideo", method = RequestMethod.GET)
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "删除视频", produces = "application/json;charset=UTF-8", notes = "删除视频")
-    public ResponseModel delVideo(String id) {
-        return CommonResponseUtil.success(supervisionVideoService.deleteVideo(id));
-    }
-
-    @PersonIdentify
     @RequestMapping(value = "/queryVideoAllId", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询对应站下所有视频id", produces = "application/json;charset=UTF-8", notes = "根据id查询视频")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/SupervisionVideoMapper.java

@@ -14,5 +14,5 @@ public interface SupervisionVideoMapper extends BaseMapper<SupervisionVideo> {
 
     List<Map<String, Object>> getVideoByCompany(@Param("bizOrgCode") String bizOrgCode);
 
-    List<Map<String, Object>> queryVideoAllId(@Param("bizOrgCode")String bizOrgCode);
+    List<String> queryVideoAllId(@Param("bizOrgCode")String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISupervisionVideoService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.SupervisionVideo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author ZeHua Li
@@ -15,9 +14,7 @@ public interface ISupervisionVideoService extends IService<SupervisionVideo> {
 
     List queryVideoList(String bizOrgCode);
 
-    int deleteVideo(String id);
+    boolean replaceVideo(String ids,String bizOrgCode);
 
-    boolean addVide(String ids,String bizOrgCode);
-
-    List<Map<String,Object>> queryVideoAllId(String bizOrgCode);
+    List<String> queryVideoAllId(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -793,6 +793,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         model.setTerminal("WEB");
         Map<String, String> ext = new HashMap<>();
         ext.put("isRead", "1");
+        model.setExtras(ext);
         Token token = remoteSecurityService.getServerToken();
         systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
         return i;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java

@@ -43,13 +43,10 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
         return resList;
     }
 
-    @Override
-    public int deleteVideo(String id) {
-        return supervisionVideoMapper.delete(new QueryWrapper<SupervisionVideo>().eq("camera_id", id));
-    }
 
     @Override
-    public boolean addVide(String ids, String bizOrgCode) {
+    public boolean replaceVideo(String ids, String bizOrgCode) {
+        supervisionVideoMapper.delete(new QueryWrapper<SupervisionVideo>().eq("biz_org_code",bizOrgCode));
         List<SupervisionVideo> list = new ArrayList<>();
         for (String s : ids.split(",")) {
             SupervisionVideo supervisionVideo = new SupervisionVideo();
@@ -62,7 +59,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
     }
 
     @Override
-    public List<Map<String, Object>> queryVideoAllId(String bizOrgCode) {
+    public List<String> queryVideoAllId(String bizOrgCode) {
         return supervisionVideoMapper.queryVideoAllId(bizOrgCode);
     }
 }

amos-boot-system-equip/src/main/resources/mapper/SupervisionVideoMapper.xml

@@ -8,9 +8,9 @@
         where wsv.biz_org_code = #{bizOrgCode}
     </select>
 
-    <select id="queryVideoAllId" resultType="java.util.Map">
+    <select id="queryVideoAllId" resultType="java.lang.String">
         select wsv.camera_id
         from wl_supervision_video wsv
-        where wsv.biz_org_code = #{bizOrgCode}
+        where wsv.biz_org_code like concat(#{bizOrgCode},'%');
     </select>
 </mapper>