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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourcePoolDto.java

@@ -69,7 +69,7 @@ public class WaterResourcePoolDto  extends BaseDto {
    private float maxWaterLevel;
 
    @ApiModelProperty("水池液位显示装置id")
-   private Long levelDeviceId;
+   private String levelDeviceId;
 
    @ApiModelProperty("水池液位显示装置名称")
    private String levelDeviceName;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -104,7 +104,7 @@ public class WaterResourcePool extends BaseEntity {
      * 水池液位显示装置id
      */
     @TableField("level_device_id")
-    private Long levelDeviceId;
+    private String levelDeviceId;
 
     /**
      * 水池液位显示装置名称

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

@@ -453,11 +453,18 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     List<Map<String, Object>> getSystemAlarmInfoNum(@Param("bizOrgCode") String bizOrgCode);
 
     /**
-     * 消防水池或者工业水池信息
+     * 工业水池信息
      * @param bizOrgCode
      * @return
      */
-    List<Map<String, Object>> getWaterPoolInfoNum(@Param("bizOrgCode") String bizOrgCode, @Param("poolType") String poolType);
+    List<Map<String, Object>> getWaterIndustryPoolInfoNum(@Param("bizOrgCode") String bizOrgCode);
+
+    /**
+     * 消防水池信息
+     * @param bizOrgCode
+     * @return
+     */
+    List<Map<String, Object>> getWaterPoolInfoNum(@Param("bizOrgCode") String bizOrgCode);
 
     /**
      * 消防水源总量统计

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

@@ -1459,8 +1459,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         List<Map<String, Object>> carInfo = fireFightingSystemMapper.getCarInfo(bizOrgCode);
         bigScreenVo.setCarNumInfo(carInfo);
         List<Map<String, Object>> systemAlarmInfoNum = fireFightingSystemMapper.getSystemAlarmInfoNum(bizOrgCode);
-        List<Map<String, Object>> pool = fireFightingSystemMapper.getWaterPoolInfoNum(bizOrgCode, "pool");
-        List<Map<String, Object>> industryPool = fireFightingSystemMapper.getWaterPoolInfoNum(bizOrgCode, "industryPool");
+        List<Map<String, Object>> pool = fireFightingSystemMapper.getWaterPoolInfoNum(bizOrgCode);
+        List<Map<String, Object>> industryPool = fireFightingSystemMapper.getWaterIndustryPoolInfoNum(bizOrgCode);
         bigScreenVo.setSystemAlarmInfoNum(systemAlarmInfoNum);
         bigScreenVo.setIndustryPool(industryPool);
         bigScreenVo.setPool(pool);

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -193,6 +193,17 @@
             INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000319', 'address', '地址', 'String', '132828674817', 'eq', b'0', 'r_fireControlRoom', '2581805', '2022-03-01 12:01:04');
         </sql>
     </changeSet>
+
+
+    <changeSet author="zs" id="202210101651">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_water_resource_pool"/>
+        </preConditions>
+        <comment>修改液位显示装置字段类型->需求2022 一个水池可选多个 装置</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool` MODIFY COLUMN `level_device_id` varchar(255) NULL DEFAULT NULL COMMENT '水池液位显示装置id';
+        </sql>
+    </changeSet>
     <changeSet author="ltw" id="202210111354-1">
         <preConditions onFail="MARK_RAN">
             <not>

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3448,5 +3448,15 @@
                 CHANGE COLUMN `user_name` `usr_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名' AFTER `sequence_nbr`
         </sql>
     </changeSet>
+
+    <changeSet author="zs" id="202210101353">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_water_resource_pool"/>
+        </preConditions>
+        <comment>修改液位显示装置字段类型->需求2022 一个水池可选多个 装置</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool` MODIFY COLUMN `level_device_id` varchar(255) NULL DEFAULT NULL COMMENT '水池液位显示装置id';
+        </sql>
+    </changeSet>
 </databaseChangeLog>