存在时间问题

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

@@ -12,6 +12,7 @@ import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 @Data
@@ -61,6 +62,7 @@ public class DlUser {
         this.startEquipmentName = s.getEquipmentName();
         this.startEquipmentCode = s.getEquipmentCode();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        dateTimeFormatter = dateTimeFormatter.withZone(ZoneId.of("Asia/Shanghai"));
         LocalDateTime parse = LocalDateTime.parse(s.getTime(), dateTimeFormatter);
         this.startTime = parse;
         this.endEquipmentId = s.getEquipmentId();

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

@@ -11,6 +11,7 @@ import com.ruoyi.demo.entity.bo.OrderAddBo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 @Data
@@ -77,6 +78,7 @@ public class Order {
         this.appkey = bo.getAppkey();
         this.appName = bo.getAppName();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        dateTimeFormatter.withZone(ZoneId.of("Asia/Shanghai"));
         this.createTime = LocalDateTime.parse(bo.getCreateTime(), dateTimeFormatter);
     }
 }

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

@@ -15,7 +15,9 @@ import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
 @Data
@@ -56,10 +58,10 @@ public class Plan {
     @TableField("goods_classify")
     private String goodsClassify;
     @TableField("plan_create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonSerialize(using = LocalDateTimeSerializer.class)
+//    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private String planCreateTime;
     @TableField("plan_start_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
@@ -102,10 +104,34 @@ public class Plan {
         this.setGoodsPrice(bo.getGoodsPrice());
         this.setGoodsIntroduce(bo.getGoodsIntroduce());
         this.setGoodsClassify(bo.getGoodsClassify());
-        this.setPlanCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+        this.setPlanCreateTime(now.toString());
+
+
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        this.setPlanStartTime(LocalDateTime.parse(bo.getPlanStartTime(), dateTimeFormatter));
-        this.setPlanEndTime(LocalDateTime.parse(bo.getPlanEndTime(), dateTimeFormatter));
+        System.out.println(bo.getPlanStartTime());
+        System.out.println(bo.getPlanEndTime());
+
+        System.out.println("......................");
+        LocalDateTime startTime = LocalDateTime.parse(bo.getPlanStartTime(), dateTimeFormatter);
+        LocalDateTime endTime = LocalDateTime.parse(bo.getPlanEndTime(), dateTimeFormatter);
+
+        LocalDateTime planStartTime = startTime.atZone(OffsetDateTime.now().getOffset()).withZoneSameInstant(ZoneId.of("Asia/Shanghai")).toLocalDateTime();
+        LocalDateTime planEndTime = endTime.atZone(OffsetDateTime.now().getOffset()).withZoneSameInstant(ZoneId.of("Asia/Shanghai")).toLocalDateTime();
+
+        System.out.println("......................");
+        LocalDateTime slocalDateTime = startTime.atZone(ZoneId.of("Asia/Shanghai")).toLocalDateTime();  //
+        LocalDateTime elocalDateTime = endTime.atZone(ZoneId.of("Asia/Shanghai")).toLocalDateTime();   //
+        System.out.println(slocalDateTime);
+        System.out.println(elocalDateTime);
+
+        System.out.println("......................");
+        System.out.println(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));  //
+        System.out.println(LocalDateTime.now().atZone(ZoneId.of("Asia/Shanghai")).toLocalDateTime());
+        System.out.println(LocalDateTime.now().atZone(OffsetDateTime.now().getOffset()).withZoneSameInstant(ZoneId.of("Asia/Shanghai")).toLocalDateTime());  //
+
+        this.planStartTime = slocalDateTime;
+        this.planEndTime = elocalDateTime;
         this.setState(StateUtil.NOT_AUDITED);
 
         this.setOnState(OnStateUtil.UP);

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

@@ -13,6 +13,7 @@ import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 @Data
@@ -80,6 +81,7 @@ public class Statistics {
         this.userTelephone = bo.getUserTelephone();
         this.behavior = bo.getBehavior();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        dateTimeFormatter.withZone(ZoneId.of("Asia/Shanghai"));
         LocalDateTime parse = LocalDateTime.parse(bo.getTime(), dateTimeFormatter);
         this.time = parse;
     }

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

@@ -60,7 +60,7 @@ public class PlanItemBo {
         this.goodsIntroduce = plan.getGoodsIntroduce();
         this.goodsPrice = plan.getGoodsPrice();
         this.goodsClassify = plan.getGoodsClassify();
-        this.planCreateTime = plan.getPlanCreateTime();
+        //this.planCreateTime = plan.getPlanCreateTime();
         this.planStartTime = plan.getPlanStartTime();
         this.planEndTime = plan.getPlanEndTime();
     }

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

@@ -32,7 +32,7 @@ public class PlanListVo {
         this.principalName = plan.getPrincipalName();
         this.principalTelephone = plan.getPrincipalTelephone();
         this.goodsImg = plan.getGoodsImg();
-        this.planCreateTime = plan.getPlanCreateTime();
+        //this.planCreateTime = plan.getPlanCreateTime();
         this.onState = OnStateUtil.getOnStateChar(plan.getOnState());
     }
 }

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

@@ -42,7 +42,7 @@ public class PlanManageListVo {
         this.goodsImg = plan.getGoodsImg();
         this.goodsName = plan.getGoodsName();
         this.goodsPrice = plan.getGoodsPrice();
-        this.planCreateTime = plan.getPlanCreateTime();
+        //this.planCreateTime = plan.getPlanCreateTime();
         this.planStartTime = plan.getPlanStartTime();
         this.planEndTime = plan.getPlanEndTime();
         this.state = StateUtil.getStateName(plan.getState());

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

@@ -41,7 +41,7 @@ public class PlanPushListVo {
         this.goodsLogo = plan.getGoodsLogo();
         this.principalName = plan.getPrincipalName();
         this.principalTelephone = plan.getPrincipalTelephone();
-        this.planCreateTime = plan.getPlanCreateTime();
+        //this.planCreateTime = plan.getPlanCreateTime();
         this.planStartTime = plan.getPlanStartTime();
         this.planEndTime = plan.getPlanEndTime();
         this.state = StateUtil.getStateName(plan.getState());

ruoyi-job/src/main/java/com/ruoyi/job/entity/PlanPushStatistics.java

@@ -1,44 +0,0 @@
-package com.ruoyi.job.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-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;
-
-@Data
-@TableName("dl_plan_push_statistics")
-public class PlanPushStatistics {
-    @TableId(value = "statistics_id",type = IdType.ASSIGN_ID)
-    private String statisticsId;
-    @TableField("equipment_id")
-    private String equipmentId;
-    @TableField("equipment_name")
-    private String equipmentName;
-    @TableField("equipment_code")
-    private String equipmentCode;
-    @TableField("carousel_count")
-    private Integer carouselCount;
-    @TableField("scan_code_count")
-    private Integer scanCodeCount;
-
-    @TableField("trade_count")
-    private Integer tradeCount;
-
-    @TableField("total_user_count")
-    private Integer totalUserCount;
-    @TableField("total_price")
-    private Float totalPrice;
-    @TableField("laster_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime lasterTime;
-}

ruoyi-job/src/main/java/com/ruoyi/job/service/PlanPushStatisticsService.java

@@ -1,16 +0,0 @@
-package com.ruoyi.job.service;
-
-import com.xxl.job.core.context.XxlJobHelper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service
-public class PlanPushStatisticsService {
-
-    public void updatePushStatistics() throws Exception {
-        XxlJobHelper.log("广告投放统计开始");
-        
-
-    }
-}