Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/common/IotDeviceStatusEnum.java

@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
  * @Date
  */
 public enum IotDeviceStatusEnum {
-    fc("封存"), dby("待保养"), wxz("维修中"), bf("报废"), xz("闲置"), sg("施工"), dq("动迁"), dm("待命"),zddm("驻地待命"),wg("完工"),xcdm("现场待命"),zb("准备");
+    fc("封存"), dby("待保养"), wxz("维修中"), bf("报废"), xz("闲置"), sg("施工"), dq("动迁"), dm("待命"),zddm("驻地待命"),wg("完工"),xcdm("现场待命"),zb("准备"),dwx("待维修"),gcsy("观察使用");
     private String msg;
 
     IotDeviceStatusEnum(String msg) {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/alarm/vo/IotAlarmSettingRespVO.java

@@ -46,6 +46,8 @@ public class IotAlarmSettingRespVO {
 
     @Schema(description = "告警属性")
     @ExcelProperty("告警属性")
-    private Integer alarmProperty;
+    private String alarmProperty;
 
+    @Schema(description = "属性标识")
+    private String propertyCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/alarm/vo/IotAlarmSettingSaveReqVO.java

@@ -33,6 +33,10 @@ public class IotAlarmSettingSaveReqVO {
     private String minValue;
 
     @Schema(description = "告警属性")
-    private Integer alarmProperty;
+    @NotEmpty(message = "告警属性不能为空")
+    private String alarmProperty;
 
+    @Schema(description = "属性标识")
+    @NotEmpty(message = "属性标识不能为空")
+    private String propertyCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/alarm/IotAlarmSettingDO.java

@@ -54,6 +54,10 @@ public class IotAlarmSettingDO extends BaseDO {
     /**
      * 告警属性
      */
-    private Integer alarmProperty;
+    private String alarmProperty;
 
+    /**
+     * 属性标识
+     */
+    private String propertyCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/alarm/IotAlarmSettingServiceImpl.java

@@ -34,6 +34,7 @@ public class IotAlarmSettingServiceImpl implements IotAlarmSettingService {
     public Long createIotAlarmSetting(IotAlarmSettingSaveReqVO createReqVO) {
         // 插入
         IotAlarmSettingDO iotAlarmSetting = BeanUtils.toBean(createReqVO, IotAlarmSettingDO.class);
+        iotAlarmSetting.setDeleted(false);
         iotAlarmSettingMapper.insert(iotAlarmSetting);
         // 返回
         return iotAlarmSetting.getId();