Merge remote-tracking branch 'origin/test' into test

sql/Online.sql

@@ -5,12 +5,14 @@ alter table ins_area_company
 alter table ins_area_company
     add sy_claims tinyint null comment '商业出险次数', ALGORITHM=INSTANT;
 
-# 2024-05-15 hy
+# 2024-05-16 hy
 DROP TABLE IF EXISTS `sys_user_is_dial`;
 CREATE TABLE `sys_user_is_dial`  (
                                      `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
                                      `user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户id',
                                      `is_dial` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否有拨打电话权限',
+                                     `dial_username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '拨号权限账号',
+                                     `dial_password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '拨号权限密码',
                                      `create_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建用户',
                                      `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
                                      PRIMARY KEY (`id`) USING BTREE

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -144,15 +144,23 @@ public class SysUserController extends BaseController {
     }
 
     /**
-     * 配置用户角色
+     * 保存用户角色信息
      *
-     * @param userId
-     * @param roleId
-     * @return
+     * @param sysUserRoleVo 用户角色信息对象，包括用户ID、角色ID、展示级别、是否允许拨号、拨号用户名和密码
+     * @return 返回操作结果，成功返回ok
      */
     @PostMapping(value = "/saveUserRole")
     @Transactional
-    public HttpResult saveUserRole(@RequestParam String userId, @RequestParam String roleId, @RequestParam String showLevel, @RequestParam String isDial) {
+    @ApiOperation(value = "保存用户角色信息")
+    public HttpResult saveUserRole(@RequestBody SysUserRoleVo sysUserRoleVo) {
+        String userId = sysUserRoleVo.getUserId();
+        String roleId = sysUserRoleVo.getRoleId();
+        String showLevel = sysUserRoleVo.getShowLevel();
+        String isDial = sysUserRoleVo.getIsDial();
+        String dialUserName = sysUserRoleVo.getDialUserName();
+        String dialPassWord = sysUserRoleVo.getDialPassWord();
+
+        //添加用户角色
         SysUserRole userRole = new SysUserRole();
         sysUserRoleService.deleteByUserId(userId);
         String userName = getUserName();
@@ -162,24 +170,27 @@ public class SysUserController extends BaseController {
         userRole.setCreateBy(userName);
         userRole.setCreateTime(new Date());
         sysUserRoleService.save(userRole);
-        if (!"".equals(showLevel)) {
-            sysUserTreeShowLevelService.remove(new LambdaQueryWrapper<SysUserTreeShowLevel>().eq(SysUserTreeShowLevel::getUserId, userId));
-            SysUserTreeShowLevel sysUserTreeShowLevel = new SysUserTreeShowLevel();
-            sysUserTreeShowLevel.setUserId(userId);
-            sysUserTreeShowLevel.setShowLevel(showLevel);
-            sysUserTreeShowLevel.setCreateName(userName);
-            sysUserTreeShowLevel.setCreateTime(new Date());
-            sysUserTreeShowLevelService.save(sysUserTreeShowLevel);
-        }
-        if (!"".equals(isDial)) {
-            sysUserIsDialService.remove(new LambdaQueryWrapper<SysUserIsDial>().eq(SysUserIsDial::getUserId, userId));
-            SysUserIsDial sysUserIsDial = new SysUserIsDial();
-            sysUserIsDial.setUserId(userId);
-            sysUserIsDial.setIsDial(isDial);
-            sysUserIsDial.setCreateName(userName);
-            sysUserIsDial.setCreateTime(new Date());
-            sysUserIsDialService.save(sysUserIsDial);
-        }
+
+        //添加树权限
+        sysUserTreeShowLevelService.remove(new LambdaQueryWrapper<SysUserTreeShowLevel>().eq(SysUserTreeShowLevel::getUserId, userId));
+        SysUserTreeShowLevel sysUserTreeShowLevel = new SysUserTreeShowLevel();
+        sysUserTreeShowLevel.setUserId(userId);
+        sysUserTreeShowLevel.setShowLevel(showLevel);
+        sysUserTreeShowLevel.setCreateName(userName);
+        sysUserTreeShowLevel.setCreateTime(new Date());
+        sysUserTreeShowLevelService.save(sysUserTreeShowLevel);
+
+        //添加拨号权限
+        sysUserIsDialService.remove(new LambdaQueryWrapper<SysUserIsDial>().eq(SysUserIsDial::getUserId, userId));
+        SysUserIsDial sysUserIsDial = new SysUserIsDial();
+        sysUserIsDial.setUserId(userId);
+        sysUserIsDial.setDialUserName(dialUserName);
+        sysUserIsDial.setDialPassWord(dialPassWord);
+        sysUserIsDial.setIsDial(isDial);
+        sysUserIsDial.setCreateName(userName);
+        sysUserIsDial.setCreateTime(new Date());
+        sysUserIsDialService.save(sysUserIsDial);
+
         return HttpResult.ok();
     }
 
@@ -672,9 +683,9 @@ public class SysUserController extends BaseController {
                     throw new SystemException("团队长、代理人、出单员只能归属团队中");
                 }
                 //如果为团队长，判断是否已经存在团队长，存在不允许添加   add by  hxl  2024-05-07  ============begin
-                if(RoleConstants.R21.getCode().equals(sysUser.getRoleId())){
-                    int count= sysUserService.getCountByDeptAndRoleId(sysUser);
-                    if(count>0){
+                if (RoleConstants.R21.getCode().equals(sysUser.getRoleId())) {
+                    int count = sysUserService.getCountByDeptAndRoleId(sysUser);
+                    if (count > 0) {
                         throw new SystemException("该机构已存在团队长，不允许再添加！！");
                     }
                 }
@@ -773,36 +784,37 @@ public class SysUserController extends BaseController {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/16 16:16
-     *  @Description:  获取待客录入可选业务员列表   通过工号、姓名、手机号、身份证号
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/16 16:16
+     * @Description: 获取待客录入可选业务员列表   通过工号、姓名、手机号、身份证号
      */
     @ApiOperation(value = "获取待客录入可选业务员列表   通过工号、姓名、手机号、身份证号")
     @PostMapping(value = "/getAllUsersByHospitality")
     public HttpResult getAllUsersByHospitality(@RequestBody SysUserVOExt sysUserVOExt) {
-        try{
+        try {
             List<SysUserBaseVO> userList = sysUserService.getAllUsersByHospitality(sysUserVOExt);
             return HttpResult.ok(userList);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
 
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/18 16:12
-     *  @Description: 查询客服人员列表数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/18 16:12
+     * @Description: 查询客服人员列表数据
      */
     @ApiOperation(value = "获取客服人员列表数据")
     @PostMapping(value = "/getCustomerUsers")
     public HttpResult getCustomerUsers() {
-        try{
+        try {
             List<SysUserBaseVO> userList = sysUserService.getCustomerUsers();
             return HttpResult.ok(userList);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
 
     }

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -167,13 +167,21 @@ public class SysUser extends BaseEntity {
     private String referrerName;
 
     @TableField(exist = false)
-    @Excel(name = "树权限等级")
+    @ApiModelProperty(value = "树权限等级")
     private String showLevel;
 
     @TableField(exist = false)
-    @Excel(name = "是否拥有拨号权限")
+    @ApiModelProperty(value = "是否拥有拨号权限")
     private String isDial;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "拨号权限账号")
+    private String dialUserName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "拨号权限密码")
+    private String dialPassWord;
+
     @TableField(exist = false)
     @ApiModelProperty("机构来源")
     private String managementSource;

src/main/java/com/ydtech/modules/admin/model/po/SysUserIsDial.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -29,6 +30,14 @@ public class SysUserIsDial {
     @TableField(value = "user_id")
     private String userId;
 
+    @TableField(value = "dial_username")
+    @ApiModelProperty(value = "拨号权限账号")
+    private String dialUserName;
+
+    @TableField(value = "dial_password")
+    @ApiModelProperty(value = "拨号权限密码")
+    private String dialPassWord;
+
     /**
      * 是否开启拨号
      */

src/main/java/com/ydtech/modules/admin/model/vo/SysUserRoleVo.java

@@ -0,0 +1,30 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class SysUserRoleVo {
+
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "角色ID")
+    private String roleId;
+
+    @ApiModelProperty(value = "树权限")
+    private String showLevel;
+
+    @ApiModelProperty(value = "是否开启拨号权限")
+    private String isDial;
+
+    @ApiModelProperty(value = "拨号权限账号")
+    private String dialUserName;
+
+    @ApiModelProperty(value = "拨号权限密码")
+    private String dialPassWord;
+
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -347,6 +347,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 for (SysUserIsDial isDial : isDialList) {
                     if (record.getId().equals(isDial.getUserId())) {
                         record.setIsDial(isDial.getIsDial());
+                        record.setDialUserName(isDial.getDialUserName());
+                        record.setDialPassWord(isDial.getDialPassWord());
                     }
                 }
             }

src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.modules.protocols.entity.vo.AgreementProductCostsSave;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -448,4 +449,12 @@ public class OrderVo implements Serializable {
     @TableField(exist = false)
     private String isDial;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "拨号权限账号")
+    private String dialUserName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "拨号权限密码")
+    private String dialPassWord;
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -949,6 +949,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             orderAndAreaCompany.setIsDial("0");
         }else {
             orderAndAreaCompany.setIsDial(userIsDial.getIsDial());
+            orderAndAreaCompany.setDialUserName(userIsDial.getDialUserName());
+            orderAndAreaCompany.setDialPassWord(userIsDial.getDialPassWord());
         }
         return HttpResult.ok("success", orderAndAreaCompany);
     }