Parcourir la source

处理json格式

lixing il y a 4 ans
Parent
commit
3973d1f0ae

+ 14 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/CompareCost.java

@@ -0,0 +1,14 @@
+package com.persagy.apm.energy.report.monthly.detail.business.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 3:15 下午
+ **/
+@Data
+@ApiModel(value = "可同比项目能源费")
+public class CompareCost {
+    // TODO: 2021/5/17 添加参数
+}

+ 14 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ComparePower.java

@@ -0,0 +1,14 @@
+package com.persagy.apm.energy.report.monthly.detail.business.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 3:15 下午
+ **/
+@Data
+@ApiModel(value = "可同比项目用电量")
+public class ComparePower {
+    // TODO: 2021/5/17 添加参数
+}

+ 14 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Job.java

@@ -0,0 +1,14 @@
+package com.persagy.apm.energy.report.monthly.detail.business.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 3:15 下午
+ **/
+@Data
+@ApiModel(value = "能耗管理工作")
+public class Job {
+    // TODO: 2021/5/17 添加参数
+}

+ 14 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/OpenCost.java

@@ -0,0 +1,14 @@
+package com.persagy.apm.energy.report.monthly.detail.business.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 3:15 下午
+ **/
+@Data
+@ApiModel(value = "在营项目能源费")
+public class OpenCost {
+    // TODO: 2021/5/17 添加参数
+}

+ 14 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/OpenPower.java

@@ -0,0 +1,14 @@
+package com.persagy.apm.energy.report.monthly.detail.business.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 3:15 下午
+ **/
+@Data
+@ApiModel(value = "在营项目用电量")
+public class OpenPower {
+    // TODO: 2021/5/17 添加参数
+}

+ 14 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/Platform.java

@@ -0,0 +1,14 @@
+package com.persagy.apm.energy.report.monthly.detail.business.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 3:15 下午
+ **/
+@Data
+@ApiModel(value = "能耗管理平台运维")
+public class Platform {
+    // TODO: 2021/5/17 添加参数
+}

+ 6 - 10
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ReportBusinessDetail.java

@@ -22,45 +22,41 @@ public class ReportBusinessDetail extends AuditableEntity<ReportBusinessDetail>
     private static final long serialVersionUID = -53430011796515423L;
 
     @ApiModelProperty("在营项目用电量数据对象信息,项目月报使用此字段")
-    private Object openPower;
+    private OpenPower openPower;
 
     @ApiModelProperty("在营项目用电情况说明")
     private String openPowerExplain;
 
     @ApiModelProperty("可同比项目用电量数据对象信息")
-    private Object comparePower;
+    private ComparePower comparePower;
 
     @ApiModelProperty("可同比项目用电情况说明")
     private String comparePowerExplain;
 
     @ApiModelProperty("在营项目能源费数据对象信息,项目月报使用此字段")
-    private Object openCost;
+    private OpenCost openCost;
 
     @ApiModelProperty("在营项目费用说明")
     private String openCostExplain;
 
     @ApiModelProperty("可同比项目能源费数据对象信息")
-    private Object compareCost;
+    private CompareCost compareCost;
 
     @ApiModelProperty("可同比项目费用说明")
     private String compareCostExplain;
 
     @ApiModelProperty("能耗管理工作开展对象信息")
-    private Object job;
+    private Job job;
 
     @ApiModelProperty("备注说明")
     private String remark;
 
     @ApiModelProperty("能耗管理平台运维对象信息")
-    private Object platform;
+    private Platform platform;
 
     @ApiModelProperty("事项说明")
     private String itemExplain;
 
-    @ApiModelProperty("关联的项目")
-    private Object projectIds;
-
-
     public static String PROP_OPEN_POWER = "open_power";
     public static String PROP_OPEN_POWER_EXPLAIN = "open_power_explain";
     public static String PROP_COMPARE_POWER = "compare_power";

+ 6 - 1
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/ReportOutline.java

@@ -1,5 +1,8 @@
 package com.persagy.apm.energy.report.monthly.outline.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +21,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(description = "报告概要")
+@TableName(autoResultMap = true)
 public class ReportOutline extends AuditableEntity<ReportOutline> implements Serializable {
     private static final long serialVersionUID = -86078914254018057L;
 
@@ -40,7 +44,8 @@ public class ReportOutline extends AuditableEntity<ReportOutline> implements Ser
     private Integer status;
 
     @ApiModelProperty("备注")
-    private Object remark;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private ReportOutlineRemark remark;
 
 
     public static String PROP_NAME = "name";

+ 24 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/ReportOutlineRemark.java

@@ -0,0 +1,24 @@
+package com.persagy.apm.energy.report.monthly.outline.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.persagy.apm.common.model.entity.AuditableEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lixing
+ * @version V1.0 2021-05-17 11:09:38
+ */
+@Data
+@ApiModel(description = "报告概要备注")
+public class ReportOutlineRemark {
+    @ApiModelProperty(value = "生成失败原因")
+    private String failReason;
+}

+ 3 - 3
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/AddReportOutlineDTO.java

@@ -1,5 +1,6 @@
 package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutlineRemark;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -40,8 +41,7 @@ public class AddReportOutlineDTO {
     @NotNull(message = "报告状态不能为空") // todo 更新校验规则
     private Integer status;
 
-    @ApiModelProperty(value = "备注", required = true)
-    @NotNull(message = "备注不能为空") // todo 更新校验规则
-    private Object remark;
+    @ApiModelProperty(value = "备注")
+    private ReportOutlineRemark remark;
 
 }

+ 0 - 1
src/main/resources/mapper/ReportBusinessDetailMapper.xml

@@ -16,7 +16,6 @@
         <result column="remark" property="remark"/>
         <result column="platform" property="platform"/>
         <result column="item_explain" property="itemExplain"/>
-        <result column="project_ids" property="projectIds"/>
         <result column="ts" property="ts"/>
         <result column="creator" property="creator"/>
         <result column="creation_time" property="creationTime"/>

+ 1 - 1
src/main/resources/mapper/ReportOutlineMapper.xml

@@ -9,7 +9,7 @@
         <result column="type" property="type"/>
         <result column="detail_id" property="detailId"/>
         <result column="status" property="status"/>
-        <result column="remark" property="remark"/>
+        <result column="remark" property="remark"  typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result column="ts" property="ts"/>
         <result column="creator" property="creator"/>
         <result column="creation_time" property="creationTime"/>