ai

代理人级别选择

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<SysDept> 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<SysDept> depts = iSysDeptService.selectDeptList(sysDept);
+//        return success(depts);
+//    }
+
     /**
      * 删除代理管理
      */

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;

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 失败原因判断 是否继续循环

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());

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'
+  })
+}

ruoyi-ui/src/views/agent/list/index.vue

@@ -118,14 +118,27 @@
           <el-input v-model="form.agentName" placeholder="请输入代理人姓名" />
         </el-form-item>
         <el-form-item label="密码" prop="superiorAgentCode">
-          <el-input v-model="form.password" placeholder="请输入密码" />
+          <el-input type="password" v-model="form.password" placeholder="请输入密码" />
         </el-form-item>
         <el-form-item label="确认密码" prop="superiorAgentAccount">
-          <el-input v-model="form.confirmPassword" placeholder="请输入确认密码" />
+          <el-input type="password" v-model="form.confirmPassword" placeholder="请输入确认密码" />
+        </el-form-item>
+        <el-form-item label="代理级别" prop="deptId">
+          <el-select
+              v-model="form.deptId"
+              placeholder="请选择代理级别"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in deptList"
+                :key="dict.id"
+                :label="dict.deptName+' ：'+dict.deptId"
+                :value="dict.id"
+              />
+            </el-select>
         </el-form-item>
-<!--        <el-form-item label="角色" prop="grantStoreNum">-->
-<!--          <el-input v-model="form.role" placeholder="请输入角色" />-->
-<!--        </el-form-item>-->
         <el-form-item label="手机号" prop="operateStoreNum">
           <el-input v-model="form.phoneNumber" placeholder="请输入手机号" />
         </el-form-item>
@@ -155,7 +168,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/agent/info";
+import { listInfo, getInfo, delInfo, addInfo, updateInfo,deptList } from "@/api/agent/info";
 
 export default {
   name: "Info",
@@ -175,6 +188,7 @@ export default {
       total: 0,
       // 代理管理表格数据
       infoList: [],
+      deptList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -197,6 +211,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getdeptList();
   },
   methods: {
     /** 查询代理管理列表 */
@@ -250,6 +265,11 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    getdeptList() {
+      deptList().then(response => {
+        this.deptList = response.data;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();