Browse Source

修改属性映射问题

lixing 3 years ago
parent
commit
5dd7aca4f9

+ 12 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/model/ConvertAlarmConditionTool.java

@@ -29,6 +29,10 @@ public interface ConvertAlarmConditionTool {
     * @author lixing
     * @version V1.0 2021-09-08 22:30:38
     */
+    @Mappings({
+            @Mapping(source = "triggerFrontend", target = "frontend"),
+            @Mapping(source = "triggerBackend", target = "backend")
+    })
     AlarmConditionItemVO convert2ResponseItemDTO(AlarmCondition alarmCondition);
     
     /**
@@ -39,6 +43,10 @@ public interface ConvertAlarmConditionTool {
     * @author lixing
     * @version V1.0 2021-09-08 22:30:38
     */
+    @Mappings({
+            @Mapping(source = "triggerFrontend", target = "frontend"),
+            @Mapping(source = "triggerBackend", target = "backend")
+    })
     AlarmConditionListItemVO convert2ResponseListItemDTO(AlarmCondition alarmCondition);
 
     /**
@@ -70,6 +78,10 @@ public interface ConvertAlarmConditionTool {
     * @author lixing
     * @version V1.0 2021-09-08 22:30:38
     */
+    @Mappings({
+            @Mapping(source = "updateAlarmConditionDTO.backend", target = "triggerBackend"),
+            @Mapping(source = "updateAlarmConditionDTO.frontend", target = "triggerFrontend")
+    })
     AlarmCondition convertUpdateDto2Entity(@MappingTarget AlarmCondition alarmCondition, UpdateAlarmConditionDTO updateAlarmConditionDTO);
 }
 

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/model/vo/AlarmConditionItemVO.java

@@ -27,10 +27,10 @@ public class AlarmConditionItemVO {
     private List<String> infoCodes;
 
     @ApiModelProperty("触发条件-前端展示")
-    private List<List<CalculateMethodDTO>> triggerFrontend;
+    private List<List<CalculateMethodDTO>> frontend;
 
     @ApiModelProperty("触发条件-后端使用")
-    private String triggerBackend;
+    private String backend;
 
     @ApiModelProperty("触发时长")
     private Integer triggerUphold;

+ 4 - 2
src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/model/vo/AlarmConditionListItemVO.java

@@ -1,5 +1,7 @@
 package com.persagy.apm.alarmservice.project.alarmcondition.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.dto.CalculateMethodDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,10 +27,10 @@ public class AlarmConditionListItemVO {
     private List<String> infoCodes;
 
     @ApiModelProperty("触发条件-前端展示")
-    private List<List<CalculateMethodDTO>> triggerFrontend;
+    private List<List<CalculateMethodDTO>> frontend;
 
     @ApiModelProperty("触发条件-后端使用")
-    private String triggerBackend;
+    private String backend;
 
     @ApiModelProperty("触发时长")
     private Integer triggerUphold;

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/impl/ProjectAlarmRuleObjRelServiceImpl.java

@@ -257,8 +257,8 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
         queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, ruleId);
         ProjectAlarmRuleObjRel projectAlarmRuleObjRel = new ProjectAlarmRuleObjRel();
         projectAlarmRuleObjRel.setValid(ValidEnum.FALSE.getType());
-        update(projectAlarmRuleObjRel, queryWrapper);
         jmsSender.sendRemoveObjConditionRelListMsg(ruleId);
+        update(projectAlarmRuleObjRel, queryWrapper);
     }
 
     @Override

+ 3 - 3
src/main/resources/bootstrap.yml

@@ -8,9 +8,9 @@ spring:
 
 EUREKA_CLIENT_DEFAULT_ZONE: http://frame:123456@develop.persagy.com/integrated-eureka/eureka/
 
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 
 eureka:

+ 1 - 1
src/main/resources/db/init/data_dev.sql

@@ -171,4 +171,4 @@ VALUES ('9', '(当前时刻CO2浓度-上一时刻CO2浓度)的绝对值',
         'ACATAH_ReturnAirCO2difference', 1, NULL, 'systemId', '2021-09-20 17:13:56', 'systemId', '2021-09-20 17:14:18',
         1);
 REPLACE INTO energy_alarm_service.alarm_project (id, project_id, project_name, group_code)
-VALUES ('153', '1101060001', '北京槐房万达广场', 'WD');
+VALUES ('153', 'Pj1101060001', '北京槐房万达广场', 'WD');

+ 2 - 3
src/main/resources/mapper/ProjectAlarmRuleMapper.xml

@@ -18,10 +18,9 @@
                     ofType="com.persagy.apm.alarmservice.project.alarmcondition.model.vo.AlarmConditionListItemVO">
             <result column="info_codes" property="infoCodes"
                     typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
-            <result column="frontend" property="frontend"
-                    typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
-            <result column="backend" property="backend"
+            <result column="trigger_frontend" property="frontend"
                     typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+            <result column="trigger_backend" property="backend"/>
             <result column="trigger_uphold" property="triggerUphold"/>
             <result column="alarm_level" property="alarmLevel"/>
         </collection>