将LocalTimeDate替换成Date

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

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_business_opportunities_clue")
@@ -29,7 +30,5 @@ public class BusinessOpportunitiesClue implements Serializable {
     private String userId;
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
+    private Date createTime;
 }

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

@@ -6,14 +6,11 @@ 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.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("ddt_enterprise")
@@ -44,9 +41,8 @@ public class Enterprise implements Serializable {
     private String linkmenName;
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDate createTime;
+
+    private Date createTime;
     @TableField("enterprise_itin")
     private String enterpriseItin;
     @TableField("business_status")
@@ -65,19 +61,13 @@ public class Enterprise implements Serializable {
     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("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
     @TableField("hash")
     private String hash;
 //    @TableField("telephone")

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

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_follow_up_record")
@@ -29,7 +30,5 @@ public class FollowUpRecord implements Serializable {
     private String userId;
     @TableField("follow_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime followTime;
+    private Date followTime;
 }

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

@@ -18,6 +18,4 @@ public class TopologicalBuildWdStatisticsCategory implements Serializable {
     @TableField("property_type_statistics")
     private String propertyTypeStatistics;
 
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_topological_building_wd_list")
@@ -21,7 +22,6 @@ public class TopologicalBuildingWd implements Serializable {
     private double rent;
     private String buildType;
     private String propertyType;
-    private LocalDateTime analyseTime;
 
     private double lat;
 

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_topological_enterprise_wd_list")
@@ -33,9 +34,6 @@ public class TopologicalEnterpriseWd implements Serializable {
     @TableField("enterprise_scale")
     private String enterpriseScale;
 
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
-
     private double lat;
     private double lng;
 

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

@@ -30,8 +30,6 @@ public class TopologicalHouseWd implements Serializable {
 
     public int peopleCount;
 
-    private LocalDateTime analyseTime;
-
     private double lat;
 
     private double lng;

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

@@ -27,6 +27,4 @@ public class TopologicalHouseWdStatisticsData implements Serializable {
     @TableField("average_rent")
     private double averageRent;
 
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
 }

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

@@ -26,6 +26,4 @@ public class TopologicalStoreWdStatisticsCategory implements Serializable {
     @TableField("sub_category_code_statistics")
     private String subCategoryCodeStatistics;
 
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
 }

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

@@ -17,6 +17,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("ddt_wd_info")
@@ -28,10 +29,8 @@ public class WdInfo implements Serializable {
     @TableField("wd_name")
     private String wdName;
     @TableField("create_date")
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createDate;
+    private Date createDate;
     @TableField("addr_info")
     private String addrInfo;
     @TableField("addr_code")
@@ -60,23 +59,17 @@ public class WdInfo implements Serializable {
     private String wdTypeCode;
     @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("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
     @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("hash")
     private String hash;
     @TableField("geo_hash")

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

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_wd_opclose_statistics")
@@ -32,7 +33,5 @@ public class WdOpclose implements Serializable {
 
     @TableField("stat_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime statTime;
+    private Date statTime;
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_wd_topological")
@@ -18,7 +19,5 @@ public class WdTopological implements Serializable {
     private int radius;
     @TableField("aroun_wd_info")
     private String aroundWdInfo;
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
 
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("bl_wd_topological_info")
@@ -37,7 +38,4 @@ public class WdTopologicalInfo implements Serializable {
     private String geoHash;
     @TableField("tag")
     private String tag;
-
-    @TableField("analyse_time")
-    private LocalDateTime analyseTime;
 }

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

@@ -10,6 +10,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BusinessOpportunitiesClueBo implements Serializable {
@@ -19,9 +20,7 @@ public class BusinessOpportunitiesClueBo implements Serializable {
     private String telephone;
     private Integer followUpCount;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
+    private Date createTime;
 
     public BusinessOpportunitiesClueBo() {
     }

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

@@ -10,6 +10,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class FollowUpRecordBo implements Serializable {
@@ -18,9 +19,7 @@ public class FollowUpRecordBo implements Serializable {
     private String content;
     private String person;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime followTime;
+    private Date followTime;
 
     public FollowUpRecordBo() {
     }

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

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class Info implements Serializable {
@@ -17,7 +18,5 @@ public class Info implements Serializable {
     private Float avgScore;
     private Integer count;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime time;
+    private Date time;
 }

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

@@ -10,6 +10,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -32,7 +33,7 @@ public class WdTopologicalInfoBo implements Serializable {
     private int attention;
 
     @TableField("analyse_time")
-    private LocalDateTime analyseTime;
+    private Date analyseTime;
 
     public WdTopologicalInfoBo(WdInfo wdInfo) {
         this.wdId = wdInfo.getWdId();

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

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class BrandVo implements Serializable {
@@ -25,22 +26,15 @@ public class BrandVo 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 createDate;
+    private Date createDate;
     private Long audit;
     private String collectPerson;
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
+    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")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime updateTime;
 
     private int showDelete = -1;

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

@@ -12,6 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class WdInfoVo implements Serializable {
@@ -28,20 +29,14 @@ public class WdInfoVo implements Serializable {
 
     private String wdTypeCode;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime enterTime;
+    private Date enterTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime updateTime;
+    private Date updateTime;
     private String collectUserId;
     private String collectPerson;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime collectTime;
+    private Date collectTime;
 
     @TableField("show_delete")
     private int showDelete = -1;

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

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.service.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -74,7 +75,7 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         clue.setTelephone(turnVo.getTelephone());
         clue.setFollowUpCount(0);
         clue.setUserId(userId);
-        clue.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        clue.setCreateTime(DateUtil.date());
         return businessOpportunitiesDao.insert(clue);
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BusinessOpportunitiesServiceImpl.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.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -20,6 +21,7 @@ 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;
 
@@ -78,7 +80,7 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
         record.setFollowPerson(addVo.getPerson());
         record.setFollowWay(addVo.getWay());
         record.setUserId(userId);
-        record.setFollowTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        record.setFollowTime(DateUtil.date());
         // 插入并更新跟进数
         if (followUpDao.insert(record) == 1) {
             return businessOpportunitiesDao.updateFollowUpCountByClueIdAndUserId(clue.getClueId(), clue.getFollowUpCount() + 1, userId);

ruoyi-ui/.env.production

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 精准营销后台管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/jzyx'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'

ruoyi-ui/vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || 'RuoYi-Vue-Plus后台管理系统' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 82 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions