Browse Source

日志表增加主建

shaohongbo 3 years ago
parent
commit
3bf678fa6c

+ 2 - 0
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -180,6 +180,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
                 save.setComputeRound(Long.getLong(projectIndicatorCompute==null?"1":projectIndicatorCompute.getComputeRound()+""));
                 save.setLogInfo(CommonUtils.getExceptionStackTrace(e));
                 save.setLogTime(new Date());
+                save.setId(UUID.randomUUID().toString());
                 coredao.save(save);
             }
         }
@@ -500,6 +501,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
 
                 IndicatorComputeLog save = new IndicatorComputeLog();
                 save.setProject(projectDTO.getProjectId());
+                save.setId(UUID.randomUUID().toString());
                 save.setCode(alarmItemCode);
                 save.setObjId(objId);
                 save.setLogType(EnumComputeLogType.SendDataType.getCode());

+ 16 - 8
src/main/java/com/persagy/framework/ems/data/pojo/hbase/IndicatorComputeLog.java

@@ -9,9 +9,13 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * @author YanZu
+ */
 @Entity(name = "IndicatorComputeLog")
 @Table(name = "indicator_log", comment = "运行诊断计算发数日志", schema = Schema.UDM,
 		indexes = {
+				@Index(columns = {"c_id"},unique = true),
 				@Index(columns = {"project", "obj_id", "code", "log_time"}),
 				@Index(columns = {"project", "obj_id", "code","log_type","log_time"}),
 				@Index(columns = {"project", "obj_id", "code","log_type","data_time"})
@@ -23,37 +27,41 @@ public class IndicatorComputeLog extends BusinessObject {
 
 	private static final long serialVersionUID = 9123470427203487460L;
 
-	@Column(order = 10, name = "project", length = 50, nullable = false, comment = "项目/建筑id")
+	@Column(order = 10, name = "c_id", length = 50, nullable = false, comment = "项目/建筑id")
+	@JsonProperty("id")
+	private String id;
+
+	@Column(order = 20, name = "project", length = 50, nullable = false, comment = "项目/建筑id")
 	@JsonProperty("project")
 	private String project;
 
-	@Column(order = 20, name = "obj_id", length = 50, nullable = true, comment = "能耗模型id")
+	@Column(order = 30, name = "obj_id", length = 50, nullable = true, comment = "能耗模型id")
 	@JsonProperty("objId")
 	private String objId;
 
-	@Column(order = 30, name = "code", length = 50, nullable = true, comment = "分项id")
+	@Column(order = 40, name = "code", length = 50, nullable = true, comment = "分项id")
 	@JsonProperty("code")
 	private String code;
 
-	@Column(order = 40, name = "log_time", length = 50, nullable = false, comment = "数据时间")
+	@Column(order = 50, name = "log_time", length = 50, nullable = false, comment = "数据时间")
 	@JsonProperty("logTime")
 	private Date logTime;
 
 
-	@Column(order = 50, name = "log_type", length = 1, nullable = false, comment = "0计算日志,1发数日志")
+	@Column(order = 60, name = "log_type", length = 1, nullable = false, comment = "0计算日志,1发数日志")
 	@JsonProperty("logType")
 	private Long logType;
 
 
-	@Column(order = 60, name = "data_time", length = 50, nullable = false, comment = "数据时间")
+	@Column(order = 70, name = "data_time", length = 50, nullable = false, comment = "数据时间")
 	@JsonProperty("dataTime")
 	private Date dataTime;
 
-	@Column(order = 70, name = "compute_round", length = 128, nullable = true, comment = "计算论次")
+	@Column(order = 80, name = "compute_round", length = 128, nullable = true, comment = "计算论次")
 	@JsonProperty("computeRound")
 	private Long computeRound;
 
-	@Column(order = 80, name = "log_info", length = 128, nullable = false, comment = "日志详情")
+	@Column(order = 90, name = "log_info", length = 128, nullable = false, comment = "日志详情")
 	@JsonProperty("logInfo")
 	private String logInfo;
 }