修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java

@@ -113,6 +113,16 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String isRemoveShield;
 
+	private String isFireAlarm;
+
+	public void setIsFireAlarm(String isFireAlarm) {
+		this.isFireAlarm = isFireAlarm;
+	}
+
+	public String getIsFireAlarm() {
+		return isFireAlarm;
+	}
+
 	public void setIsRemoveShield(String isRemoveShield) {
 		this.isRemoveShield = isRemoveShield;
 	}

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

@@ -172,6 +172,10 @@ public class EquipmentIndexController {
                     queryWrapper.inSql(SignalClassify::getTypeCode,
                             "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'");
                     signalClassify = signalClassifyMapper.selectOne(queryWrapper);
+                    equipmentIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+                    equipmentIndex.setIsAlarm(signalClassify.getIsAlarm());
+                    equipmentIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
+                    equipmentIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
                 }
                 QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
                 equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());

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

@@ -102,14 +102,18 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
         if (ValidationUtil.isEmpty(equipmentIndex.getTypeCode())) {
             bool.set(false);
         }
-        int i = this.baseMapper.insert(equipmentIndex);
         SignalClassify signalClassify = null;
         if (bool.get()) {
             LambdaQueryWrapper<SignalClassify> queryWrapper = new LambdaQueryWrapper();
             queryWrapper.inSql(SignalClassify::getTypeCode,
                     "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'");
             signalClassify = signalClassifyMapper.selectOne(queryWrapper);
+            equipmentIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+            equipmentIndex.setIsAlarm(signalClassify.getIsAlarm());
+            equipmentIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
+            equipmentIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
         }
+        int i = this.baseMapper.insert(equipmentIndex);
         QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
         equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());
         List<EquipmentDetail> equipDetailList = iEquipmentDetailService.list(equipmentDetailQueryWrapper);

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

@@ -174,6 +174,10 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Override
     public Page<Map<String, Object>> listPage(CommonPageInfoParam param) {
         Page result = new Page<>(param.getPageNumber(), param.getPageSize());
+        if (AlarmTypeEnum.GZGJ.getCode().equals(param.getAlarmType())) {
+            param.setAlarmType("");
+            param.setIsFireAlarm("false");
+        }
         Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
         if (resultPage.getTotal() > 0) {
             for (Map<String, Object> x : resultPage.getRecords()) {

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

@@ -209,6 +209,21 @@
 			AND es.equipment_detail_id = d.id
 			AND oc.car_id = #{id}
 			GROUP BY es.id
+		UNION ALL
+			SELECT
+			d.`name` AS equipName,
+			es.qr_code AS code,
+			es.iot_code AS iotCode,
+			es.code AS equipCode
+		FROM
+			wl_extinguishant_on_car weoc,
+			wl_equipment_detail d,
+			wl_equipment_specific es
+			WHERE
+			es.equipment_detail_id = d.id
+			AND weoc.equipment_detail_id = d.id
+			AND weoc.car_id = #{id}
+			GROUP BY es.id
 	</select>
     <select id="getIotCodeList" resultType="String">
         SELECT

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

@@ -221,6 +221,7 @@
             <if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
             <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
             <if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if>
+            <if test="param.isFireAlarm == 'false'">AND wlesal.type != 'FIREALARM'</if>
             <if test="param.orgCode != null and param.orgCode != ''">AND wlesal.org_code = #{param.orgCode}</if>
             <if test="param.type != null and param.type != ''">AND wlesal.type = #{param.type}</if>
             <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND