修改bug

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

@@ -251,4 +251,15 @@
             REPLACE 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 (133000000356, 'maxFlow', '最高报警流量(L/S)', 'inputNumber', 132828674827, 'eq', b'0', '92010700', 2581805, '2022-10-09 09:24:40');
         </sql>
     </changeSet>
+    <changeSet author="tym" id="202210131720">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_water_resource_pool"/>
+        </preConditions>
+        <comment>修改液位显示装置id和name字段长度</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool`
+                MODIFY COLUMN `level_device_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置id',
+                MODIFY COLUMN `level_device_name` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置名称';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1335,6 +1335,7 @@
 
     <select id="fireAlarmLogPage" resultType="java.util.HashMap">
         SELECT
+        `wlesal`.id as alarmLogId,
         equipment_specific_index_name,
         equipment_specific_name,
         DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time,

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

@@ -3458,5 +3458,16 @@
             ALTER TABLE `cb_water_resource_pool` MODIFY COLUMN `level_device_id` varchar(255) NULL DEFAULT NULL COMMENT '水池液位显示装置id';
         </sql>
     </changeSet>
+    <changeSet author="tym" id="202210131748">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_water_resource_pool"/>
+        </preConditions>
+        <comment>修改液位显示装置id和name字段长度</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool`
+                MODIFY COLUMN `level_device_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置id',
+                MODIFY COLUMN `level_device_name` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置名称';
+        </sql>
+    </changeSet>
 </databaseChangeLog>