From 34ec07daa7f0c071900391d88e350b6eabc971aa Mon Sep 17 00:00:00 2001 From: wangshuai Date: Fri, 12 Jul 2024 15:01:26 +0800 Subject: [PATCH] =?UTF-8?q?ai=20=E4=BB=A3=E7=90=86=E4=BA=BA=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusAgentInfoController.java | 34 + .../ruoyi/business/domain/BusAgentInfo.java | 9 + .../business/service/impl/AiServiceImpl.java | 3 + .../service/impl/BusAgentInfoServiceImpl.java | 2 +- ruoyi-ui/src/api/agent/info.js | 9 + ruoyi-ui/src/views/agent/list/index.vue | 32 +- ruoyi-ui/src/views/market/brand/index.vue | 897 +++++++++--------- 7 files changed, 545 insertions(+), 441 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java index 6136328..20b2649 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java @@ -7,16 +7,23 @@ import com.ruoyi.business.service.IBusStoreInfoService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysLogininforService; +import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -35,6 +42,7 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2024-07-03 */ +@Api(tags = "代理人") @RestController @RequestMapping("/system/info") public class BusAgentInfoController extends BaseController { @@ -46,6 +54,8 @@ public class BusAgentInfoController extends BaseController { private ISysUserService iSysUserService; @Autowired private ISysLogininforService iSysLogininforService; + @Autowired + private ISysDeptService iSysDeptService; /** * 查询代理管理列表 @@ -144,6 +154,30 @@ public class BusAgentInfoController extends BaseController { throw new ServiceException("账分余额不足!请联系管理员充值。"); } + @ApiOperation("部门") + @GetMapping("/deptList") + public AjaxResult deptList() { + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysDept sysDept = new SysDept(); + sysDept.setParentId(loginUser.getDeptId()); + sysDept.setStatus("0"); + sysDept.setDelFlag("0"); + List depts = iSysDeptService.selectDeptList(sysDept); + return success(depts); + } + +// @ApiOperation("部门") +// @GetMapping("/deptList") +// public AjaxResult getLoginUser() { +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// SysDept sysDept = new SysDept(); +// sysDept.setParentId(loginUser.getDeptId()); +// sysDept.setStatus("0"); +// sysDept.setDelFlag("0"); +// List depts = iSysDeptService.selectDeptList(sysDept); +// return success(depts); +// } + /** * 删除代理管理 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java index f91c07b..93164f1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java @@ -118,6 +118,15 @@ public class BusAgentInfo extends BaseEntity private String confirmPassword; private String phoneNumber; private int aiRealTimeNum; + private Long deptId; + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } public int getAiRealTimeNum() { return aiRealTimeNum; diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index 78f614e..b08aefd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -145,6 +145,8 @@ public class AiServiceImpl implements IAiService { fifteenInfoService.insertBusFifteenInfo(fifteenInfo); } else if ("20005".equals(jo.getString("code")) || "20006".equals(jo.getString("code"))) { + System.out.println("建立任务接口返回错误: " + jo.toString()); + redisTemplate.delete("apiKey"); sendAiTask(content, busOrderInfo); } else { // TODO: 2024/7/10 失败原因判断 是否继续循环 @@ -383,6 +385,7 @@ public class AiServiceImpl implements IAiService { fifteenInfoService.insertBusFifteenInfo(fifteenInfo); } else if ("20005".equals(jo.getString("code")) || "20006".equals(jo.getString("code"))) { + redisTemplate.delete("apiKey"); sendAiTask(content, busOrderInfo); } else { // TODO: 2024/7/10 失败原因判断 是否继续循环 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java index 508f22d..e68e85a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java @@ -124,7 +124,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService String pwd = SecurityUtils.encryptPassword(busAgentInfo.getPassword()); user.setPassword(pwd); user.setPhonenumber(busAgentInfo.getPhoneNumber()); - SysDept dept = deptService.selectDeptIdById(loginUser.getDeptId()); + SysDept dept = deptService.selectDeptById(busAgentInfo.getDeptId()); user.setDeptId(dept.getDeptId()); user.setDept(dept); busAgentInfo.setSuperiorAgentCode(loginUser.getUserId()); diff --git a/ruoyi-ui/src/api/agent/info.js b/ruoyi-ui/src/api/agent/info.js index 4041c92..240d84f 100644 --- a/ruoyi-ui/src/api/agent/info.js +++ b/ruoyi-ui/src/api/agent/info.js @@ -42,3 +42,12 @@ export function delInfo(id) { method: 'delete' }) } + + +// 查询代理管理列表 +export function deptList() { + return request({ + url: '/system/info/deptList', + method: 'get' + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue index 8bcfc32..39f9fef 100644 --- a/ruoyi-ui/src/views/agent/list/index.vue +++ b/ruoyi-ui/src/views/agent/list/index.vue @@ -118,14 +118,27 @@ - + - + + + + + + - - - @@ -155,7 +168,7 @@