Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -180,6 +180,14 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      * @return  Map<String,Object>
      */
     Map<String,Object> fireWaterSysPool();
+
+    /**
+     *  消防水系统-》消防管网
+     * @return  Map<String,Object>
+     */
+    Map<String,Object> fireWaterSysPipeNetwork();
+
+
     /**
      * 消防水系统-》消火栓按钮
      * @return Map<String,Object>

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

@@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -75,6 +76,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     private IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService;
 
     @Autowired
+    @Lazy
     private IEquipmentSpecificSerivce equipmentSpecificSerivce;
 
     @Autowired

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

@@ -889,6 +889,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             this.putAll(data, fireFightingSystemMapper.fireWaterSysPool());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
+            this.putAll(data, fireFightingSystemMapper.fireWaterSysPipeNetwork());
         } else {
             data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
         }

amos-boot-system-equip/src/main/resources/application-dev.properties

 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
 spring.datasource.url = jdbc:mysql://172.16.6.60:3306/xiy_amos_satety_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=root_123
-
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.minimum-idle= 3
@@ -20,6 +18,7 @@ fileserver_domain=http://39.98.45.134:9000/
 
 #eureka.instance.ip-address= 172.16.3.135
 eureka.instance.hostname= 172.16.3.97
+
 eureka.instance.prefer-ip-address = true
 eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
 

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -4791,7 +4791,11 @@ SELECT
 	`eh`.`ehxfscyw` AS `ehxfscyw`,
 	`eh`.`ehxfscyl` AS `ehxfscyl`,
 	`eh`.`ehxfsccs` AS `ehxfsccs`,
-	`eh`.`ehxfscg` AS `ehxfscg`
+	`eh`.`ehxfscg` AS `ehxfscg`,
+	`shsx`.`shsxyw` AS `shsxyw`,
+	`shsx`.`shsxyl` AS `shsxyl`,
+	`shsx`.`shsxcs` AS `shsxcs`,
+	`shsx`.`shsxg` AS `shsxg`
 FROM
 	(
 		(
@@ -4991,7 +4995,106 @@ FROM
 							)
 					) `b`
 				)
-		) `eh` ON ((1 = 1))
+		) `eh` ON 1 = 1
+		LEFT JOIN (
+			SELECT
+				ifnull(sum(`a`.`value`), 0) AS `shsxyw`,
+				ifnull(
+					(
+						CASE
+						WHEN (`a`.`value` = NULL) THEN
+							0
+						WHEN (
+							(`a`.`value` <> '')
+							AND (`b`.`height` <> '')
+						) THEN
+							round(
+								(
+									(`a`.`value` / `b`.`height`) * 100
+								),
+								2
+							)
+						WHEN (`b`.`height` = NULL) THEN
+							0
+						END
+					),
+					0
+				) AS `shsxyl`,
+				ifnull(`b`.`waterStorage`, 0) AS `shsxcs`,
+				ifnull(`b`.`height`, 0) AS `shsxg`
+			FROM
+				(
+					(
+						SELECT
+							`si`.`value` AS `value`
+						FROM
+							(
+								`wl_equipment_specific_index` `si`
+								JOIN `wl_equipment_specific` `s`
+							)
+						WHERE
+							(
+								(
+									`si`.`equipment_index_key` = 'FHS_FirePoolDevice_WaterLevel'
+								)
+								AND (
+									`s`.`code` = '1HXFSCCJZZ100000'
+								)
+								AND (
+									`si`.`equipment_specific_id` = `s`.`id`
+								)
+							)
+					) `a`
+					JOIN (
+						SELECT
+							max(
+								(
+									CASE
+									WHEN (`i`.`field_name` = 'height') THEN
+										`i`.`field_value`
+									END
+								)
+							) AS `height`,
+							max(
+								(
+									CASE
+									WHEN (
+										`i`.`field_name` = 'waterStorage'
+									) THEN
+										`i`.`field_value`
+									END
+								)
+							) AS `waterStorage`
+						FROM
+							`wl_form_instance` `i`
+						WHERE
+							(
+								(
+									(`i`.`field_name` = 'height')
+									OR (
+										`i`.`field_name` = 'waterStorage'
+									)
+								)
+								AND (
+									`i`.`instance_id` = (
+										SELECT
+											`i`.`instance_id`
+										FROM
+											`wl_form_instance` `i`
+										WHERE
+											(
+												(`i`.`field_name` = 'code')
+												AND (
+													`i`.`field_value` = 'SC106268'
+												)
+											)
+										LIMIT 1
+									)
+								)
+							)
+					) `b`
+				)
+		) `shsx` ON 1 = 1
 );
 -- 泡沫灭火3小
 DROP VIEW IF EXISTS `v_fire_equip_ffs_num`;

amos-boot-system-equip/src/main/resources/changelog/sql-task-all.xml

@@ -50,14 +50,14 @@
             END#
         </sql>
     </changeSet>
-    <changeSet author="suhuiguang" id="1623223065754-3"  runAlways="true">
+    <changeSet author="suhuiguang" id="1623223065756-3"  runAlways="true">
         <comment>`getChildrenIdsByRootId`</comment>
         <sql endDelimiter="#">
             DROP FUNCTION IF EXISTS `getChildrenIdsByRootId`#
-            CREATE FUNCTION `getChildrenIdsByRootId` (`rootId` VARCHAR(100)) RETURNS varchar(1000)
+            CREATE FUNCTION `getChildrenIdsByRootId` (`rootId` VARCHAR(100)) RETURNS text
             BEGIN
-            DECLARE ids VARCHAR(1000);
-            DECLARE ptemp VARCHAR(1000);
+            DECLARE ids text;
+            DECLARE ptemp text;
             SELECT
             GROUP_CONCAT(c.instanceId) INTO ids
             FROM

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

@@ -1498,7 +1498,7 @@
          LEFT JOIN `wl_equipment_detail` wed ON wed.equipment_id = we.id
          LEFT JOIN `wl_equipment_specific` wes ON wes.equipment_detail_id = wed.id
         where
-            wes.id = #{specificId}
+            wes.id = #{specificId} AND we.is_iot = '1'
     </select>
     <select id="getListByWarehouseStructureId"
             resultType="com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO">

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

@@ -1447,6 +1447,21 @@
     <select id="fireWaterSysPool" resultType="java.util.Map">
         select * from v_fire_pool_water_level
     </select>
+
+    <select id="fireWaterSysPipeNetwork" resultType="java.util.Map">
+        SELECT
+	        IFNULL(MAX(wesi.`value`), 0) AS xfgwyl
+        FROM
+            wl_equipment_specific_index wesi
+            LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+        WHERE
+            wes.equipment_code = '92011000T5Q44'
+            AND wesi.equipment_index_key = 'FHS_PipePressureDetector_PipePressure'
+        ORDER BY
+            abs( wesi.`value` ) DESC
+	        LIMIT 1
+    </select>
+
     <select id="fireFoamSysEquipmentIndexNumber" resultType="java.util.Map">
         select * from v_fire_equip_ffs_num
     </select>

amos-boot-system-knowledgebase/src/main/resources/application.properties

 spring.application.name=AMOS-API-KNOWLEDGEBASE
-server.port=30009
+server.port=3009
 server.servlet.context-path=/knowledgebase
 
 spring.profiles.active=dev