Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Bailian-Al

benyun-core/src/main/java/com/benyun/core/dao/AttentionPoolDao.java

@@ -12,6 +12,7 @@ public interface AttentionPoolDao extends BaseMapper<AttentionPool> {
     int searchCountByUserId(String userId);
     List<AttentionPool> searchByMulti(@Param("text") String text, @Param("userId") String userId);
     int deleteByAttentionIdAndUserId(@Param("attentionId") String attentionId, @Param("userId") String userId);
+    AttentionPool searchByAttentionIdAndUserId(@Param("attentionId") String attentionId, @Param("userId") String userId);
     AttentionPool searchByBrandIdOrWdIdAndUserId(@Param("brandId") String brandId, @Param("wdId") String wdId, @Param("userId") String userId);
     int deleteByBrandIdOrWdIdAndUserId(@Param("brandId") String brandId, @Param("wdId") String wdId, @Param("userId") String userId);
 }

benyun-core/src/main/java/com/benyun/core/dao/BrandMapper.java

@@ -1,5 +1,6 @@
 package com.benyun.core.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.benyun.core.entity.Brand;
 import com.benyun.core.entity.bo.BrandAddrDistribution;
 import com.benyun.core.entity.bo.BrandSearch;
@@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface BrandMapper {
+public interface BrandMapper extends BaseMapper<Brand> {
     List<Brand> searchList(String text);
     Brand searchById(String brandId);
     List<Brand> searchByIndustryCodeList(String brandId, String industryCode);

benyun-core/src/main/java/com/benyun/core/dao/BusinessOpportunitiesDao.java

@@ -10,7 +10,8 @@ import java.util.List;
 @Mapper
 public interface BusinessOpportunitiesDao extends BaseMapper<BusinessOpportunitiesClue> {
     int searchCountByUserId(@Param("userId") String userId);
-    BusinessOpportunitiesClue searchByAttentionIdAndUserId(@Param("attentionId") String attentionId, @Param("userId") String userId);
+    BusinessOpportunitiesClue searchByClueIdOrAttentionIdAndUserId(@Param("clueId") String clueId, @Param("attentionId") String attentionId, @Param("userId") String userId);
     int deleteByAttentionIdAndUserId(@Param("attentionId")String attentionId, @Param("userId") String userId);
     List<BusinessOpportunitiesClue> searchAllByMulti(@Param("text") String text, @Param("userId") String userId);
+    int updateFollowUpCountByClueIdAndUserId(@Param("clueId") String clueId, @Param("count") Integer count , @Param("userId") String userId);
 }

benyun-core/src/main/java/com/benyun/core/entity/AttentionPool.java

@@ -2,10 +2,14 @@ package com.benyun.core.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_attention_pool")
@@ -29,5 +33,8 @@ public class AttentionPool{
     @TableField("user_id")
     private String userId;
     @TableField("attention_time")
-    private Date attentionTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime attentionTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/AttentionPoolStatistics.java

@@ -2,9 +2,14 @@ package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_attention_pool_statistics")
@@ -22,5 +27,8 @@ public class AttentionPoolStatistics {
     @TableField("user_id")
     private String userId;
     @TableField("stat_time")
-    private Date statTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime statTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/Brand.java

@@ -1,93 +1,72 @@
 package com.benyun.core.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BaseEntity;
+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 lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("ddt_origin_brand")
-public class Brand extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     *
-     */
+public class Brand {
+    @TableId("brand_id")
     private String brandId;
-    /**
-     *
-     */
+    @TableField("brand_img")
     private String brandImg;
-    /**
-     *
-     */
+    @TableField("brand_name")
     private String brandName;
-    /**
-     *
-     */
+    @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("socre")
     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;
-    /**
-     *
-     */
-    private Date createDate;
-    /**
-     *
-     */
+    @TableField("create_data")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime createDate;
+    @TableField("audit")
     private Long audit;
-    /**
-     *
-     */
+    @TableField("collect_person")
     private String collectPerson;
-    /**
-     *
-     */
-    private Date collectTime;
-    /**
-     *
-     */
-    private Date enterTime;
-    /**
-     *
-     */
+    @TableField("collect_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime collectTime;
+    @TableField("enter_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime enterTime;
+    @TableField("hash")
     private String hash;
-    /**
-     *
-     */
-    private Long agree;
-    /**
-     *
-     */
-    private Long oppose;
+    @TableField("update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 
+    @TableField("show_delete")
+    private int showDelete;
 }

benyun-core/src/main/java/com/benyun/core/entity/BrandCity.java

@@ -1,9 +1,14 @@
 package com.benyun.core.entity;
 
 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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_brand_city_distribution")
@@ -15,5 +20,8 @@ public class BrandCity {
     private Float lat;
     private Float lng;
     private Integer disCount;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/BrandProvince.java

@@ -1,9 +1,14 @@
 package com.benyun.core.entity;
 
 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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_brand_province_distribution")
@@ -15,5 +20,8 @@ public class BrandProvince {
     private Float lat;
     private Float lng;
     private Integer disCount;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/BrandStatistics.java

@@ -1,9 +1,14 @@
 package com.benyun.core.entity;
 
 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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_brand_statistics")
@@ -18,5 +23,8 @@ public class BrandStatistics {
     private int pauseBusinessCount;
     private int noBusinessCount;
     private int total;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/BrandZone.java

@@ -1,9 +1,14 @@
 package com.benyun.core.entity;
 
 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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_brand_zone_distribution")
@@ -19,5 +24,8 @@ public class BrandZone {
     private Float lng;
     private Integer disCount;
     private Float avgScore;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/BusinessOpportunitiesClue.java

@@ -2,9 +2,14 @@ package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_business_opportunities_clue")
@@ -22,5 +27,8 @@ public class BusinessOpportunitiesClue {
     @TableField("user_id")
     private String userId;
     @TableField("create_time")
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime createTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/Enterprise.java

@@ -79,8 +79,8 @@ public class Enterprise {
     private LocalDateTime updateTime;
     @TableField("hash")
     private String hash;
-    @TableField("telephone")
-    private String telephone;
-    @TableField("website")
-    private String website;
+//    @TableField("telephone")
+//    private String telephone;
+//    @TableField("website")
+//    private String website;
 }

benyun-core/src/main/java/com/benyun/core/entity/FollowUpRecord.java

@@ -2,9 +2,14 @@ package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("bl_follow_up_record")
@@ -22,5 +27,8 @@ public class FollowUpRecord {
     @TableField("user_id")
     private String userId;
     @TableField("follow_time")
-    private Date followTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime followTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/AttentionPoolBo.java

@@ -1,8 +1,13 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class AttentionPoolBo {
@@ -12,5 +17,8 @@ public class AttentionPoolBo {
     private String wdName;
     private String wdAddrInfo;
     private String brandName;
-    private Date attentionTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime attentionTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/AttentionPoolStatisticsBo.java

@@ -1,8 +1,13 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class AttentionPoolStatisticsBo {
@@ -10,5 +15,8 @@ public class AttentionPoolStatisticsBo {
     private Integer clueCount;
     private Integer onlineCount;
     private Integer offlineCount;
-    private Date time;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime time;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/BrandInfo.java

@@ -1,9 +1,14 @@
 package com.benyun.core.entity.bo;
 
 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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("ddt_origin_brand")
@@ -17,5 +22,8 @@ public class BrandInfo {
     private String addrInfo;
     private String addrCode;
     private String telephone;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/BrandProvinceBo.java

@@ -1,8 +1,13 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class BrandProvinceBo {
@@ -12,5 +17,8 @@ public class BrandProvinceBo {
     private String location;
     private Integer count;
     private String ratio;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/BrandSearch.java

@@ -1,8 +1,13 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class BrandSearch {
@@ -13,6 +18,9 @@ public class BrandSearch {
     private String enterpriseName;
     private Integer coverCityCount;
     private Integer total;
-    private String attention;
-    private Date updateTime;
+    private Integer attention;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/BrandSimilar.java

@@ -1,9 +1,14 @@
 package com.benyun.core.entity.bo;
 
 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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("ddt_origin_brand")
@@ -11,5 +16,8 @@ public class BrandSimilar {
     private String brandId;
     private String brandName;
     private String brandImg;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/BrandTotal.java

@@ -1,13 +1,21 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class BrandTotal {
     private String brandId;
     private String brandName;
     private int total;
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime updateTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/BusinessOpportunitiesClueBo.java

@@ -1,8 +1,13 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class BusinessOpportunitiesClueBo {
@@ -11,5 +16,8 @@ public class BusinessOpportunitiesClueBo {
     private String contact;
     private String telephone;
     private Integer followUpCount;
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime createTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/FollowUpRecordBo.java

@@ -1,8 +1,13 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class FollowUpRecordBo {
@@ -10,5 +15,8 @@ public class FollowUpRecordBo {
     private String way;
     private String content;
     private String person;
-    private Date followTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime followTime;
 }

benyun-core/src/main/java/com/benyun/core/entity/bo/Info.java

@@ -1,13 +1,21 @@
 package com.benyun.core.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.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class Info {
     private String addrCode;
     private Float avgScore;
     private Integer count;
-    private Date time;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime time;
 }

benyun-core/src/main/java/com/benyun/core/service/impl/AttentionPoolServiceImpl.java

@@ -10,13 +10,15 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
 @Service
+@Transactional
 public class AttentionPoolServiceImpl implements AttentionPoolService {
     @Autowired
     AttentionPoolDao attentionPoolDao;
@@ -52,21 +54,20 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
 
     @Override
     public int cancelAttention(String attentionId, String userId) {
-        BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByAttentionIdAndUserId(attentionId, userId);
+        BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, attentionId, userId);
         if (clue != null){
             List<FollowUpRecord> followUpRecords = followUpDao.searchAllByClueIdAndUserId(clue.getClueId(), userId);
             if (!followUpRecords.isEmpty())
                 followUpDao.deleteByClueIdAndUserId(clue.getClueId(), userId);
             businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionId, userId);
         }
-        int deleteAttention = attentionPoolDao.deleteByAttentionIdAndUserId(attentionId, userId);
-        return deleteAttention;
+        return attentionPoolDao.deleteByAttentionIdAndUserId(attentionId, userId);
     }
 
     @Override
     public int turnBusinessOpportunities(TurnBusinessOpportunitiesVo turnVo, String userId) {
-        BusinessOpportunitiesClue clue1 = businessOpportunitiesDao.searchByAttentionIdAndUserId(turnVo.getAttentionId(), userId);
-        if (clue1 == null)
+        AttentionPool pool = attentionPoolDao.searchByAttentionIdAndUserId(turnVo.getAttentionId(), userId);
+        if (pool == null)
             return 0;
         BusinessOpportunitiesClue clue = new BusinessOpportunitiesClue();
         clue.setClueId(UUID.randomUUID().toString().replace("-",""));
@@ -75,7 +76,7 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         clue.setTelephone(turnVo.getTelephone());
         clue.setFollowUpCount(0);
         clue.setUserId(userId);
-        clue.setCreateTime(new Date());
+        clue.setCreateTime(LocalDateTime.now());
         return businessOpportunitiesDao.insert(clue);
     }
 
@@ -101,12 +102,22 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         pool.setWdName("");
         pool.setWdAddrInfo("");
         pool.setUserId(userId);
-        pool.setAttentionTime(new Date());
+        pool.setAttentionTime(LocalDateTime.now());
         return attentionPoolDao.insert(pool);
     }
 
     @Override
     public int cancelBrand(String brnadId, String userId) {
+        AttentionPool attentionPool = attentionPoolDao.searchByBrandIdOrWdIdAndUserId(brnadId, null, userId);
+        if (attentionPool == null)
+            return 1;
+        BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, attentionPool.getAttentionId(), userId);
+        if (clue != null){
+            if (followUpDao.deleteByClueIdAndUserId(clue.getClueId(), userId) == 0)
+                return 0;
+            if (businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionPool.getAttentionId(),userId) == 0)
+                return 0;
+        }
         return attentionPoolDao.deleteByBrandIdOrWdIdAndUserId(brnadId,null,userId);
     }
 
@@ -148,12 +159,22 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
             pool.setBrandName("");
         }
         pool.setUserId(userId);
-        pool.setAttentionTime(new Date());
+        pool.setAttentionTime(LocalDateTime.now());
         return attentionPoolDao.insert(pool);
     }
 
     @Override
     public int cancelWdInfo(String wdId, String userId) {
+        AttentionPool attentionPool = attentionPoolDao.searchByBrandIdOrWdIdAndUserId(null, wdId, userId);
+        if (attentionPool == null)
+            return 1;
+        BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, attentionPool.getAttentionId(), userId);
+        if (clue != null){
+            if (followUpDao.deleteByClueIdAndUserId(clue.getClueId(), userId) == 0)
+                return 0;
+            if (businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionPool.getAttentionId(),userId) == 0)
+                return 0;
+        }
         return attentionPoolDao.deleteByBrandIdOrWdIdAndUserId(null,wdId,userId);
     }
 }

benyun-core/src/main/java/com/benyun/core/service/impl/BrandServiceImpl.java

@@ -64,7 +64,6 @@ public class BrandServiceImpl implements BrandService {
                 info.setEnterpriseName(enterprise.getEnterpriseName());
                 info.setAddrCode(enterprise.getAddrCode());
                 info.setAddrInfo(enterprise.getAddrInfo());
-                info.setTelephone(enterprise.getTelephone());
             }
             info.setUpdateTime(brand.getUpdateTime());
         }else return null;
@@ -248,7 +247,7 @@ public class BrandServiceImpl implements BrandService {
         List<BrandSearch> brandSearches = brandMapper.searchSearchByMulti(text, industryCode, countUp, countDown, coverUp, coverDown);
         if (userId == null || userId.equals("")){
             for (BrandSearch search : brandSearches){
-                search.setAttention("0");
+                search.setAttention(0);
             }
         }else {
             List<AttentionPool> pools = attentionPoolDao.searchByMulti(null, userId);
@@ -258,9 +257,9 @@ public class BrandServiceImpl implements BrandService {
             }
             for (BrandSearch search : brandSearches){
                 if (map.get(search.getBrandId()) == null){
-                    search.setAttention("0");
+                    search.setAttention(0);
                 }else {
-                    search.setAttention("1");
+                    search.setAttention(1);
                 }
             }
         }

benyun-core/src/main/java/com/benyun/core/service/impl/BusinessOpportunitiesServiceImpl.java

@@ -14,8 +14,8 @@ import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -67,6 +67,9 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
 
     @Override
     public int addFollow(AddFollowRecordVo addVo, String userId) {
+        BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(addVo.getClueId(),null, userId);
+        if (clue == null)
+            return 0;
         FollowUpRecord record = new FollowUpRecord();
         record.setRecordId(UUID.randomUUID().toString().replace("-",""));
         record.setClueId(addVo.getClueId());
@@ -74,7 +77,10 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
         record.setFollowPerson(addVo.getPerson());
         record.setFollowWay(addVo.getWay());
         record.setUserId(userId);
-        record.setFollowTime(new Date());
-        return followUpDao.insert(record);
+        record.setFollowTime(LocalDateTime.now());
+        if (followUpDao.insert(record) == 1){
+            return businessOpportunitiesDao.updateFollowUpCountByClueIdAndUserId(clue.getClueId(), clue.getFollowUpCount() + 1, userId);
+        }
+        return 0;
     }
 }

benyun-core/src/main/resources/mapper/AttentionPoolMapper.xml

@@ -67,4 +67,13 @@
             and wd_id = #{wdId}
         </if>
     </select>
+    <select id="searchByAttentionIdAndUserId" resultMap="AttentionPoolResult">
+        select * from `bl_attention_pool`
+        <trim prefix="where" prefixOverrides="and">
+            <if test="userId != null">
+                user_id = #{userId}
+            </if>
+            and attention_id = #{attentionId}
+        </trim>
+    </select>
 </mapper>

benyun-core/src/main/resources/mapper/BrandMapper.xml

@@ -23,8 +23,7 @@
         <result property="enterTime" column="enter_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="hash" column="hash"/>
-        <result property="agree" column="agree"/>
-        <result property="oppose" column="oppose"/>
+        <result property="showDelete" column="show_delete"/>
     </resultMap>
     <resultMap type="com.benyun.core.entity.bo.BrandSearch" id="BrandSearchResult">
         <result property="brandId" column="brand_id"/>
@@ -41,13 +40,13 @@
         <result property="count" column="count"/>
     </resultMap>
     <select id="searchList" resultMap="BrandResult">
-        select * from ddt_brand where brand_name like concat("%",#{text},"%")
+        select * from ddt_brand where brand_name like concat("%",#{text},"%") and show_delete=0
     </select>
     <select id="searchById" resultMap="BrandResult">
-        select * from ddt_brand where brand_id = #{brandId}
+        select * from ddt_brand where brand_id = #{brandId} and show_delete=0
     </select>
     <select id="searchByIndustryCodeList" resultMap="BrandResult">
-        select * from ddt_brand where industry_code = #{industryCode} and brand_id <![CDATA[<>]]> #{brandId}
+        select * from ddt_brand where industry_code = #{industryCode} and brand_id <![CDATA[<>]]> #{brandId} and show_delete=0
     </select>
     <select id="searchSearchByMulti" resultMap="BrandSearchResult">
         SELECT
@@ -62,7 +61,7 @@
             `ddt_brand` db,
             `bl_brand_statistics` bbs
         WHERE
-            bbs.brand_id = db.brand_id
+            bbs.brand_id = db.brand_id and show_delete=0
         <if test="text != null">
             AND db.brand_name LIKE concat('%',#{text},'%')
         </if>

benyun-core/src/main/resources/mapper/BusinessOpportunitiesMapper.xml

@@ -12,6 +12,16 @@
         <result property="userId" column="user_id"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
+    <update id="updateFollowUpCountByClueIdAndUserId">
+        UPDATE `bl_business_opportunities_clue`
+        SET follow_up_count = #{count}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="userId != null">
+                user_id = #{userId}
+            </if>
+            and clue_id = #{clueId}
+        </trim>
+    </update>
     <delete id="deleteByAttentionIdAndUserId">
         delete from `bl_business_opportunities_clue`
         <trim prefix="where" prefixOverrides="and">
@@ -29,13 +39,18 @@
             </if>
         </where>
     </select>
-    <select id="searchByAttentionIdAndUserId" resultMap="ClueResult">
+    <select id="searchByClueIdOrAttentionIdAndUserId" resultMap="ClueResult">
         select * from `bl_business_opportunities_clue`
         <trim prefix="where" prefixOverrides="and">
             <if test="userId != null">
                 user_id = #{userId}
             </if>
-            and attention_id = #{attentionId}
+            <if test="clueId != null">
+                and clue_id = #{clueId}
+            </if>
+            <if test="attentionId != null">
+                and attention_id = #{attentionId}
+            </if>
         </trim>
     </select>
     <select id="searchAllByMulti" resultMap="ClueResult">

benyun-core/src/main/resources/mapper/EnterpriseMapper.xml

@@ -19,8 +19,6 @@
         <result property="industryCode" column="industry_code"/>
         <result property="enterpriseType" column="enterprise_type"/>
         <result property="creditScore" column="credit_score"/>
-        <result property="telephone" column="telephone"/>
-        <result property="website" column="website"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
     <select id="searchByUsci" resultMap="EnterpriseResult">

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -2,11 +2,18 @@ package com.ruoyi.common.core.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+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.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;