Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

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

@@ -0,0 +1,25 @@
+package com.ruoyi.demo.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.demo.entity.Exposure;
+import com.ruoyi.demo.service.ExposureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/exposure")
+public class ExposureController {
+    @Autowired
+    ExposureService exposureService;
+
+    @PostMapping()
+    public R add(@RequestBody Exposure bo){
+        int i = exposureService.add(bo);
+        if (i == 1)
+            return R.ok("添加成功");
+        return R.fail("添加失败");
+    }
+}

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

@@ -93,8 +93,6 @@ public class PlanController {
             return R.ok("广告添加成功");
         if (i == -1)
             return R.fail("无效的appkey");
-        if (i == -2)
-            return R.fail("无效商户");
         if (i == -3)
             return R.fail("校验sign出错");
         return R.fail("广告添加失败");

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

@@ -1,13 +1,11 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.demo.entity.Statistics;
 import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.service.StatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/statistics")
@@ -24,4 +22,12 @@ public class StatisticsController {
     public R scanTotal(){
         return R.ok(statisticsService.getScanTotal());
     }
+
+    @PostMapping()
+    public R add(@RequestBody Statistics bo){
+        int i = statisticsService.add(bo);
+        if (i == 1)
+            return R.ok("添加成功");
+        return R.fail("添加失败");
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.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;
@@ -15,6 +16,9 @@ import java.time.LocalDateTime;
 @Data
 @TableName("dl_exposure")
 public class Exposure {
+    @TableId(value = "exposure_id",type = IdType.ASSIGN_ID)
+    private String exposureId;
+
     @TableField("item_id")
     private String itemId;
     @TableField("exposure_count")

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

@@ -76,9 +76,9 @@ public class Plan {
     private int deleted;
 
     public Plan(){}
-    public Plan(Commercial commercial, App app, PlanAddBo bo){
-        this.setCommercialId(commercial.getCommercialId());
-        this.setCommercialName(commercial.getCommercialName());
+    public Plan(App app, PlanAddBo bo){
+        this.setCommercialId(app.getCommercialId());
+        this.setCommercialName(app.getCommercialName());
         this.setAppkey(app.getAppkey());
         this.setAppName(app.getAppName());
 
@@ -91,7 +91,7 @@ public class Plan {
         this.setGoodsPrice(bo.getGoodsPrice());
         this.setGoodsIntroduce(bo.getGoodsIntroduce());
         this.setGoodsClassify(bo.getGoodsClassify());
-        this.setPlanCreateTime(bo.getPlanCreateTime());
+        this.setPlanCreateTime(LocalDateTime.now());
         this.setPlanStartTime(bo.getPlanStartTime());
         this.setPlanEndTime(bo.getPlanEndTime());
         this.setState(StateUtil.NOT_AUDITED);

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

@@ -45,5 +45,6 @@ public class PlanItem {
         this.addrCode = bo.getAddrCode();
         this.addrCodeInfo = bo.getAddrCodeInfo();
         this.qrCode = bo.getQrCode();
+        this.sort = 0;
     }
 }

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

@@ -15,7 +15,6 @@ public class PlanAddBo {
     private String planName;
 
     private String appkey;
-    private String commercialId;
     private String goodsId;
     private String goodsImg;
     private String goodsName;
@@ -27,10 +26,6 @@ public class PlanAddBo {
     private String principalName;
     private String principalTelephone;
 
-    @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)

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

@@ -0,0 +1,7 @@
+package com.ruoyi.demo.service;
+
+import com.ruoyi.demo.entity.Exposure;
+
+public interface ExposureService {
+    int add(Exposure bo);
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.service;
 
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.Statistics;
 import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.vo.PlanHomeVo;
 import com.ruoyi.demo.entity.vo.ScanListVo;
@@ -10,4 +11,6 @@ import java.util.List;
 public interface StatisticsService {
     PageInfo<List<ScanListVo>> getScanList(PlanBo bo);
     PlanHomeVo getScanTotal();
+
+    int add(Statistics bo);
 }

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

@@ -0,0 +1,23 @@
+package com.ruoyi.demo.service.impl;
+
+import com.ruoyi.demo.entity.Exposure;
+import com.ruoyi.demo.mapper.ExposureMapper;
+import com.ruoyi.demo.service.ExposureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+@Service
+@Transactional
+public class ExposureServiceImpl implements ExposureService {
+    @Autowired
+    ExposureMapper exposureMapper;
+
+    @Override
+    public int add(Exposure bo) {
+        bo.setCreateTime(LocalDateTime.now());
+        return exposureMapper.insert(bo);
+    }
+}

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

@@ -54,14 +54,8 @@ public class PlanServiceImpl implements PlanService {
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;
-        QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
-        commercialQueryWrapper.eq("commercial_id",bo.getCommercialId());
-        Commercial commercial = commercialMapper.selectOne(commercialQueryWrapper);
-        if (commercial == null)
-            return -2;
         Map<String,Object> params = Dict.create()
             .set("appkey",bo.getAppkey())
-            .set("commercialId",bo.getCommercialId())
             .set("goodsId",bo.getGoodsId())
             .set("goodsImg",bo.getGoodsImg())
             .set("goodsName",bo.getGoodsName())
@@ -69,7 +63,6 @@ public class PlanServiceImpl implements PlanService {
             .set("goodsIntroduce",bo.getGoodsIntroduce())
             .set("goodsPrice",bo.getGoodsPrice())
             .set("goodsClassify",bo.getGoodsClassify())
-            .set("planCreateTime",bo.getPlanCreateTime())
             .set("planStartTime",bo.getPlanStartTime())
             .set("planEndTime",bo.getPlanEndTime())
             .set("items",bo.getItems())
@@ -77,7 +70,7 @@ public class PlanServiceImpl implements PlanService {
         if (!SignUtil.verify(params,app.getAppSecret()))
             return -3;
         // 插入广告计划
-        Plan plan = new Plan(commercial,app,bo);
+        Plan plan = new Plan(app,bo);
         planMapper.insert(plan);
         // 插入广告计划明细
         for (PlanItemAddBo itemAddBo : bo.getItems()) {

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

@@ -46,4 +46,9 @@ public class StatisticsServiceImpl implements StatisticsService {
         vo.setTime(LocalDateTime.now());
         return vo;
     }
+
+    @Override
+    public int add(Statistics bo) {
+        return statisticsMapper.insert(bo);
+    }
 }