改类型

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/AttentionPool.java

@@ -3,38 +3,41 @@ package com.ruoyi.demo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_attention_pool")
 public class AttentionPool{
     @TableField("attention_id")
     private String attentionId;
+
     @TableField("contact")
     private String contact;
+
     @TableField("telephone")
     private String telephone;
+
     @TableField("wd_id")
     private String wdId;
+
     @TableField("wd_name")
     private String wdName;
+
     @TableField("wd_addr_info")
     private String wdAddrInfo;
+
     @TableField("brand_id")
     private String brandId;
+
     @TableField("brand_name")
     private String brandName;
+
     @TableField("user_id")
     private String userId;
+
     @TableField("attention_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime attentionTime;
+    private Date attentionTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/AttentionPoolStatistics.java

@@ -3,32 +3,33 @@ package com.ruoyi.demo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
+
 
 @Data
 @TableName("bl_attention_pool_statistics")
 public class AttentionPoolStatistics {
     @TableField("stat_id")
     private String statId;
+
     @TableField("attention_count")
     private Integer attentionCount;
+
     @TableField("clue_count")
     private Integer clueCount;
+
     @TableField("online_count")
     private Integer onlineCount;
+
     @TableField("offline_count")
     private Integer offlineCount;
+
     @TableField("user_id")
     private String userId;
+
     @TableField("stat_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime statTime;
+    private Date statTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Brand.java

@@ -5,72 +5,80 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("ddt_brand")
 public class Brand implements Serializable {
     @TableId("brand_id")
     private String brandId;
+
     @TableField("brand_img")
     private String brandImg;
+
     @TableField("brand_name")
     private String brandName;
+
     @TableField("business_model")
     private String businessModel;
+
     @TableField("industry_code")
     private String industryCode;
+
     @TableField("enterprise_usci")
     private String enterpriseUsci;
+
     @TableField("per_capita_consumption")
     private Float perCapitaConsumption;
+
     @TableField("comment_count")
     private Long commentCount;
+
     @TableField("score")
     private Float score;
+
     @TableField("menu_info")
     private String menuInfo;
+
     @TableField("index_score")
     private Float indexScore;
+
     @TableField("contact")
     private String contact;
+
     @TableField("telephone")
     private String telephone;
+
     @TableField("create_date")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createDate;
+    private Date createDate;
+
     @TableField("audit")
     private Long audit;
+
     @TableField("collect_user_id")
     private String collectUserId;
+
     @TableField("collect_person")
     private String collectPerson;
+
     @TableField("collect_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
+    private Date collectTime;
+
     @TableField("enter_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
+    private Date enterTime;
+
     @TableField("hash")
     private String hash;
+
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     @TableLogic
     @TableField("show_delete")

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/BrandCity.java

@@ -3,35 +3,36 @@ package com.ruoyi.demo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_brand_city_distribution")
 public class BrandCity implements Serializable {
     @TableField("dis_id")
     private String disId;
+
     @TableField("brand_id")
     private String brandId;
+
     @TableField("addr_code")
     private String addrCode;
+
     @TableField("city")
     private String city;
+
     @TableField("lat")
     private Float lat;
+
     @TableField("lng")
     private Float lng;
+
     @TableField("dis_count")
     private Integer disCount;
+
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/BrandProvince.java

@@ -3,35 +3,36 @@ package com.ruoyi.demo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_brand_province_distribution")
 public class BrandProvince implements Serializable {
     @TableField("dis_id")
     private String disId;
+
     @TableField("brand_id")
     private String brandId;
+
     @TableField("addr_code")
     private String addrCode;
+
     @TableField("province")
     private String province;
+
     @TableField("lat")
     private Float lat;
+
     @TableField("lng")
     private Float lng;
+
     @TableField("dis_count")
     private Integer disCount;
+
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/BrandStatistics.java

@@ -3,14 +3,9 @@ package com.ruoyi.demo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_brand_statistics")
@@ -47,7 +42,5 @@ public class BrandStatistics {
 
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/BrandZone.java

@@ -3,15 +3,10 @@ package com.ruoyi.demo.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_brand_zone_distribution")
@@ -51,7 +46,5 @@ public class BrandZone {
 
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/AttentionPoolBo.java

@@ -1,28 +1,28 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.AttentionPool;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class AttentionPoolBo implements Serializable {
     private String attentionId;
+
     private String contact;
+
     private String telephone;
+
     private String wdName;
+
     private String wdAddrInfo;
+
     private String brandName;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime attentionTime;
+    private Date attentionTime;
 
     public AttentionPoolBo() {
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BrandInfo.java

@@ -1,16 +1,12 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.Enterprise;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BrandInfo implements Serializable {
@@ -27,9 +23,7 @@ public class BrandInfo implements Serializable {
     private String contact;
     private String telephone;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
     private Integer attention;
 
     public BrandInfo() {

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BrandOpcloseBo.java

@@ -1,14 +1,10 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -16,12 +12,8 @@ public class BrandOpcloseBo implements Serializable {
     private List<String> typeCodes; // 网点分类（犇云）
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime startTime;
+    private Date startTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime endTime;
+    private Date endTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BrandProvinceBo.java

@@ -1,15 +1,11 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.BrandProvince;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BrandProvinceBo implements Serializable {
@@ -20,9 +16,7 @@ public class BrandProvinceBo implements Serializable {
     private Integer count;
     private String ratio;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     public BrandProvinceBo() {
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BrandSearch.java

@@ -1,14 +1,10 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BrandSearch implements Serializable {
@@ -21,7 +17,5 @@ public class BrandSearch implements Serializable {
     private Integer total;
     private Integer attention;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BrandSimilar.java

@@ -1,15 +1,11 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.Brand;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BrandSimilar implements Serializable {
@@ -17,9 +13,7 @@ public class BrandSimilar implements Serializable {
     private String brandName;
     private String brandImg;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     public BrandSimilar() {
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BrandTotal.java

@@ -1,15 +1,11 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.BrandStatistics;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BrandTotal implements Serializable {
@@ -17,9 +13,7 @@ public class BrandTotal implements Serializable {
     private String brandName;
     private int total;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     public BrandTotal() {
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BusinessOpportunitiesClueBo.java

@@ -1,15 +1,10 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.BusinessOpportunitiesClue;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/FollowUpRecordBo.java

@@ -1,15 +1,10 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.FollowUpRecord;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/Info.java

@@ -1,14 +1,9 @@
 package com.ruoyi.demo.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/WorkTableBo.java

@@ -2,10 +2,10 @@ package com.ruoyi.demo.entity.bo;
 
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class WorkTableBo {
-    private LocalDateTime startTime;
-    private LocalDateTime endTime;
+    private Date startTime;
+    private Date endTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/BrandEvolveVo.java

@@ -7,7 +7,10 @@ import java.io.Serializable;
 @Data
 public class BrandEvolveVo implements Serializable {
     private String brandId;
+
     private String brandName;
+
     private Integer total;
+
     private String time;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/BrandVo.java

@@ -1,41 +1,54 @@
 package com.ruoyi.demo.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
 public class BrandVo implements Serializable {
     private String brandId;
+
     private String brandImg;
+
     private String brandName;
+
     private String industryCode;
+
     private String enterpriseUsci;
+
     private Float perCapitaConsumption;
+
     private Long commentCount;
+
     private Float score;
+
     private String menuInfo;
+
     private Float indexScore;
+
     private String contact;
+
     private String telephone;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
+
     private Long audit;
+
     private String collectPerson;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date collectTime;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date enterTime;
+
     private String hash;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     private int showDelete = -1;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ChannelVo.java

@@ -2,11 +2,17 @@ package com.ruoyi.demo.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class ChannelVo {
+public class ChannelVo implements Serializable {
     private String wdImg;
+
     private String wdName;
+
     private String contact;
+
     private String telephone;
+
     private String channelType;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ListQueryBody.java

@@ -8,16 +8,28 @@ import java.util.List;
 @Data
 public class ListQueryBody implements Serializable {
     private String text;
+
     private List<String> brandId;
+
     private List<String> industryCode;
+
     private List<String> typeCode;
+
     private List<String> typeCodeBy;
+
     private List<String> wdCount;
+
     private List<String> coverCityCount;
+
     private List<String> addrCode;
+
     private String orderBy;
+
     private String startTime;
+
     private String endTime;
+
     private Integer pageNum;
+
     private Integer pageSize;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/OpcloseTimeVo.java

@@ -2,10 +2,15 @@ package com.ruoyi.demo.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class OpcloseTimeVo {
+public class OpcloseTimeVo implements Serializable {
     private String brandId;
+
     private String brandName;
+
     private String time;
+
     private Integer count;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/TimeVo.java

@@ -2,8 +2,11 @@ package com.ruoyi.demo.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class TimeVo {
+public class TimeVo implements Serializable {
     private String time;
+
     private Integer count;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/WdInfoVo.java

@@ -2,16 +2,11 @@ package com.ruoyi.demo.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.WdInfo;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/AttentionPoolServiceImpl.java

@@ -16,8 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -105,7 +103,7 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         pool.setWdName("");
         pool.setWdAddrInfo("");
         pool.setUserId(userId);
-        pool.setAttentionTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        pool.setAttentionTime(DateUtil.date());
         return attentionPoolDao.insert(pool);
     }
 
@@ -168,7 +166,7 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
             pool.setBrandName("");
         }
         pool.setUserId(userId);
-        pool.setAttentionTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        pool.setAttentionTime(DateUtil.date());
         return attentionPoolDao.insert(pool);
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BrandServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -433,7 +435,8 @@ public class BrandServiceImpl implements BrandService {
         Map<String, List<BrandEvolveVo>> times = new HashMap<>();
         for (int i = 0; i < 12; i++) {
             List<BrandEvolveVo> evos = new ArrayList<>();
-            times.put(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")), evos);
+            // times.put(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")), evos);
+            times.put(DateUtil.offsetMonth(new Date(), -i).toString("yyyy-MM"), evos);
         }
         // 向时间映射对象中赋值
         vos.forEach(vo -> {
@@ -550,7 +553,8 @@ public class BrandServiceImpl implements BrandService {
         List<TimeVo> vos = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
             TimeVo timeVo = new TimeVo();
-            timeVo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")));
+            // timeVo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")));
+            timeVo.setTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, -i).toString("yyyy"));
             timeVo.setCount(brandMapper.selectCountByYear(timeVo.getTime(), null));
             vos.add(timeVo);
         }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BusinessOpportunitiesServiceImpl.java

@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/DatabackServiceImpl.java

@@ -1,9 +1,10 @@
 package com.ruoyi.demo.service.impl;
 
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.AttentionPool;
-import com.ruoyi.demo.entity.AttentionPoolStatistics;
 import com.ruoyi.demo.entity.BusinessOpportunitiesClue;
 import com.ruoyi.demo.entity.FollowUpRecord;
 import com.ruoyi.demo.entity.bo.AttentionPoolStatisticsBo;
@@ -16,12 +17,9 @@ import com.ruoyi.demo.service.DatabackService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -97,7 +95,8 @@ public class DatabackServiceImpl implements DatabackService {
         if (condition.equals("day")) { // 时间粒度：天
             List<String> days = new ArrayList<>();
             for (int i = 1; i <= 30; i++)
-                days.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).toString());
+                // days.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).toString());
+                days.add(DateUtil.offsetDay(new Date(), -i).toString("yyyy-MM-dd"));
 
             list = attentionPoolStatisticsDao.selectAllByUserIdAndDay(userId, days);
             // 补齐空数据
@@ -108,7 +107,8 @@ public class DatabackServiceImpl implements DatabackService {
         } else if (condition.equals("year")) { // 时间粒度：年
             List<String> years = new ArrayList<>();
             for (int i = 0; i < 5; i++)
-                years.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")).toString());
+                // years.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")).toString());
+                years.add(DateUtil.offset(DateUtil.date(), DateField.YEAR, -i).toString("yyyy"));
 
             list = attentionPoolStatisticsDao.selectAllByUserIdAndYear(userId, years);
             // 补齐数据
@@ -119,7 +119,8 @@ public class DatabackServiceImpl implements DatabackService {
         } else { // 时间粒度：月
             List<String> months = new ArrayList<>();
             for (int i = 0; i < 12; i++)
-                months.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")).toString());
+                // months.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")).toString());
+                months.add(DateUtil.offsetMonth(new Date(), -i).toString("yyyy-MM"));
 
             list = attentionPoolStatisticsDao.selectAllByUserIdAndMonth(userId, months);
             // 补齐空数据

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/WdInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.demo.entity.WdInfo;
@@ -16,10 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -41,7 +40,8 @@ public class WdInfoServiceImpl implements WdInfoService {
         List<String> addrs = new ArrayList<>();
         List<String> times = new ArrayList<>();
         for (int i = 0; i < 12; i++)
-            times.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
+            // times.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
+            times.add(DateUtil.offsetMonth(new Date(), -i).toString("yyyy-MM"));
         if (addrCodes != null) {
             if (!addrCodes.isEmpty())
                 for (String s : addrCodes)

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/AttentionPoolStat.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.demo.entity.AttentionPoolStatistics;
 import com.ruoyi.demo.mapper.AttentionPoolDao;
 import com.ruoyi.demo.mapper.AttentionPoolStatisticsDao;
@@ -8,8 +9,6 @@ import com.ruoyi.demo.mapper.FollowUpDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.List;
 import java.util.UUID;
 
@@ -24,17 +23,17 @@ public class AttentionPoolStat {
     @Autowired
     AttentionPoolStatisticsDao statisticsDao;
 
-    public void insert(){
+    public void insert() {
         List<String> ins = poolDao.selectAllUser();
-        for (String userId : ins){
+        for (String userId : ins) {
             AttentionPoolStatistics statistics = new AttentionPoolStatistics();
-            statistics.setStatId(UUID.randomUUID().toString().replace("-",""));
+            statistics.setStatId(UUID.randomUUID().toString().replace("-", ""));
             statistics.setAttentionCount(poolDao.selectCount(userId));
             statistics.setClueCount(opportunitiesDao.selectCount(userId));
-            statistics.setOnlineCount(followUpDao.selectCountByWay(userId,"线上电话"));
-            statistics.setOfflineCount(followUpDao.selectCountByWay(userId,"实地考察"));
+            statistics.setOnlineCount(followUpDao.selectCountByWay(userId, "线上电话"));
+            statistics.setOfflineCount(followUpDao.selectCountByWay(userId, "实地考察"));
             statistics.setUserId(userId);
-            statistics.setStatTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            statistics.setStatTime(DateUtil.date());
             statisticsDao.insert(statistics);
         }
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandBusinessStat.java

@@ -15,14 +15,14 @@ public class BrandBusinessStat {
     @Autowired
     BrandZoneDao zoneDao;
 
-    public void continueInsert(){
+    public void continueInsert() {
 //        List<String> ins = brandBusinessDao.selectIns();
 //        System.out.println("已经处理：" + ins.size() + "个");
         List<String> ins = zoneDao.selectIns();
         List<BrandBusiness> brandBusinesses = brandBusinessDao.selectByStatistics(ins);
         int i = 0;
         int total = brandBusinesses.size();
-        for (BrandBusiness business : brandBusinesses){
+        for (BrandBusiness business : brandBusinesses) {
             i += brandBusinessDao.insert(business);
             System.out.println(i + "/" + total);
         }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandCityStat.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandCity;
@@ -10,9 +11,6 @@ import com.ruoyi.demo.mapper.StoreWdDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
 
@@ -27,32 +25,32 @@ public class BrandCityStat {
     @Autowired
     StoreWdDao storeDao;
 
-    public void continueInsert(){
+    public void continueInsert() {
 //        List<String> ins = brandCityDao.selectIns();
 //        System.out.println("已处理：" + notIns.size() + "个");
 //        List<Brand> brands = brandDao.searchNotIns(notIns);
         List<String> ins = brandZoneDao.selectIns();
         QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("brand_id",ins);
+        queryWrapper.in("brand_id", ins);
         List<Brand> brands = brandDao.selectList(queryWrapper);
         int index = 1;
         int total = brands.size();
-        for (Brand brand : brands){
+        for (Brand brand : brands) {
 //            统计本月
-            String month = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).format(DateTimeFormatter.ofPattern("yyyy-MM"));
-            List<BrandCity> cities = brandCityDao.searchByBrandIdOrderByCity(brand.getBrandId(),month);
-            if (cities.isEmpty()){
-                System.out.println(index+"/"+total);
+            String month = DateUtil.date().toString("yyyy-MM");
+            List<BrandCity> cities = brandCityDao.searchByBrandIdOrderByCity(brand.getBrandId(), month);
+            if (cities.isEmpty()) {
+                System.out.println(index + "/" + total);
                 index++;
                 continue;
             }
-            for (BrandCity city : cities){
-                city.setDisId(UUID.randomUUID().toString().replace("-",""));
+            for (BrandCity city : cities) {
+                city.setDisId(UUID.randomUUID().toString().replace("-", ""));
                 city.setBrandId(brand.getBrandId());
-                city.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+                city.setUpdateTime(DateUtil.date());
             }
             brandCityDao.insertAll(cities);
-            System.out.println(index+"/"+total);
+            System.out.println(index + "/" + total);
             index++;
         }
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandCityTierStat.java

@@ -53,7 +53,7 @@ public class BrandCityTierStat {
         }
     }
 
-    public void continueInsert(){
+    public void continueInsert() {
         // 查询已完成统计的品牌
         List<String> notIns = tierMapper.selectAllId();
         System.out.println("已完成：" + notIns.size());

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandEvolveStat.java

@@ -13,14 +13,14 @@ public class BrandEvolveStat {
     @Autowired
     BrandEvolveDao brandEvolveDao;
 
-    public void insertAll(){
+    public void insertAll() {
         List<BrandEvolve> evolves = brandEvolveDao.selectAllByStatistics();
         int total = evolves.size();
         int i = 0;
-        for (BrandEvolve evolve : evolves){
-            evolve.setStatId(UUID.randomUUID().toString().replace("-",""));
+        for (BrandEvolve evolve : evolves) {
+            evolve.setStatId(UUID.randomUUID().toString().replace("-", ""));
             i += brandEvolveDao.insert(evolve);
-            System.out.println(i+"/"+total);
+            System.out.println(i + "/" + total);
         }
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandProvinceStat.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandProvince;
@@ -9,9 +10,6 @@ import com.ruoyi.demo.mapper.BrandProvinceDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
 
@@ -24,32 +22,32 @@ public class BrandProvinceStat {
     @Autowired
     BrandCityDao cityDao;
 
-    public void continueInsert(){
+    public void continueInsert() {
 //        List<String> notIns = brandProvinceDao.selectIns();
 //        System.out.println("已处理：" + notIns.size() + "个");
 //        List<Brand> brands = brandDao.searchNotIns(notIns);
         List<String> ins = cityDao.selectIns();
         QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("brand_id",ins);
+        queryWrapper.in("brand_id", ins);
         List<Brand> brands = brandDao.selectList(queryWrapper);
         int index = 1;
         int total = brands.size();
-        for (Brand brand : brands){
+        for (Brand brand : brands) {
 //            统计本月
-            String month = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).format(DateTimeFormatter.ofPattern("yyyy-MM"));
-            List<BrandProvince> provinces = brandProvinceDao.searchByBrandIdOrderByProvince(brand.getBrandId(),month);
-            if (provinces.isEmpty()){
-                System.out.println(index+"/"+total);
+            String month = DateUtil.date().toString("yyyy-MM");
+            List<BrandProvince> provinces = brandProvinceDao.searchByBrandIdOrderByProvince(brand.getBrandId(), month);
+            if (provinces.isEmpty()) {
+                System.out.println(index + "/" + total);
                 index++;
                 continue;
             }
-            for (BrandProvince bp : provinces){
-                bp.setDisId(UUID.randomUUID().toString().replace("-",""));
+            for (BrandProvince bp : provinces) {
+                bp.setDisId(UUID.randomUUID().toString().replace("-", ""));
                 bp.setBrandId(brand.getBrandId());
-                bp.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+                bp.setUpdateTime(DateUtil.date());
             }
             brandProvinceDao.insertAll(provinces);
-            System.out.println(index+"/"+total);
+            System.out.println(index + "/" + total);
             index++;
         }
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandStat.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandBusiness;
@@ -8,8 +9,6 @@ import com.ruoyi.demo.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.List;
 import java.util.UUID;
 
@@ -30,7 +29,7 @@ public class BrandStat {
     @Autowired
     BrandBusinessDao businessDao;
 
-    public void continueInsertPlus2(){
+    public void continueInsertPlus2() {
 //        查询已统计的品牌
 //        List<String> notIns = brandStatisticsDao.searchStated();
 //        System.out.println("已处理品牌："+notIns.size()+"个");
@@ -38,13 +37,13 @@ public class BrandStat {
 //        List<Brand> brands = brandMapper.searchNotIns(notIns);
         List<String> ins = brandZoneDao.selectIns();
         QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("brand_id",ins);
+        queryWrapper.in("brand_id", ins);
         List<Brand> brands = brandMapper.selectList(queryWrapper);
         int index = 0;
         int total = brands.size();
-        for (Brand brand : brands){
+        for (Brand brand : brands) {
             BrandStatistics statistics = new BrandStatistics();
-            statistics.setStatId(UUID.randomUUID().toString().replace("-",""));
+            statistics.setStatId(UUID.randomUUID().toString().replace("-", ""));
             statistics.setBrandId(brand.getBrandId());
             statistics.setBrandName(brand.getBrandName());
             statistics.setCoverProvinceCount(provinceDao.selectCountByBrandId(brand.getBrandId()));
@@ -52,37 +51,28 @@ public class BrandStat {
             statistics.setCoverZoneCount(brandZoneDao.searchZoneCountByBrandId(brand.getBrandId()));
 
             QueryWrapper<BrandBusiness> nomalStatusQueryWrapper = new QueryWrapper<>();
-            nomalStatusQueryWrapper.eq("brand_id",brand.getBrandId());
-            nomalStatusQueryWrapper.eq("business_status","正常");
+            nomalStatusQueryWrapper.eq("brand_id", brand.getBrandId());
+            nomalStatusQueryWrapper.eq("business_status", "正常");
             BrandBusiness nomalStatus = businessDao.selectOne(nomalStatusQueryWrapper);
-            if (nomalStatus == null)
-                statistics.setBusinessCount(0);
-            else
-                statistics.setBusinessCount(nomalStatus.getCount());
+            statistics.setBusinessCount(nomalStatus == null ? 0 : nomalStatus.getCount());
 //            statistics.setBusinessCount(storeDao.searchNomalStatusByBrandId(brand.getBrandId()));
 
             QueryWrapper<BrandBusiness> pauseStatusQueryWrapper = new QueryWrapper<>();
-            pauseStatusQueryWrapper.eq("brand_id",brand.getBrandId());
-            pauseStatusQueryWrapper.eq("business_status","暂停");
+            pauseStatusQueryWrapper.eq("brand_id", brand.getBrandId());
+            pauseStatusQueryWrapper.eq("business_status", "暂停");
             BrandBusiness pauseStatus = businessDao.selectOne(pauseStatusQueryWrapper);
-            if (pauseStatus == null)
-                statistics.setPauseBusinessCount(0);
-            else
-                statistics.setPauseBusinessCount(pauseStatus.getCount());
+            statistics.setPauseBusinessCount(pauseStatus == null ? 0 : pauseStatus.getCount());
 //            statistics.setPauseBusinessCount(storeDao.searchPauseStatusByBrandId(brand.getBrandId()));
 
             QueryWrapper<BrandBusiness> noStatusQueryWrapper = new QueryWrapper<>();
-            noStatusQueryWrapper.eq("brand_id",brand.getBrandId());
-            noStatusQueryWrapper.eq("business_status","尚未营业");
+            noStatusQueryWrapper.eq("brand_id", brand.getBrandId());
+            noStatusQueryWrapper.eq("business_status", "尚未营业");
             BrandBusiness noStatus = businessDao.selectOne(noStatusQueryWrapper);
-            if (noStatus == null)
-                statistics.setNoBusinessCount(0);
-            else
-                statistics.setNoBusinessCount(noStatus.getCount());
+            statistics.setNoBusinessCount(noStatus == null ? 0 : noStatus.getCount());
 //            statistics.setNoBusinessCount(storeDao.searchNoStatusByBrandId(brand.getBrandId()));
 
             statistics.setTotal(statistics.getBusinessCount() + statistics.getPauseBusinessCount() + statistics.getNoBusinessCount());
-            statistics.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            statistics.setUpdateTime(DateUtil.date());
             index += brandStatisticsDao.insert(statistics);
             System.out.println(index + "/" + total);
         }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/statistics/BrandZoneStat.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.utils.statistics;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.demo.entity.AddrCategory;
 import com.ruoyi.demo.entity.BrandZone;
@@ -10,8 +11,6 @@ import com.ruoyi.demo.mapper.StoreWdDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.List;
 import java.util.UUID;
 
@@ -26,19 +25,19 @@ public class BrandZoneStat {
     @Autowired
     BrandDao brandDao;
 
-    public void continueQuicklyInsert(){
+    public void continueQuicklyInsert() {
         List<String> ins = brandDao.selectAllId();
         List<BrandZone> zones = brandZoneDao.searchQuicklyStatistics(ins);
         int total = zones.size();
         int i = 0;
         for (BrandZone zone : zones) {
-            zone.setDisId(UUID.randomUUID().toString().replace("-",""));
-            zone.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            zone.setDisId(UUID.randomUUID().toString().replace("-", ""));
+            zone.setUpdateTime(DateUtil.date());
 
             QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("addr_code",zone.getAddrCode());
+            queryWrapper.eq("addr_code", zone.getAddrCode());
             AddrCategory one = addrCategoryDao.selectOne(queryWrapper);
-            if (one != null){
+            if (one != null) {
                 zone.setZone(one.getDistrict());
                 zone.setCity(one.getCity());
                 zone.setProvince(one.getProvince());
@@ -47,7 +46,7 @@ public class BrandZoneStat {
             }
 
             i += brandZoneDao.insert(zone);
-            System.out.println(i+"/"+total);
+            System.out.println(i + "/" + total);
         }
     }
 }

ruoyi-demo/src/main/resources/mapper/demo/WdInfoMapper.xml

@@ -65,7 +65,7 @@
             dsw.telephone,
             channel_type
         FROM
-            `ddt_wd_info` dwi
-                LEFT JOIN `ddt_store_wd` dsw ON dwi.wd_id = dsw.wd_id ${ew.customSqlSegment}
+            `ddt_store_wd` dsw
+                LEFT JOIN `ddt_wd_info` dwi ON dwi.wd_id = dsw.wd_id ${ew.customSqlSegment}
     </select>
 </mapper>