完善其他实体类和其vo、bo

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/PlanController.java

@@ -42,38 +42,43 @@ public class PlanController {
         return R.ok("选择删除" + total + "个，成功删除" + i + "个");
     }
 
-    @PutMapping()
-    public R checkPlan(PlanBo bo){
-        // 获取用户id和用户名
-        String userId = "1";
-        String planId = bo.getPlanId();
-        Integer state = bo.getState();
-        String auditComment = bo.getAuditComment();
-        int i = planService.checkPlan(planId, state, auditComment,userId);
-        if (i == 1)
-            return R.ok("审核操作成功");
-        if (i == -1)
-            return R.fail("该计划不存在");
-        return R.fail("审核操作失败");
-    }
-
+    // 广告管理
+    // 查询广告计划列表
     @GetMapping("/list")
     public R planList(PlanBo bo){
         List<PlanListVo> vos = planService.getPlanList(bo);
         return R.ok(vos);
     }
-
+    // 查询广告计划明细
     @GetMapping("/{planId}")
     public R planDetail(@PathVariable String planId){
         PlanDetailVo vo = planService.getPlanDetail(planId);
         return R.ok(vo);
     }
-
+    // 投放广告计划
+    // 已废弃
     @GetMapping("/push")
     public R planPush(){
         return R.ok(planService.getPlanPush());
     }
 
+    // 广告计划管理
+    // 审核广告计划
+    @PutMapping("/audit")
+    public R checkPlan(PlanBo bo){
+        // 获取用户id和用户名
+        String userId = "1";
+        String planId = bo.getPlanId();
+        Integer state = bo.getState();
+        String auditComment = bo.getAuditComment();
+        int i = planService.checkPlan(planId, state, auditComment,userId);
+        if (i == 1)
+            return R.ok("审核操作成功");
+        if (i == -1)
+            return R.fail("该计划不存在");
+        return R.fail("审核操作失败");
+    }
+    // 下拉框——获取审核状态
     @GetMapping("/getState")
     public R getState(){
         List<StateVo> vos = new ArrayList<>();

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

@@ -26,6 +26,10 @@ public class PlanPushStatistics {
     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")

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

@@ -0,0 +1,15 @@
+package com.ruoyi.demo.entity.bo;
+
+import lombok.Data;
+
+@Data
+public class GoodsAddBo {
+    private String appkey;
+    private String goodsId;
+    private String goodsImg;
+    private String goodsName;
+    private String goodsLogo;
+    private String goodsIntroduce;
+    private Float goodsPrice;
+    private String goodsClassify;
+}

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

@@ -6,5 +6,7 @@ import java.util.List;
 
 @Data
 public class GoodsDeleteBo {
-    private List<GoodsBo> deleteItems;
+//    private List<GoodsBo> deleteItems;
+    private String appkey;
+    private String goodsId;
 }

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

@@ -5,7 +5,6 @@ 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.PlanItem;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -13,6 +12,8 @@ import java.util.List;
 
 @Data
 public class PlanAddBo {
+    private String planName;
+
     private String appkey;
     private String commercialId;
     private String goodsId;
@@ -22,6 +23,10 @@ public class PlanAddBo {
     private String goodsIntroduce;
     private Float goodsPrice;
     private String goodsClassify;
+
+    private String principalName;
+    private String principalTelephone;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
@@ -34,6 +39,6 @@ public class PlanAddBo {
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime planEndTime;
-    private List<PlanItem> items;
+    private List<PlanItemAddBo> items;
     private String sign;
 }

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

@@ -1,16 +1,33 @@
 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.time.LocalDateTime;
 import java.util.List;
 
 @Data
 public class PlanBo {
+    int pageNum = 1;
+    int pageSize = 10;
     private Integer state;
+    private String text;
     private String appkey;
     private String appName;
     private String goods;
     private String planId;
     private List<String> planIds;
     private String auditComment;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime endTime;
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.demo.entity.bo;
+
+import lombok.Data;
+
+@Data
+public class PlanItemAddBo {
+    private String storeId;
+    private String equipmentId;
+    private String equipmentName;
+    private String addrInfo;
+    private String addrCode;
+    private String addrCodeInfo;
+    private String qrCode;
+}

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

@@ -5,22 +5,31 @@ import lombok.Data;
 
 import java.util.List;
 
+// 广告计划明细
 @Data
 public class PlanDetailVo {
-    private String goodsName;
-    private String goodsImg;
+//    private String goodsName;
+//    private String goodsImg;
     private String goodsLogo;
-    private String goodsIntroduce;
-    private String goodsClassify;
+//    private String goodsIntroduce;
+//    private String goodsClassify;
+    private String appkey;
+    private String appName;
+    private String commercialId;
+    private String commercialName;
     private List<PlanItemVo> planItems;
 
     public PlanDetailVo(){}
     public PlanDetailVo(Plan plan, List<PlanItemVo> itemVos){
-        this.goodsName = plan.getGoodsName();
-        this.goodsImg = plan.getGoodsImg();
+//        this.goodsName = plan.getGoodsName();
+//        this.goodsImg = plan.getGoodsImg();
         this.goodsLogo = plan.getGoodsLogo();
-        this.goodsIntroduce = plan.getGoodsIntroduce();
-        this.goodsClassify = plan.getGoodsClassify();
+//        this.goodsIntroduce = plan.getGoodsIntroduce();
+//        this.goodsClassify = plan.getGoodsClassify();
+        this.appkey = plan.getAppkey();
+        this.appName = plan.getAppName();
+        this.commercialId = plan.getCommercialId();
+        this.commercialName = plan.getCommercialName();
         this.planItems = itemVos;
     }
 }

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

@@ -10,7 +10,7 @@ public class PlanItemVo {
     private String addrInfo;
     private String addrCode;
     private String addrCodeInfo;
-    private String qrCode;
+//    private String qrCode;
 
     public PlanItemVo(){}
     public PlanItemVo(PlanItem item){
@@ -19,6 +19,6 @@ public class PlanItemVo {
         this.addrInfo = item.getAddrInfo();
         this.addrCode = item.getAddrCode();
         this.addrCodeInfo = item.getAddrCodeInfo();
-        this.qrCode = item.getQrCode();
+//        this.qrCode = item.getQrCode();
     }
 }

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

@@ -6,50 +6,36 @@ 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.Plan;
-import com.ruoyi.demo.utils.StateUtil;
+import com.ruoyi.demo.utils.OnStateUtil;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
+// 广告计划列表
 @Data
 public class PlanListVo {
     private String planId;
-    private String commercialId;
-    private String commercialName;
-    private String appkey;
-    private String appName;
+    private String planName;
+    private String principalName;
+    private String principalTelephone;
     private String goodsId;
     private String goodsImg;
     private String goodsName;
-    private Float goodsPrice;
     @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 LocalDateTime planStartTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planEndTime;
-    private String state;
+    private String onState;
 
     public PlanListVo(){}
     public PlanListVo(Plan plan){
         this.planId = plan.getPlanId();
-        this.commercialId = plan.getCommercialId();
-        this.commercialName = plan.getCommercialName();
-        this.appkey = plan.getAppkey();
-        this.appName = plan.getAppName();
+        this.principalName = plan.getPrincipalName();
+        this.principalTelephone = plan.getPrincipalTelephone();
         this.goodsId = plan.getGoodsId();
         this.goodsImg = plan.getGoodsImg();
         this.goodsName = plan.getGoodsName();
-        this.goodsPrice = plan.getGoodsPrice();
         this.planCreateTime = plan.getPlanCreateTime();
-        this.planStartTime = plan.getPlanStartTime();
-        this.planEndTime = plan.getPlanEndTime();
-        this.state = StateUtil.getStateName(plan.getState());
+        this.onState = OnStateUtil.getOnStateChar(plan.getOnState());
     }
 }

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

@@ -0,0 +1,22 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.ruoyi.demo.entity.Plan;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlanManageDetailVo {
+    private String goodsLogo;
+    private String goodsIntroduce;
+    private String goodsClassify;
+    private List<PlanManageItemVo> planItems;
+
+    public PlanManageDetailVo(){}
+    public PlanManageDetailVo(Plan plan, List<PlanManageItemVo> itemVos){
+        this.goodsLogo = plan.getGoodsLogo();
+        this.goodsIntroduce = plan.getGoodsIntroduce();
+        this.goodsClassify = plan.getGoodsClassify();
+        this.planItems = itemVos;
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.ruoyi.demo.entity.PlanItem;
+import lombok.Data;
+
+@Data
+public class PlanManageItemVo {
+    private String equipmentId;
+    private String equipmentName;
+    private String addrInfo;
+    private String addrCode;
+    private String addrCodeInfo;
+    private String storeId;
+    private String storeName;
+
+    public PlanManageItemVo(){}
+    public PlanManageItemVo(PlanItem item){
+        this.equipmentId = item.getEquipmentId();
+        this.equipmentName = item.getEquipmentName();
+        this.addrInfo = item.getAddrInfo();
+        this.addrCode = item.getAddrCode();
+        this.addrCodeInfo = item.getAddrCodeInfo();
+        this.storeId = item.getStoreId();
+        // 查找其对应的storeName
+    }
+}

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

@@ -0,0 +1,56 @@
+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 com.ruoyi.demo.entity.Plan;
+import com.ruoyi.demo.utils.StateUtil;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PlanManageListVo {
+    private String planId;
+    private String commercialId;
+    private String commercialName;
+    private String appkey;
+    private String appName;
+    private String goodsId;
+    private String goodsImg;
+    private String goodsName;
+    private Float goodsPrice;
+    @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 LocalDateTime planStartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime planEndTime;
+    private String state;
+    private Integer equipmentCount;
+
+    public PlanManageListVo(){}
+    public PlanManageListVo(Plan plan){
+        this.planId = plan.getPlanId();
+        this.commercialId = plan.getCommercialId();
+        this.commercialName = plan.getCommercialName();
+        this.appkey = plan.getAppkey();
+        this.appName = plan.getAppName();
+        this.goodsId = plan.getGoodsId();
+        this.goodsImg = plan.getGoodsImg();
+        this.goodsName = plan.getGoodsName();
+        this.goodsPrice = plan.getGoodsPrice();
+        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

@@ -0,0 +1,41 @@
+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 com.ruoyi.demo.entity.PlanPushStatistics;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PlanPushListVo {
+    private String statisticsId;
+    private String equipmentId;
+    private String equipmentName;
+    private Integer carouselCount;
+    private Integer scanCodeCount;
+    private String ratio;
+    private Integer totalUserCount;
+    private Float totalPrice;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime lasterTime;
+
+    public PlanPushListVo(){}
+    public PlanPushListVo(PlanPushStatistics statistics){
+        this.statisticsId = statistics.getStatisticsId();
+        this.equipmentId = statistics.getEquipmentId();
+        this.equipmentName = statistics.getEquipmentName();
+        this.carouselCount = statistics.getCarouselCount();
+        this.scanCodeCount = statistics.getScanCodeCount();
+        float r = (float) statistics.getTradeCount()/statistics.getCarouselCount();
+        this.ratio = ((int)(r*100)+"%");
+        this.totalUserCount = statistics.getTotalUserCount();
+        this.totalPrice = statistics.getTotalPrice();
+        this.lasterTime = statistics.getLasterTime();
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/OnStateUtil.java

@@ -0,0 +1,19 @@
+package com.ruoyi.demo.utils;
+
+public class OnStateUtil {
+    // 上架
+    public static int UP = 0;
+    public static String UP_CHAR = "上架";
+
+    // 下架
+    public static int DOWN = 1;
+    public static String DOWN_CHAR = "下架";
+
+    public static String getOnStateChar(int onState){
+        if (onState == UP)
+            return UP_CHAR;
+        if (onState == DOWN)
+            return DOWN_CHAR;
+        return null;
+    }
+}