完成用户管理、添加行为时自动添加用户并更新用户数据、审核成功后执行回调地址、投放广告接口测试

ruoyi-demo/pom.xml

@@ -34,6 +34,10 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.4.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -3,12 +3,14 @@ package com.ruoyi.demo.controller;
 import cn.dev33.satoken.stp.StpUtil;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.demo.entity.bo.CallBackBean;
 import com.ruoyi.demo.entity.bo.PlanAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.vo.*;
 import com.ruoyi.demo.service.PlanService;
 import com.ruoyi.demo.utils.StateUtil;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,6 +22,8 @@ import java.util.List;
 public class PlanController {
     @Autowired
     PlanService planService;
+    @Autowired
+    ISysUserService sysUserService;
 
     // 广告管理
     // 上下架广告计划
@@ -58,7 +62,8 @@ public class PlanController {
         String loginId = String.valueOf(StpUtil.getLoginId());
         String numericPart = loginId.split(":")[1];
         Long userId = Long.valueOf(numericPart);
-        int i = planService.checkPlan(bo,userId);
+        SysUser sysUser = sysUserService.selectUserById(userId);
+        int i = planService.checkPlan(bo,userId,sysUser.getNickName());
         if (i == 1)
             return R.ok("审核操作成功");
         if (i == -1)

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/SysUserMapper.java

@@ -1,9 +0,0 @@
-package com.ruoyi.demo.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SysUserMapper extends BaseMapper<SysUser> {
-}

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

@@ -14,7 +14,7 @@ public interface PlanService {
     int addPlan(PlanAddBo bo);
     int deletePlan(String id);
     int deletePlans(List<String> ids);
-    int checkPlan(PlanBo bo,Long userId);
+    int checkPlan(PlanBo bo,Long userId,String userName);
     PageInfo<List<PlanListVo>> getPlanList(PlanBo bo);
     PlanDetailVo getPlanDetail(String planId);
     List<PlanPushVo> getPlanPush(String equipmentId);

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

@@ -49,8 +49,8 @@ public class PlanServiceImpl implements PlanService {
     EquipmentMapper equipmentMapper;
     @Autowired
     GoodsMapper goodsMapper;
-    @Autowired
-    SysUserMapper sysUserMapper;
+//    @Autowired
+//    SysUserMapper sysUserMapper;
 
     @Override
     public int addPlan(PlanAddBo bo) {
@@ -117,7 +117,7 @@ public class PlanServiceImpl implements PlanService {
     }
 
     @Override
-    public int checkPlan(PlanBo bo,Long userId) {
+    public int checkPlan(PlanBo bo,Long userId,String userName) {
         QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
         planQueryWrapper.eq("plan_id",bo.getPlanId());
         planQueryWrapper.eq("deleted","0");
@@ -131,12 +131,12 @@ public class PlanServiceImpl implements PlanService {
         int i = planMapper.updateById(plan);
         if (i == 0)
             return 0;
-        SysUser sysUser = sysUserMapper.selectById(userId);
-        PlanAudit audit = new PlanAudit(bo,userId.toString(),sysUser.getNickName());
+//        SysUser sysUser = sysUserMapper.selectById(userId);
+        PlanAudit audit = new PlanAudit(bo,userId.toString(),userName);
         int insert = planAuditMapper.insert(audit);
         if (insert == 1){
             CallBackBean callBackBean = new CallBackBean();
-            callBackBean.setAuditPerson(sysUser.getNickName());
+            callBackBean.setAuditPerson(userName);
             callBackBean.setAuditComment(bo.getAuditComment());
             callBackBean.setAuditTime(LocalDateTime.now());
             SendCallBackUtil.sendCallBack(app.getCallBack(),callBackBean);
@@ -199,7 +199,8 @@ public class PlanServiceImpl implements PlanService {
             planQueryWrapper.eq("state",1);
             planQueryWrapper.eq("deleted","0");
             Plan plan = planMapper.selectOne(planQueryWrapper);
-            pushVos.add(new PlanPushVo(item,plan));
+            if (plan != null)
+                pushVos.add(new PlanPushVo(item,plan));
         }
         return pushVos;
     }