添加equipmentCode字段：

1.查询广告计划明细
2.投放广告计划
3.查询广告计划管理明细
4.广告投放列表
5.添加行为记录
6.获取扫描日志

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

@@ -49,9 +49,9 @@ public class PlanController {
         return R.ok(vo);
     }
     // 投放广告计划
-    @GetMapping("/push/{equipmentId}")
-    public R planPush(@PathVariable String equipmentId){
-        return R.ok(planService.getPlanPush(equipmentId));
+    @GetMapping("/push/{equipmentCode}")
+    public R planPush(@PathVariable String equipmentCode){
+        return R.ok(planService.getPlanPushByCode(equipmentCode));
     }
 
     // 广告计划管理

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

@@ -13,16 +13,19 @@ public class StatisticsController {
     @Autowired
     StatisticsService statisticsService;
 
+    // 获取扫描日志
     @GetMapping("/scanList")
     public R scanList(@RequestBody PlanBo bo){
         return R.ok(statisticsService.getScanList(bo));
     }
 
+    // 获取总扫描次数
     @GetMapping("/total")
     public R scanTotal(){
         return R.ok(statisticsService.getScanTotal());
     }
 
+    // 添加行为记录
     @PostMapping()
     public R add(@RequestBody Statistics bo){
         int i = statisticsService.add(bo);

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

@@ -57,9 +57,11 @@ public class DlUser {
         this.userTelephone = s.getUserTelephone();
         this.startEquipmentId = s.getEquipmentId();
         this.startEquipmentName = s.getEquipmentName();
+        this.startEquipmentCode = s.getEquipmentCode();
         this.startTime = s.getTime();
         this.endEquipmentId = s.getEquipmentId();
         this.endEquipmentName = s.getEquipmentName();
+        this.endEquipmentCode = s.getEquipmentCode();
         this.endTime = s.getTime();
         this.totalPrice = s.getDealToolPrice();
     }

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

@@ -20,6 +20,8 @@ public class PlanItem {
     private String equipmentId;
     @TableField("equipment_name")
     private String equipmentName;
+    @TableField("equipment_code")
+    private String equipmentCode;
     @TableField("addr_info")
     private String addrInfo;
     @TableField("addr_code")
@@ -41,6 +43,7 @@ public class PlanItem {
         this.storeId = bo.getStoreId();
         this.equipmentId = bo.getEquipmentId();
         this.equipmentName = bo.getEquipmentName();
+        this.equipmentCode = bo.getEquipmentCode();
         this.addrInfo = bo.getAddrInfo();
         this.addrCode = bo.getAddrCode();
         this.addrCodeInfo = bo.getAddrCodeInfo();

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

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

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

@@ -30,7 +30,6 @@ public class Statistics {
     private String equipmentId;
     @TableField("equipment_name")
     private String equipmentName;
-
     @TableField("equipment_code")
     private String equipmentCode;
 

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

@@ -6,6 +6,7 @@ import lombok.Data;
 public class PlanItemAddBo {
     private String storeId;
     private String equipmentId;
+    private String equipmentCode;
     private String equipmentName;
     private String addrInfo;
     private String addrCode;

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

@@ -13,6 +13,7 @@ public class PlanItemVo {
     private String itemId;
     private String equipmentId;
     private String equipmentName;
+    private String equipmentCode;
     private String addrInfo;
     private String addrCode;
     private String addrCodeInfo;
@@ -24,6 +25,7 @@ public class PlanItemVo {
     public PlanItemVo(PlanItem item){
         this.equipmentId = item.getEquipmentId();
         this.equipmentName = item.getEquipmentName();
+        this.equipmentCode = item.getEquipmentCode();
         this.addrInfo = item.getAddrInfo();
         this.addrCode = item.getAddrCode();
         this.addrCodeInfo = item.getAddrCodeInfo();

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

@@ -7,6 +7,7 @@ import lombok.Data;
 public class PlanManageItemVo {
     private String equipmentId;
     private String equipmentName;
+    private String equipmentCode;
     private String addrInfo;
     private String addrCode;
     private String addrCodeInfo;
@@ -17,6 +18,7 @@ public class PlanManageItemVo {
     public PlanManageItemVo(PlanItem item){
         this.equipmentId = item.getEquipmentId();
         this.equipmentName = item.getEquipmentName();
+        this.equipmentCode = item.getEquipmentCode();
         this.addrInfo = item.getAddrInfo();
         this.addrCode = item.getAddrCode();
         this.addrCodeInfo = item.getAddrCodeInfo();

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

@@ -16,6 +16,7 @@ public class PlanPushStatisticsListVo {
     private String statisticsId;
     private String equipmentId;
     private String equipmentName;
+    private String equipmentCode;
     private Integer carouselCount;
     private Integer scanCodeCount;
     private String ratio;
@@ -31,6 +32,7 @@ public class PlanPushStatisticsListVo {
         this.statisticsId = statistics.getStatisticsId();
         this.equipmentId = statistics.getEquipmentId();
         this.equipmentName = statistics.getEquipmentName();
+        this.equipmentCode = statistics.getEquipmentCode();
         this.carouselCount = statistics.getCarouselCount();
         this.scanCodeCount = statistics.getScanCodeCount();
         float r = (float) statistics.getTradeCount()/statistics.getScanCodeCount();

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

@@ -16,6 +16,7 @@ public class ScanListVo {
     private String planName;
     private String equipmentId;
     private String equipmentName;
+    private String equipmentCode;
     private String addrInfo;
     private String userId;
     private String userName;
@@ -31,6 +32,7 @@ public class ScanListVo {
         this.planName = statistics.getPlanName();
         this.equipmentId = statistics.getEquipmentId();
         this.equipmentName = statistics.getEquipmentName();
+        this.equipmentCode = statistics.getEquipmentCode();
         this.addrInfo = statistics.getAddrInfo();
         this.userId = statistics.getUserId();
         this.userName = statistics.getUserName();

ruoyi-demo/src/main/java/com/ruoyi/demo/service/PlanService.java

@@ -18,6 +18,7 @@ public interface PlanService {
     PageInfo<List<PlanListVo>> getPlanList(PlanBo bo);
     PlanDetailVo getPlanDetail(String planId);
     List<PlanPushVo> getPlanPush(String equipmentId);
+    List<PlanPushVo> getPlanPushByCode(String equipmentCode);
 
     int planUpDown(String planId);
     PageInfo<List<PlanManageListVo>> getPlanManageList(PlanBo bo);

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

@@ -205,6 +205,27 @@ public class PlanServiceImpl implements PlanService {
         return pushVos;
     }
 
+    @Override
+    public List<PlanPushVo> getPlanPushByCode(String equipmentCode) {
+        List<PlanPushVo> pushVos = new ArrayList<>();
+        QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
+        itemQueryWrapper.eq("equipment_code",equipmentCode);
+        itemQueryWrapper.eq("deleted","0");
+        List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
+        for (PlanItem item : items){
+            QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
+            planQueryWrapper.apply("DATE_FORMAT(plan_start_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planQueryWrapper.apply("DATE_FORMAT(plan_end_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planQueryWrapper.eq("plan_id",item.getPlanId());
+            planQueryWrapper.eq("state",1);
+            planQueryWrapper.eq("deleted","0");
+            Plan plan = planMapper.selectOne(planQueryWrapper);
+            if (plan != null)
+                pushVos.add(new PlanPushVo(item,plan));
+        }
+        return pushVos;
+    }
+
     @Override
     public int planUpDown(String planId) {
         QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();

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

@@ -62,6 +62,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         else{
             user.setEndEquipmentId(bo.getEquipmentId());
             user.setEndEquipmentName(bo.getEquipmentName());
+            user.setEndEquipmentCode(bo.getEquipmentCode());
             user.setEndTime(bo.getTime());
             user.setTotalPrice(user.getTotalPrice() + bo.getDealToolPrice());
             dlUserMapper.update(user,userQueryWrapper);