修改枚举配置

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabWarnPushMessage.java

@@ -2,6 +2,7 @@ package com.zd.laboratory.domain;
 
 import com.zd.model.annotation.Excel;
 import com.zd.model.entity.BaseEntity;
+import com.zd.model.enums.WarnMessageTypeEnum;
 import com.zd.model.enums.WarnUserAttrEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,7 +34,7 @@ public class LabWarnPushMessage extends BaseEntity
     /** 推送类型0：语音 1：短信 */
     @Excel(name = "推送类型0：语音 1：短信")
     @ApiModelProperty(value = "推送类型0：语音 1：短信")
-    private Integer pushType;
+    private WarnMessageTypeEnum pushType;
     /** 预警ID */
     @Excel(name = "预警ID")
     @ApiModelProperty(value = "预警ID")
@@ -77,25 +78,15 @@ public class LabWarnPushMessage extends BaseEntity
     {
         return context;
     }
-//    public void setPushType(WarnMessageTypeEnum pushType)
-//    {
-//        this.pushType = pushType;
-//    }
-//
-//    public WarnMessageTypeEnum getPushType()
-//    {
-//        return pushType;
-//    }
-
-
-    public Integer getPushType() {
-        return pushType;
-    }
-
-    public void setPushType(Integer pushType) {
+    public void setPushType(WarnMessageTypeEnum pushType)
+    {
         this.pushType = pushType;
     }
 
+    public WarnMessageTypeEnum getPushType()
+    {
+        return pushType;
+    }
     public void setWarnId(Long warnId)
     {
         this.warnId = warnId;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -1281,7 +1281,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labWarnPushMessage.setRiskGroup(groupId);
         String string = StringUtils.isBlank(labRiskPlanLevel.getInformation()) ? "" : labRiskPlanLevel.getInformation();
         labWarnPushMessage.setContext(RiskPlanConstants.LAB_SAFETY_MANAGEMENT_SYSTEM + labRiskPlanLevel.getContent() + string);
-        labWarnPushMessage.setPushType(WarnMessageTypeEnum.voice.getCode());
+        labWarnPushMessage.setPushType(WarnMessageTypeEnum.voice);
         labWarnPushMessage.setWarnId(labRiskPlanLevel.getRiskPlanId());
         labWarnPushMessage.setSubId(subjectId);
         labWarnPushMessage.setCreateTime(new Date());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabWarnPushMessageServiceImpl.java

@@ -83,7 +83,7 @@ public class LabWarnPushMessageServiceImpl implements ILabWarnPushMessageService
                 labWarnPushMessage.setRiskGroup(groupId);
                 String str= StringUtils.isBlank(labRiskPlanLevel.getMessage()) ? "" : labRiskPlanLevel.getMessage();
                 labWarnPushMessage.setContext(RiskPlanConstants.LAB_SAFETY_MANAGEMENT_SYSTEM + labRiskPlanLevel.getContent() + str);
-                labWarnPushMessage.setPushType(WarnMessageTypeEnum.SMS.getCode());
+                labWarnPushMessage.setPushType(WarnMessageTypeEnum.SMS);
                 labWarnPushMessage.setWarnId(labRiskPlanLevel.getRiskPlanId());
                 labWarnPushMessage.setSubId(subId);
                 labWarnPushMessage.setCreateTime(new Date());

zd-modules/zd-modules-laboratory/src/main/resources/bootstrap.yml

@@ -16,15 +16,14 @@ mybatis:
 #    log-impl: com.zd.common.core.utils.MySlf4jImpl #开启sql打印到info
     # Mybatis开启驼峰映射
     mapUnderscoreToCamelCase: true
-#mybatis-plus:
-#  type-handlers-package: com.zd.model.enums
+mybatis-plus:
+  type-handlers-package: com.zd.model.enums
 #  configuration:
 #    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志到控制台
 #    log-impl: com.zd.common.core.utils.MySlf4jImpl
 
 # mybatis配置
-mybatis-plus:
-  configuration:
-    cache-enabled: false
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
+#mybatis-plus:
+#  configuration:
+#    cache-enabled: false
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl