Merge remote-tracking branch 'origin/pet' into pet

src/main/java/com/zcloud/service/map/AssembleControlRoomHandel.java

@@ -0,0 +1,37 @@
+package com.zcloud.service.map;
+
+import com.zcloud.entity.PageData;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 说明：消防水源
+ * * xfsy01 消防水源
+ * * xfbf01 消防泵房
+ * * xfjyd01 防救援队 Rescue team
+ * * xfkzs01 消防控制室 control
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Component
+public class AssembleControlRoomHandel extends AbsFireSourcesHandel {
+
+
+    /**
+     * @Description: 消防控制室
+     * @Author: dearLin
+     * @Date: 2023/9/20/020 15:37
+     * @Param: [com.zcloud.entity.PageData] [pageData]
+     * @Return: java.util.LinkedList<com.zcloud.entity.PageData>
+     */
+    @Override
+    public LinkedList<PageData> assemblyDataHandel(PageData pageData) throws Exception {
+        return fireResourcesMapper.getControlRoomDataList(pageData);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        AssemblyBeanFactory.register("xfkzs01", this);
+    }
+}

src/main/java/com/zcloud/service/map/AssemblePointSourceHandel.java

@@ -0,0 +1,40 @@
+package com.zcloud.service.map;
+
+import com.zcloud.entity.PageData;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 说明：消防水源
+ * * xfsy01 消防水源
+ * * xfbf01 消防泵房
+ * * xfjyd01 防救援队
+ * * xfkzs01 消防控制室
+ * * Point 消防点位
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Component
+public class AssemblePointSourceHandel extends AbsFireSourcesHandel {
+
+
+    /**
+     * @Description: 消防点位
+     * @Author: dearLin
+     * @Date: 2023/9/20/020 15:38
+     * @Param: [com.zcloud.entity.PageData] [pageData]
+     * @Return: java.util.LinkedList<com.zcloud.entity.PageData>
+     */
+    @Override
+    public LinkedList<PageData> assemblyDataHandel(PageData pageData) throws Exception {
+        // 自己的业务
+
+        return fireResourcesMapper.getPointDataList(pageData);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        AssemblyBeanFactory.register("point", this);
+    }
+}

src/main/java/com/zcloud/service/map/AssemblePumpRoomHandel.java

@@ -0,0 +1,38 @@
+package com.zcloud.service.map;
+
+import com.zcloud.entity.PageData;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 说明：消防水源
+ * * xfsy01 消防水源
+ * * xfbf01 消防泵房 PumpRoom
+ * * xfjyd01 防救援队 Rescue team
+ * * xfkzs01 消防控制室 control
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Component
+public class AssemblePumpRoomHandel extends AbsFireSourcesHandel {
+
+
+    /**
+     * @Description: 消防泵房
+     * @Author: dearLin
+     * @Date: 2023/9/20/020 15:38
+     * @Param: [com.zcloud.entity.PageData] [pageData]
+     * @Return: java.util.LinkedList<com.zcloud.entity.PageData>
+     */
+    @Override
+    public LinkedList<PageData> assemblyDataHandel(PageData pageData) throws Exception {
+        // 自己的业务
+        return fireResourcesMapper.getPumpRoomDataList(pageData);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        AssemblyBeanFactory.register("xfbf01", this);
+    }
+}

src/main/java/com/zcloud/service/map/AssembleRescueTeamHandel.java

@@ -0,0 +1,38 @@
+package com.zcloud.service.map;
+
+import com.zcloud.entity.PageData;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 说明：消防水源
+ * * xfsy01 消防水源
+ * * xfbf01 消防泵房
+ * * xfjyd01 消防救援队 Rescue team
+ * * xfkzs01 消防控制室
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Component
+public class AssembleRescueTeamHandel extends AbsFireSourcesHandel {
+
+    /**
+     * @Description: 消防救援队
+     * @Author: dearLin
+     * @Date: 2023/9/20/020 15:38
+     * @Param: [com.zcloud.entity.PageData] [pageData]
+     * @Return: java.util.LinkedList<com.zcloud.entity.PageData>
+     */
+    @Override
+    public LinkedList<PageData> assemblyDataHandel(PageData pageData) throws Exception {
+        pageData.put("CORPINFO_ID",null);
+        // 自己的业务
+        return fireResourcesMapper.getRescueTeamDataList(pageData);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        AssemblyBeanFactory.register("xfjyd01", this);
+    }
+}

src/main/java/com/zcloud/service/map/AssembleWaterSourceHandel.java

@@ -0,0 +1,38 @@
+package com.zcloud.service.map;
+
+import com.zcloud.entity.PageData;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 说明：消防水源
+ * * xfsy01 消防水源
+ * * xfbf01 消防泵房
+ * * xfjyd01 防救援队
+ * * xfkzs01 消防控制室
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Component
+public class AssembleWaterSourceHandel extends AbsFireSourcesHandel {
+
+
+    /**
+     * @Description: 消防水源
+     * @Author: dearLin
+     * @Date: 2023/9/20/020 15:38
+     * @Param: [com.zcloud.entity.PageData] [pageData]
+     * @Return: java.util.LinkedList<com.zcloud.entity.PageData>
+     */
+    @Override
+    public LinkedList<PageData> assemblyDataHandel(PageData pageData) throws Exception {
+        // 自己的业务
+        return fireResourcesMapper.getWaterSourceDataList(pageData);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        AssemblyBeanFactory.register("xfsy01", this);
+    }
+}

src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml

@@ -228,6 +228,8 @@
         `qa-gwj-prevention`.bus_fire_point f
         WHERE
         f.ISDELETE = 0
+        and f.LONGITUDE is not null
+        and f.LONGITUDE != ''
         <if test="CORPINFO_ID != null and CORPINFO_ID != ''">
             AND f.CORPINFO_ID = #{CORPINFO_ID}
         </if>