Merge branch 'pet' into liujun-2024-06-13-一公司人员定位新需求

2、边界入侵摄像头标点不显示bug修复

src/main/java/com/zcloud/controller/map/MapController.java

@@ -939,7 +939,7 @@ public class MapController extends BaseController {
             AlarmGet alarmGet = new AlarmGet();
             alarmGet.setPage(new com.zcloud.service.dw.dto.Page());
             alarmGet.getPage().setCurrent("1");
-            alarmGet.getPage().setSize("12");
+            alarmGet.getPage().setSize("5");
             alarmGet.setCorpId(pd.getString("corpId"));
             map.put("result", "success");
             map.put("alarmList", dwService.getAlarmList(alarmGet));
@@ -952,7 +952,7 @@ public class MapController extends BaseController {
             AlarmGet alarmGet = new AlarmGet();
             alarmGet.setPage(new com.zcloud.service.dw.dto.Page());
             alarmGet.getPage().setCurrent("1");
-            alarmGet.getPage().setSize("12");
+            alarmGet.getPage().setSize("9");
             alarmGet.setCorpId(pd.getString("corpId"));
             map.put("result", "success");
             map.put("alarmList", new ArrayList<>());

src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java

@@ -2,13 +2,17 @@ package com.zcloud.controller.map;
 
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.PageData;
+import com.zcloud.service.keyProjects.PlatformvideomanagementService;
 import com.zcloud.service.map.util.HKPostUtil;
+import com.zcloud.service.system.DictionariesService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.zcloud.service.map.PlatformelectronicService;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,6 +23,9 @@ public class MapPlatFormElectronicController extends BaseController {
     @Autowired
     private PlatformelectronicService platformelectronicService;
 
+    @Autowired
+    private PlatformvideomanagementService platformvideomanagementService;
+
     /**总摄像头数
      * @throws Exception
      */
@@ -27,8 +34,7 @@ public class MapPlatFormElectronicController extends BaseController {
     public Object listAll() throws Exception{
         Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
-        PageData pd = new PageData();
+        PageData pd = this.getPageData();
-        pd = this.getPageData();
         Integer allForMap = platformelectronicService.countAllForMap(pd);	//列出Platformelectronic列表
         map.put("allForMap", allForMap);
         map.put("result", errInfo);
@@ -52,6 +58,8 @@ public class MapPlatFormElectronicController extends BaseController {
         return map;
     }
 
+    @Resource
+    private DictionariesService dictionariesService;
 
     /**地图插点
      * @throws Exception
@@ -61,8 +69,46 @@ public class MapPlatFormElectronicController extends BaseController {
     public Object listAllLocation() throws Exception{
         Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
-        PageData pd = new PageData();
+        PageData pd = this.getPageData();
-        pd = this.getPageData();
+        if ("bianjieruqin".equals(pd.getString("TYPE"))){
+            if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){
+                pd.put("CORPINFO_ID",pd.get("corpId"));
+            }
+            //列出Platformvideomanagement列表
+            PageData condition = new PageData();
+            List<PageData>	varList = platformvideomanagementService.listAll(pd);
+            for (PageData data : varList) {
+                data.put("MAP_POINT_NAME", data.getString("NAME"));
+                condition.clear();
+                condition.put("INDEXCODE",data.getString("INDEXCODE"));
+                //增加容错
+                List<PageData> list = platformelectronicService.listAll(condition);
+                if (list.size() > 0){
+                    data.put("FANGQU_IDS",list.get(0).getString("FANGQU_IDS"));
+                }
+            }
+            condition.clear();
+            condition.put("PARENT_ID","f0bae7becdee4d779a2cb82037948ab4");
+            Map<String,List<PageData>> tongJi = new HashMap<>();
+            List<PageData> dic = dictionariesService.findByCondition(condition);
+            // 找出要统计的图标信息
+            for (PageData _dic : dic){
+                condition.clear();
+                condition.put("PARENT_ID",_dic.getString("DICTIONARIES_ID"));
+                List<PageData> dic2 = dictionariesService.findByCondition(condition);
+                for (PageData _dic2 : dic2){
+                    _dic2.put("NAME",_dic.getString("NAME") + _dic2.getString("NAME"));
+                    // 统计不同防区中的不同的
+                    _dic2.put("num",varList.stream().filter(n -> n.getString("FANGQU_IDS").contains(_dic2.getString("DICTIONARIES_ID"))).count());
+                }
+                tongJi.put(_dic.getString("NAME"),dic2);
+            }
+            map.put("iconData",tongJi);
+            // 根据统计的数据
+            map.put("varList", varList);
+            map.put("result", errInfo);
+            return map;
+        }
         pd.put("forMap","1");
         List<PageData> varList = platformelectronicService.listAll(pd);	//列出Platformelectronic列表
         for (PageData data : varList) {

src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java

@@ -106,4 +106,6 @@ public interface DictionariesMapper {
 	 */
 	List<PageData> getIdsByRecuByParentId(String parentId);
 	List<PageData> getIdsByParentIds(List<String> parentIds);
+
+    List<PageData> findByCondition(PageData condition);
 }

src/main/java/com/zcloud/service/dw/dto/AlarmGet.java

@@ -10,5 +10,7 @@ public class AlarmGet {
     private String status;
     private String corpId;
     private Page page;
+    // 告警来源
+    private String sourceNum;
 
 }

src/main/java/com/zcloud/service/system/DictionariesService.java

@@ -151,4 +151,5 @@ public interface DictionariesService {
 	 */
 	public List<PageData> getIdsByParentIds(List<String> parentIds) throws Exception;
 
+	List<PageData> findByCondition(PageData condition) throws Exception;
 }

src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java

@@ -256,4 +256,9 @@ public class DictionariesServiceImpl implements DictionariesService {
 		return dictionariesMapper.getIdsByParentIds(parentIds);
 	}
 
+	@Override
+	public List<PageData> findByCondition(PageData condition) throws Exception {
+		return dictionariesMapper.findByCondition(condition);
+	}
+
 }

src/main/resources/mybatis/datasource/system/DictionariesMapper.xml

@@ -266,4 +266,23 @@
 			#{PARENT_ID}
 		</foreach>
 	</select>
+	<select id="findByCondition" resultType="com.zcloud.entity.PageData">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where ISDELETE = 0
+		<if test="BIANMA != null and BIANMA != ''">
+			and BIANMA = #{BIANMA}
+		</if>
+		<if test="NAME != null and NAME != ''">
+			and NAME = #{NAME}
+		</if>
+		<if test="PARENT_ID != null and PARENT_ID != ''">
+			and PARENT_ID = #{PARENT_ID}
+		</if>
+		<if test="DICTIONARIES_ID != null and DICTIONARIES_ID != ''">
+			and DICTIONARIES_ID = #{DICTIONARIES_ID}
+		</if>
+	</select>
 </mapper>