修改消防系统运行状态

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -921,12 +921,12 @@ public class FireFightingSystemController extends AbstractBaseController {
         ite.add(map1);
         Map<String, String> map2 = new HashMap<>();
         map2.put("key", "系统运行状态");
-        map2.put("value", "1".equals(fireFightingSystem.getSystemRunState()) ? "运行" : "停止");
+        map2.put("value", fireFightingSystem.getSystemRunState());
         map2.put("highLight", "true");
         res.put("items", ite);
         res.put("title", "基本信息");
         ite.add(map2);
-        fireFightingSystem.setSystemRunState("1".equals(fireFightingSystem.getSystemRunState()) ? "运行" : "停止");
+        fireFightingSystem.setSystemRunState(fireFightingSystem.getSystemRunState());
         Map<String, Object> fireSystem = Bean.BeantoMap(fireFightingSystem);
         fireSystem.put("detailId", fireFightingSystem.getId());
         Map<String, Object> state = new HashMap<>();

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

@@ -1013,6 +1013,17 @@
         </sql>
     </changeSet>
 
+    <changeSet author="keyong" id="16970188990">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="f_fire_fighting_system" columnName="system_run_state"/>
+        </preConditions>
+        <comment>修改f_fire_fighting_system表属性字段system_run_state</comment>
+        <sql>
+            ALTER TABLE `f_fire_fighting_system` MODIFY COLUMN `system_run_state` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '运行' COMMENT '站端消防系统运行状态 0-停止 1-运行';
+            UPDATE `f_fire_fighting_system` SET `system_status` = '运行';
+        </sql>
+    </changeSet>
+
     <changeSet author="keyong" id="1698392137">
         <preConditions onFail="MARK_RAN">
             <not>

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

@@ -35,12 +35,7 @@
         `fs`.`name` AS `name`,
         `fs`.system_type_code AS systemTypeCode,
         `fs`.`code` AS code,
-        CASE
-        WHEN `fs`.system_run_state = '0' THEN
-        '停止'
-        WHEN `fs`.system_run_state = '1' THEN
-        '运行'
-        END AS systemRunState,
+        `fs`.system_run_state AS systemRunState,
         IF
         (((
         SELECT