Browse Source

格式化代码

yumeng 4 years ago
parent
commit
ff61eaed70

+ 29 - 21
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleAccountTemplate.java

@@ -1,49 +1,57 @@
 package cn.com.ctop.alarm.modules.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 规则模板
+ *
  * @author jeecg-boot
- * @date   2020-11-15
  * @version V1.0
+ * @date 2020-11-15
  */
 @Data
 @TableName("ctop_rule_account_template")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_rule_account_template对象", description="规则模板")
+@ApiModel(value = "ctop_rule_account_template对象", description = "规则模板")
 public class RuleAccountTemplate {
-    
-	/**id*/
-	@TableId(type = IdType.AUTO)
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Long id;
-	/**账户id*/
-	@Excel(name = "账户id", width = 15)
+    private Long id;
+    /**
+     * 账户id
+     */
+    @Excel(name = "账户id", width = 15)
     @ApiModelProperty(value = "账户id")
-	private Long accountId;
-	/**模板id*/
-	@Excel(name = "模板id", width = 15)
+    private Long accountId;
+    /**
+     * 模板id
+     */
+    @Excel(name = "模板id", width = 15)
     @ApiModelProperty(value = "模板id")
-	private Long templateId;
-	/**createTime*/
+    private Long templateId;
+    /**
+     * createTime
+     */
     @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
+    private Date createTime;
+    /**
+     * updateTime
+     */
     @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
+    private Date updateTime;
 }

+ 33 - 19
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleAccountThreshold.java

@@ -2,6 +2,7 @@ package cn.com.ctop.alarm.modules.entity;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,37 +18,50 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
  * 规则关联账户 阈值
+ *
  * @author jeecg-boot
- * @date   2020-11-15
  * @version V1.0
+ * @date 2020-11-15
  */
 @Data
 @TableName("ctop_rule_account_threshold")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_rule_account_threshold对象", description="规则关联账户 阈值")
+@ApiModel(value = "ctop_rule_account_threshold对象", description = "规则关联账户 阈值")
 public class RuleAccountThreshold {
-    
-	/**id*/
-	@TableId(type = IdType.AUTO)
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Long id;
-	/**账户id*/
-	@Excel(name = "账户id", width = 15)
+    private Long id;
+    /**
+     * 账户id
+     */
+    @Excel(name = "账户id", width = 15)
     @ApiModelProperty(value = "账户id")
-	private Long accountId;
-	/**规则id*/
-	@Excel(name = "规则id", width = 15)
+    private Long accountId;
+    /**
+     * 规则id
+     */
+    @Excel(name = "规则id", width = 15)
     @ApiModelProperty(value = "规则id")
-	private Long ruleId;
-	/**阈值*/
-	@Excel(name = "阈值", width = 15)
+    private Long ruleId;
+    /**
+     * 阈值
+     */
+    @Excel(name = "阈值", width = 15)
     @ApiModelProperty(value = "阈值")
-	private String threshoId;
-	/**createTime*/
+    private String threshoId;
+    /**
+     * createTime
+     */
     @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
+    private Date createTime;
+    /**
+     * updateTime
+     */
     @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
+    private Date updateTime;
 }

+ 44 - 30
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleBase.java

@@ -1,61 +1,75 @@
 package cn.com.ctop.alarm.modules.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 基础规则
+ *
  * @author jeecg-boot
- * @date   2020-11-15
  * @version V1.0
+ * @date 2020-11-15
  */
 @Data
 @TableName("ctop_rule_base")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_rule_base对象", description="基础规则")
+@ApiModel(value = "ctop_rule_base对象", description = "基础规则")
 public class RuleBase {
-    
-	/**id*/
-	@TableId(type = IdType.AUTO)
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Long id;
-	/**规则名称*/
-	@Excel(name = "规则名称", width = 15)
+    private Long id;
+    /**
+     * 规则名称
+     */
+    @Excel(name = "规则名称", width = 15)
     @ApiModelProperty(value = "规则名称")
-	private String ruleName;
-	/**指标code*/
-	@Excel(name = "指标code", width = 15)
+    private String ruleName;
+    /**
+     * 指标code
+     */
+    @Excel(name = "指标code", width = 15)
     @ApiModelProperty(value = "指标code")
-	private String indicatorCode;
-	/**判断条件 大于 等于 小于等*/
-	@Excel(name = "判断条件 大于 等于 小于等", width = 15)
+    private String indicatorCode;
+    /**
+     * 判断条件 大于 等于 小于等
+     */
+    @Excel(name = "判断条件 大于 等于 小于等", width = 15)
     @ApiModelProperty(value = "判断条件 大于 等于 小于等")
-	private String condition;
-	/**阈值 比较值*/
-	@Excel(name = "阈值 比较值", width = 15)
+    private String condition;
+    /**
+     * 阈值 比较值
+     */
+    @Excel(name = "阈值 比较值", width = 15)
     @ApiModelProperty(value = "阈值 比较值")
-	private String threshold;
-	/**规则维度 账户、计划、组、创意等维度*/
-	@Excel(name = "规则维度 账户、计划、组、创意等维度", width = 15)
+    private String threshold;
+    /**
+     * 规则维度 账户、计划、组、创意等维度
+     */
+    @Excel(name = "规则维度 账户、计划、组、创意等维度", width = 15)
     @ApiModelProperty(value = "规则维度 账户、计划、组、创意等维度")
-	private String ruleDimension;
-	/**createTime*/
+    private String ruleDimension;
+    /**
+     * createTime
+     */
     @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
+    private Date createTime;
+    /**
+     * updateTime
+     */
     @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
+    private Date updateTime;
 }

+ 34 - 24
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleTemplate.java

@@ -1,53 +1,63 @@
 package cn.com.ctop.alarm.modules.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 规则模板
+ *
  * @author jeecg-boot
- * @date   2020-11-15
  * @version V1.0
+ * @date 2020-11-15
  */
 @Data
 @TableName("ctop_rule_template")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_rule_template对象", description="规则模板")
+@ApiModel(value = "ctop_rule_template对象", description = "规则模板")
 public class RuleTemplate {
-    
-	/**id*/
-	@TableId(type = IdType.AUTO)
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Long id;
-	/**1:头条2:快手*/
-	@Excel(name = "1:头条2:快手", width = 15)
+    private Long id;
+    /**
+     * 1:头条2:快手
+     */
+    @Excel(name = "1:头条2:快手", width = 15)
     @ApiModelProperty(value = "1:头条2:快手")
-	private Long mediaType;
-	/**模板名称*/
-	@Excel(name = "模板名称", width = 15)
+    private Long mediaType;
+    /**
+     * 模板名称
+     */
+    @Excel(name = "模板名称", width = 15)
     @ApiModelProperty(value = "模板名称")
-	private String templateName;
-	/**规则组集合*/
-	@Excel(name = "规则组集合", width = 15)
+    private String templateName;
+    /**
+     * 规则组集合
+     */
+    @Excel(name = "规则组集合", width = 15)
     @ApiModelProperty(value = "规则组集合")
-	private String groupIds;
-	/**createTime*/
+    private String groupIds;
+    /**
+     * createTime
+     */
     @ApiModelProperty(value = "createTime")
-	private Date createTime;
-	/**updateTime*/
+    private Date createTime;
+    /**
+     * updateTime
+     */
     @ApiModelProperty(value = "updateTime")
-	private Date updateTime;
+    private Date updateTime;
 }