提交点图优化相关代码及脚本

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/CarProperty.java

@@ -61,4 +61,28 @@ public class CarProperty extends BaseEntity {
 	@TableField(exist = false)
 	private String nameKey;
 
+	/**
+	 * 颜色
+	 */
+	@TableField(value = "emergency_level_color")
+	private String emergencyLevelColor;
+
+	/**
+	 * 是否告警:0-否；1-是
+	 */
+	@TableField(value = "is_alarm")
+	private Integer isAlarm;
+
+	/**
+	 * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
+	 */
+	@TableField(value = "emergency_level")
+	private String emergencyLevel;
+
+	/**
+	 * 紧急程度描述
+	 */
+	@TableField(value = "emergency_level_describe")
+	private String emergencyLevelDescribe;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarm.java

@@ -180,4 +180,22 @@ public class EquipmentSpecificAlarm extends BaseEntity {
     @TableField(exist = false)
     private String buildId;
 
+    /**
+     * 颜色
+     */
+    @TableField(value = "emergency_level_color")
+    private String emergencyLevelColor;
+
+    /**
+     * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
+     */
+    @TableField(value = "emergency_level")
+    private String emergencyLevel;
+
+    /**
+     * 紧急程度描述
+     */
+    @TableField(value = "emergency_level_describe")
+    private String emergencyLevelDescribe;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -188,4 +188,22 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @ApiModelProperty(value = "消除状态")
     @TableField(exist = false)
     private String cleanStatus;
+
+    /**
+     * 颜色
+     */
+    @TableField(value = "emergency_level_color")
+    private String emergencyLevelColor;
+
+    /**
+     * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
+     */
+    @TableField(value = "emergency_level")
+    private String emergencyLevel;
+
+    /**
+     * 紧急程度描述
+     */
+    @TableField(value = "emergency_level_describe")
+    private String emergencyLevelDescribe;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -109,4 +109,28 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @ApiModelProperty(value = "设备所属系统ids")
     @TableField(exist = false)
     private String systemId;
+
+    /**
+     * 颜色
+     */
+    @TableField(value = "emergency_level_color")
+    private String emergencyLevelColor;
+
+    /**
+     * 是否告警:0-否；1-是
+     */
+    @TableField(value = "is_alarm")
+    private Integer isAlarm;
+
+    /**
+     * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
+     */
+    @TableField(value = "emergency_level")
+    private String emergencyLevel;
+
+    /**
+     * 紧急程度描述
+     */
+    @TableField(value = "emergency_level_describe")
+    private String emergencyLevelDescribe;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/SignalClassify.java

+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 信号分类量测枚举表
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("wl_signal_classify")
+public class SignalClassify extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@TableField("id")
+    private Long id;
+
+    /**
+     * 量测枚举key
+     */
+	@TableField("type_code")
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+	@TableField("type_name")
+    private String typeName;
+
+    /**
+     * 十六进制颜色
+     */
+	@TableField("emergency_level_color")
+    private String emergencyLevelColor;
+
+    /**
+     * 是否删除:0-否；1-是
+     */
+	@TableField("is_alarm")
+    private Integer isAlarm;
+
+    /**
+     * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
+     */
+	@TableField("emergency_level")
+    private String emergencyLevel;
+
+    /**
+     * 紧急程度描述
+     */
+	@TableField("emergency_level_describe")
+    private String emergencyLevelDescribe;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentIndexVO.java

@@ -63,4 +63,7 @@ public class EquipmentIndexVO {
     @ApiModelProperty(value = "更新日期")
     private Date updateDate;
 
+    @ApiModelProperty(value = "指标枚举")
+    private String valueEnum;
+
 }

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

@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @author keyong
  * @title: EquipmentStateUtil
  * <pre>
  * @description: 通过性能指标判断设备状态（火灾报警 > 故障告警 > 屏蔽 > 运行状态）

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/SpeIndexVo.java

@@ -19,4 +19,12 @@ public class SpeIndexVo {
     private String typeCode = "";
 
     private Long equipmentSpecificId;
+
+    private String color = "";
+
+    private Integer isAlarm = 0;
+
+    private String emergencyLevel = "";
+
+    private String emergencyLevelDescribe = "";
 }

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

 package com.yeejoin.equipmanage.controller;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
+import com.yeejoin.equipmanage.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -23,15 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
-import com.yeejoin.equipmanage.common.entity.Equipment;
-import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.dto.PerfQuotaIotDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
-import com.yeejoin.equipmanage.service.ICarPropertyService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -58,6 +59,10 @@ public class EquipmentIndexController {
     ICarPropertyService carPropertyService;
     @Autowired
     private Sequence sequence;
+    @Autowired
+    IEquipmentDetailService iEquipmentDetailService;
+    @Autowired
+    SignalClassifyMapper signalClassifyMapper;
 
     /**
      * 新增消防装备/消防车指标
@@ -114,6 +119,35 @@ public class EquipmentIndexController {
         if (equipmentIndex.getIsImportentParameter()) {
             //如果不是物联指标项，清空物联指标项信息
             if(equipmentIndex.getIsIot()==false){
+                QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
+                equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());
+                List<EquipmentDetail> equipDetailList = iEquipmentDetailService.list(equipmentDetailQueryWrapper);
+                if (ObjectUtils.isEmpty(equipDetailList)) {
+                    LambdaUpdateWrapper<CarProperty> carWrapper = new LambdaUpdateWrapper<>();
+                    carWrapper.eq(CarProperty::getEquipmentIndexId, equipmentIndex.getId());
+                    List<CarProperty> list = carPropertyService.list(carWrapper);
+                    // 因为是非物联指标信息，所以此处手动定义了默认值（color:#49AA19[绿色];isAlarm:0;alarmDescribe:否;emergencyLevel:4;emergencyLevelDescribe:正常）
+                    list.forEach(x -> {
+                        x.setEmergencyLevelColor("#49AA19");
+                        x.setIsAlarm(0);
+                        x.setEmergencyLevel("4");
+                        x.setEmergencyLevelDescribe("正常");
+                    });
+                    carPropertyService.updateBatchById(list);
+                } else {
+                    LambdaUpdateWrapper<EquipmentSpecificIndex> equipWrapper = new LambdaUpdateWrapper<>();
+                    equipWrapper.eq(EquipmentSpecificIndex::getEquipmentIndexId, equipmentIndex.getId());
+                    List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexSerivce.list(equipWrapper);
+                    if (!ObjectUtils.isEmpty(indexList)) {
+                        indexList.forEach(y -> {
+                            y.setEmergencyLevelColor("#49AA19");
+                            y.setIsAlarm(0);
+                            y.setEmergencyLevel("4");
+                            y.setEmergencyLevelDescribe("正常");
+                        });
+                        equipmentSpecificIndexSerivce.updateBatchById(indexList);
+                    }
+                }
                 LambdaUpdateWrapper<EquipmentIndex> equipmentIndexLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                 equipmentIndexLambdaUpdateWrapper.eq(EquipmentIndex::getId,equipmentIndex.getId());
                 equipmentIndexLambdaUpdateWrapper.set(EquipmentIndex::getEquipmentId,equipmentIndex.getEquipmentId());
@@ -129,6 +163,55 @@ public class EquipmentIndexController {
                 equipmentIndexLambdaUpdateWrapper.set(EquipmentIndex::getPerfValue,equipmentIndex.getPerfValue());
                 return equipmentIndexService.update(equipmentIndexLambdaUpdateWrapper);
             }else{
+                AtomicBoolean bool = new AtomicBoolean(true);
+                if (ValidationUtil.isEmpty(equipmentIndex.getTypeCode())) {
+                    bool.set(false);
+                }
+                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()+"'");
+                    signalClassify = signalClassifyMapper.selectOne(queryWrapper);
+                }
+                QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
+                equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());
+                List<EquipmentDetail> equipDetailList = iEquipmentDetailService.list(equipmentDetailQueryWrapper);
+                if (ObjectUtils.isEmpty(equipDetailList)) {
+                    LambdaUpdateWrapper<CarProperty> carWrapper = new LambdaUpdateWrapper<>();
+                    carWrapper.eq(CarProperty::getEquipmentIndexId, equipmentIndex.getId());
+                    List<CarProperty> list = carPropertyService.list(carWrapper);
+                    if (!ObjectUtils.isEmpty(list)) {
+                        for (CarProperty x : list) {
+                            x.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
+                            x.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
+                            if (bool.get()) {
+                                x.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+                                x.setIsAlarm(signalClassify.getIsAlarm());
+                                x.setEmergencyLevel(signalClassify.getEmergencyLevel());
+                                x.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
+                            }
+                        }
+                        carPropertyService.updateBatchById(list);
+                    }
+                } else {
+                    LambdaUpdateWrapper<EquipmentSpecificIndex> equipWrapper = new LambdaUpdateWrapper<>();
+                    equipWrapper.eq(EquipmentSpecificIndex::getEquipmentIndexId, equipmentIndex.getId());
+                    List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexSerivce.list(equipWrapper);
+                    if (!ObjectUtils.isEmpty(indexList)) {
+                        for (EquipmentSpecificIndex y : indexList) {
+                            y.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
+                            y.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
+                            if (bool.get()) {
+                                y.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+                                y.setIsAlarm(signalClassify.getIsAlarm());
+                                y.setEmergencyLevel(signalClassify.getEmergencyLevel());
+                                y.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
+                            }
+                        }
+                        equipmentSpecificIndexSerivce.updateBatchById(indexList);
+                    }
+                }
                 return equipmentIndexService.updateById(equipmentIndex);
             }
         } else {

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

+package com.yeejoin.equipmanage.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.equipmanage.common.entity.SignalClassify;
+import com.yeejoin.equipmanage.service.ISignalClassifyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 信号分类量测枚举表
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+@RestController
+@Api(tags = "信号分类量测枚举表Api")
+@RequestMapping(value = "/signal/classify", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+public class SignalClassifyController extends AbstractBaseController {
+
+    @Autowired
+	ISignalClassifyService iSignalClassifyService;
+
+    /**
+     * 新增信号分类量测枚举表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增信号分类量测枚举表", notes = "新增信号分类量测枚举表")
+	public ResponseModel<SignalClassify> save(@RequestBody SignalClassify model) {
+	    boolean bool = iSignalClassifyService.save(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据id更新
+     *
+     * @param id 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{id}")
+	@ApiOperation(httpMethod = "PUT", value = "根据id更新信号分类量测枚举表", notes = "根据id更新信号分类量测枚举表")
+	public ResponseModel<SignalClassify> updateByidWlSignalClassify(@RequestBody SignalClassify model, @PathVariable(value = "id") Long id) {
+	    model.setId(id);
+	    boolean bool = iSignalClassifyService.updateById(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据id删除
+     *
+     * @param id 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{id}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除信号分类量测枚举表", notes = "根据id删除信号分类量测枚举表")
+    public ResponseModel<Boolean> deleteByid(HttpServletRequest request, @PathVariable(value = "id") Long id){
+        return ResponseHelper.buildResponse(iSignalClassifyService.removeById(id));
+    }
+
+    /**
+     * 根据id查询
+     *
+	 * @param id  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{id}")
+	@ApiOperation(httpMethod = "GET",value = "根据id查询单个信号分类量测枚举表",  notes = "根据id查询单个信号分类量测枚举表")
+	public ResponseModel<SignalClassify> selectOne(@PathVariable Long id) {
+	    return ResponseHelper.buildResponse(iSignalClassifyService.getById(id));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "信号分类量测枚举表列表全部数据查询",   notes = "信号分类量测枚举表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<SignalClassify>> selectForList() {
+	    return ResponseHelper.buildResponse(iSignalClassifyService.query().list());
+	}
+}

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

+package com.yeejoin.equipmanage.mapper;
+
+import com.yeejoin.equipmanage.common.entity.SignalClassify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 信号分类量测枚举表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+public interface SignalClassifyMapper extends BaseMapper<SignalClassify> {
+
+}

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

+package com.yeejoin.equipmanage.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.SignalClassify;
+
+import java.util.List;
+
+/**
+ * 信号分类量测枚举表接口类
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+public interface ISignalClassifyService extends IService<SignalClassify> {
+
+}

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

 package com.yeejoin.equipmanage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
 import com.yeejoin.equipmanage.mapper.EquipmentIndexMapper;
+import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
 import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import javax.validation.Validation;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 @Service
 public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, EquipmentIndex> implements IEquipmentIndexService {
@@ -37,6 +42,9 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
     @Autowired
     IEquipmentSpecificIndexSerivce iEquipmentSpecificIndexSerivce;
 
+    @Autowired
+    SignalClassifyMapper signalClassifyMapper;
+
     @Override
     public IPage<EquipmentIndexVO> getPerfQutoaPage(IPage<EquipmentIndex> page, Long id, String groupName) {
         return this.baseMapper.getPage(page, id, groupName);
@@ -90,7 +98,18 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
 
     @Override
     public boolean savePerfQuota(EquipmentIndex equipmentIndex) {
+        AtomicBoolean bool = new AtomicBoolean(true);
+        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()+"'");
+            signalClassify = signalClassifyMapper.selectOne(queryWrapper);
+        }
         QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
         equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());
         List<EquipmentDetail> equipDetailList = iEquipmentDetailService.list(equipmentDetailQueryWrapper);
@@ -100,14 +119,20 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
             List<Car> carList = iCarService.list(carQueryWrapper);
             if (!ObjectUtils.isEmpty(carList)) {
                 List<CarProperty> carProperties = new ArrayList<>();
-                carList.forEach(car -> {
+                for (Car car : carList) {
                     CarProperty carProperty = new CarProperty();
                     carProperty.setCarId(car.getId());
                     carProperty.setEquipmentIndexId(equipmentIndex.getId());
                     carProperty.setEquipmentIndexKey(equipmentIndex.getPerfQuotaName());
                     carProperty.setEquipmentIndexName(equipmentIndex.getPerfQuotaDefinitionId());
+                    if (bool.get()) {
+                        carProperty.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+                        carProperty.setIsAlarm(signalClassify.getIsAlarm());
+                        carProperty.setEmergencyLevel(signalClassify.getEmergencyLevel());
+                        carProperty.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
+                    }
                     carProperties.add(carProperty);
-                });
+                }
                 iCarPropertyService.saveBatch(carProperties);
             }
         } else {
@@ -120,15 +145,21 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
             List<EquipmentSpecific> equipmentSpecifics = iEquipmentSpecificSerivce.list(equipmentSpecificQueryWrapper);
             if (equipmentSpecifics.size() > 0) {
                 List<EquipmentSpecificIndex> equipmentSpecificIndexList = new ArrayList<>();
-                equipmentSpecifics.forEach(y -> {
+                for (EquipmentSpecific y : equipmentSpecifics) {
                     EquipmentSpecificIndex equipmentSpecificIndex = new EquipmentSpecificIndex();
                     equipmentSpecificIndex.setEquipmentSpecificId(y.getId());
                     equipmentSpecificIndex.setEquipmentIndexId(equipmentIndex.getId());
                     equipmentSpecificIndex.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
                     equipmentSpecificIndex.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
                     equipmentSpecificIndex.setEquipmentSpecialName(y.getName());
+                    if (bool.get()) {
+                        equipmentSpecificIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+                        equipmentSpecificIndex.setIsAlarm(signalClassify.getIsAlarm());
+                        equipmentSpecificIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
+                        equipmentSpecificIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
+                    }
                     equipmentSpecificIndexList.add(equipmentSpecificIndex);
-                });
+                };
                 iEquipmentSpecificIndexSerivce.saveBatch(equipmentSpecificIndexList);
             }
         }

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

@@ -135,6 +135,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     private VideoMapper videoMapper;
 
+    @Autowired
+    SignalClassifyMapper signalClassifyMapper;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
@@ -1456,6 +1459,14 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentSpecificIndex.setEquipmentSpecialName(equipName);
             equipmentSpecificIndex.setEquipmentIndexName(index.getPerfQuotaName());
             equipmentSpecificIndex.setEquipmentIndexKey(index.getPerfQuotaDefinitionId());
+            QueryWrapper<SignalClassify> wrapper = new QueryWrapper<>();
+            wrapper.inSql("type_code",
+                    "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + index.getTypeCode()+"'");
+            SignalClassify signalClassify = signalClassifyMapper.selectOne(wrapper);
+            equipmentSpecificIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
+            equipmentSpecificIndex.setIsAlarm(signalClassify.getIsAlarm());
+            equipmentSpecificIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
+            equipmentSpecificIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
             equipmentSpecificIndices.add(equipmentSpecificIndex);
         });
     }

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.beanutils.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.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,43 +18,33 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
-import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
-import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.SourceScene;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
-import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
-import com.yeejoin.equipmanage.common.enums.SystemTypeEnum;
-import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
+import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
-import com.yeejoin.equipmanage.common.vo.FileUploadVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystem3dVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
-import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
-import com.yeejoin.equipmanage.mapper.BuildingMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentManageMapper;
-import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
-import com.yeejoin.equipmanage.mapper.SourceSceneMapper;
+import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.EquipmentManageService;
-import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
-import com.yeejoin.equipmanage.service.IDynamicFormInstanceService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
-import com.yeejoin.equipmanage.service.ISourceSceneService;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.MqttSendGateway;
+import com.yeejoin.equipmanage.service.*;
+import com.yeejoin.equipmanage.utils.BeanUtil;
+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.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -551,17 +515,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
 
-    private static <T> void mapToBean(Map<String, Object> map, T bean) {
-        try {
-            BeanUtils.populate(bean, map);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        Set<?> set = new HashSet<>();
-
-    }
-
-
     /**
      * 生成 性能指标数据
      *
@@ -575,11 +528,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         List<SpeIndexVo> newList = new ArrayList<>();
         List<SpeIndexVo> statusList = new ArrayList<>();
         for (SpeIndexVo vo : list) {
-            String k = vo.getTypeCode();
-            if (EquipmentRiskTypeEnum.GZ.getCode().equals(k) ||
-                    EquipmentRiskTypeEnum.HZGJ.getCode().equals(k) ||
-                    EquipmentRiskTypeEnum.YXZT.getCode().equals(k) ||
-                    EquipmentRiskTypeEnum.PB.getCode().equals(k)) {
+            int status = vo.getIsAlarm();
+            if (AlarmStatusEnum.BJ.getCode() == status) {
                 statusList.add(vo);
             }
             newList.add(vo);
@@ -589,8 +539,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
         SpeIndexVo spe = new SpeIndexVo();
         spe.setKey(EquipmentSpeIndexEnum.YXZT.getCode());
+        SpeIndexVo latestVo = statusList.get(0);
+        BeanUtils.copyProperties(latestVo, spe);
         spe.setName("当前状态");
-        spe.setValue(getStatus(statusList));
         statusList.clear();
         statusList.add(spe);
         statusList.addAll(newList);

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

@@ -348,7 +348,7 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
         equipIndexLatestStatus.forEach(action->{
         	 Map<String, String> map = new HashMap<>();
         	 map.put("equipCode", action.getQrCode());
-             map.put("status", EquipmentStateUtil.judgeEquipState(action));
+             map.put("color", action.getEmergencyLevelColor());
              data.add(map);
         });
         return data;

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

+package com.yeejoin.equipmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.equipmanage.common.entity.SignalClassify;
+import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
+import com.yeejoin.equipmanage.service.ISignalClassifyService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 信号分类量测枚举表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+@Service
+public class SignalClassifyServiceImpl extends ServiceImpl<SignalClassifyMapper, SignalClassify> implements ISignalClassifyService {
+
+}
\ No newline at end of file

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

@@ -2140,4 +2140,92 @@
             UPDATE `f_fire_fighting_system` SET `analysis_index_key`='FireAlarm,Fault,Shield,State' WHERE (`code`='029026401813010000000054');
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1645149948-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="wl_signal_classify"/>
+            </not>
+        </preConditions>
+        <comment>create table wl_signal_classify 用于点图装备状态颜色展示等</comment>
+        <sql>
+            CREATE TABLE `wl_signal_classify` (
+            `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+            `type_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '量测枚举key',
+            `type_name` varchar(20) DEFAULT NULL COMMENT '类型名称',
+            `emergency_level_color` varchar(20) DEFAULT NULL COMMENT '十六进制颜色',
+            `is_alarm` bit(1) DEFAULT b'0' COMMENT '是否告警:0-否；1-是',
+            `emergency_level` varchar(10) DEFAULT NULL COMMENT '紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）',
+            `emergency_level_describe` varchar(20) DEFAULT NULL COMMENT '紧急程度描述',
+            `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+            PRIMARY KEY (`id`) USING BTREE
+            ) ENGINE=InnoDB AUTO_INCREMENT=20220218 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='信号分类量测枚举表';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1645149948-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_car_property" columnName="emergency_level_color"/>
+            </not>
+        </preConditions>
+        <comment>wl_car_property add `emergency_level_color`</comment>
+        <sql>
+            ALTER TABLE `wl_car_property` ADD COLUMN `emergency_level_color` varchar(20) DEFAULT NULL COMMENT '十六进制颜色',
+            ADD COLUMN `is_alarm` bit(1) DEFAULT b'0' COMMENT '是否告警:0-否；1-是',
+            ADD COLUMN `emergency_level` varchar(10) DEFAULT NULL COMMENT '紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）',
+            ADD COLUMN `emergency_level_describe` varchar(20) DEFAULT NULL COMMENT '紧急程度描述';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1645149948-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_index" columnName="emergency_level_color"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_index add `emergency_level_color`</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_index` ADD COLUMN `emergency_level_color` varchar(20) DEFAULT NULL COMMENT '十六进制颜色',
+            ADD COLUMN `is_alarm` bit(1) DEFAULT b'0' COMMENT '是否告警:0-否；1-是',
+            ADD COLUMN `emergency_level` varchar(10) DEFAULT NULL COMMENT '紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）',
+            ADD COLUMN `emergency_level_describe` varchar(20) DEFAULT NULL COMMENT '紧急程度描述';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1645149948-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm" columnName="emergency_level_color"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_alarm add `emergency_level_color`</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_alarm` ADD COLUMN `emergency_level_color` varchar(20) DEFAULT NULL COMMENT '十六进制颜色',
+            ADD COLUMN `emergency_level` varchar(10) DEFAULT NULL COMMENT '紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）',
+            ADD COLUMN `emergency_level_describe` varchar(20) DEFAULT NULL COMMENT '紧急程度描述';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1645149948-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="emergency_level_color"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_alarm_log add `emergency_level_color`</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_alarm_log` ADD COLUMN `emergency_level_color` varchar(20) DEFAULT NULL COMMENT '十六进制颜色',
+            ADD COLUMN `emergency_level` varchar(10) DEFAULT NULL COMMENT '紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）',
+            ADD COLUMN `emergency_level_describe` varchar(20) DEFAULT NULL COMMENT '紧急程度描述';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1645149948-6">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_alarm_report_day" columnName="is_alarm"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_alarm_report_day add `is_alarm`</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_alarm_report_day` ADD COLUMN `is_alarm` bit(1) DEFAULT b'0' COMMENT '是否告警:0-否；1-是';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file

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

@@ -89,7 +89,8 @@
 			 null as group_name,
 			 null as index_id,
 			 0 as is_importent_parameter,
-			 0 as sort_num
+			 0 as sort_num,
+			 null as value_enum
 			 from wl_equipment
 			 where
 			 id = #{id}
@@ -108,7 +109,8 @@
 			 group_name,
 			 index_definition_id,
 			 1 as is_importent_parameter,
-			 sort_num
+			 sort_num,
+			 value_enum
 			 from
 			 wl_equipment_index
 			 where equipment_id = #{id}
@@ -153,7 +155,8 @@
 			 index_definition_id as index_id,
 			 1 as is_importent_parameter,
 			 sort_num,
-			 type
+			 type,
+			 value_enum
 			 from
 			 wl_equipment_index
 			 where id = #{id}

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

@@ -315,12 +315,15 @@
 			es.realtime_iot_index_name AS 'indexName',
 			es.qr_code AS 'qrCode',
 			es.iot_code AS 'iotCode',
-			es.realtime_iot_index_value AS 'value'
+			es.realtime_iot_index_value AS 'value',
+            sc.color AS color
 		FROM
 			wl_equipment_specific es,
-			wl_equipment_index ei
+			wl_equipment_index ei,
+			wl_signal_classify sc
 		WHERE
 			es.realtime_iot_index_id = ei.id
+            AND upper(sc.type_code) = ei.type_code
 		AND find_in_set(
 			es.id,
 			(

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

@@ -346,7 +346,6 @@
 					spein.value_label
 				),
 				concat(
-		
 					IF (
 						(
 							ISNULL(spein.value_label)
@@ -358,7 +357,11 @@
 					' ',
 					eqin.unit
 				)
-				) AS `value`
+				) AS `value`,
+				spein.emergency_level_color AS color,
+				spein.is_alarm AS isAlarm,
+				spein.emergency_level AS emergencyLevel,
+				spein.emergency_level_describe AS emergencyLevelDescribe
 				FROM
 					wl_equipment_specific_index AS spein
 				LEFT JOIN wl_equipment_index AS eqin ON spein.equipment_index_id = eqin.id

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.equipmanage.mapper.SignalClassifyMapper">
+
+</mapper>