更新

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -19,8 +19,8 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 自定义去除的路径
-        String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**",
-                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**","/tOrder/**","/tPromoCode/**","/api/**","/error"};
+        String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tJoinpayMchCheck/**",
+                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**","/sysRoleMenu/**","/tPromoCode/**","/api/**","/error"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

src/main/java/com/szwl/controller/SysRoleMenuController.java

@@ -3,6 +3,7 @@ package com.szwl.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.gexin.fastjson.JSON;
 import com.szwl.annotation.Audit;
@@ -52,7 +53,34 @@ public class SysRoleMenuController {
                 ).collect(Collectors.toList());
         return R.ok(list);
     }
-
+    @GetMapping("/pageRoleOption")
+    @ApiOperation("获取所有角色")
+    public ResponseModel<List<SysRole>> pageRoleOption(String adminId) {
+        if(org.apache.commons.lang.StringUtils.isEmpty(adminId)){
+            return R.fail(ResponseCodesEnum.A0100);
+        }
+        LambdaQueryWrapper<SysRole> query = Wrappers.lambdaQuery();
+        query.eq(SysRole::getAdminId,adminId);
+        List<SysRole> list = sysRoleService.list();
+        return R.ok(list);
+    }
+    @GetMapping("/deleteRoleOption")
+    @ApiOperation("删除角色")
+    public ResponseModel<?> deleteRoleOption(String roleId,String adminId) {
+        if(org.apache.commons.lang.StringUtils.isEmpty(roleId)){
+            return R.fail(ResponseCodesEnum.A0100);
+        }
+        LambdaQueryWrapper<SysRole> query = Wrappers.lambdaQuery();
+        query.eq(SysRole::getRoleId,roleId);
+        query.eq(SysRole::getAdminId,adminId);
+        List<SysRole> list = sysRoleService.list(query);
+        if(list.size()>0){
+            SysRole sysRole = list.get(0);
+            sysRoleService.removeById(sysRole.getRoleId());
+            return R.ok();
+        }
+        return R.fail(ResponseCodesEnum.A0100);
+    }
     @PostMapping("/addSysRole")
     @ApiOperation("新增角色及权限菜单")
     @Audit(type = AuditEnum.INSERT,content = "#loginUser.name + '新增角色及权限菜单'")

src/main/java/com/szwl/controller/TAdController.java

@@ -41,6 +41,17 @@ public class TAdController {
         LambdaQueryWrapper<TAd> query = Wrappers.lambdaQuery();
         Page<TAd> page = new Page<>(current, size, true);
         IPage<TAd> iPage = adService.page(page, query);
+        List<TAd> records = iPage.getRecords();
+        if(records.size()>0){
+            for(TAd ad:records){
+                if(StringUtils.isNotEmpty(ad.getAdminId())){
+                    TAdmin admin = adminService.getById(ad.getAdminId());
+                    if(admin!=null&&admin.getId()!=null){
+                        ad.setUsername(admin.getUsername());
+                    }
+                }
+            }
+        }
         return R.ok(iPage);
     }
     @GetMapping("/listAd")
@@ -55,9 +66,9 @@ public class TAdController {
         if(StringUtils.isEmpty(ad.getStatus())&&StringUtils.isEmpty(ad.getUrl())){
             return R.fail(ResponseCodesEnum.A0001);
         }
-        if(StringUtils.isNotEmpty(ad.getAdminId())){
+        if(StringUtils.isNotEmpty(ad.getUsername())){
             LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-            query.eq(TAdmin::getUsername,ad.getAdminId());
+            query.eq(TAdmin::getUsername,ad.getUsername());
             List<TAdmin> list = adminService.list(query);
             TAdmin tAdmin = list.get(0);
             ad.setAdminId(String.valueOf(tAdmin.getId()));
@@ -70,19 +81,44 @@ public class TAdController {
     @ApiOperation(value = "修改")
     @PostMapping("/update")
     public ResponseModel<?> update(@RequestBody TAd ad) {
-        if(StringUtils.isEmpty(ad.getStatus())&&StringUtils.isEmpty(ad.getUrl())){
+        if(StringUtils.isEmpty(ad.getUrl())){
             return R.fail(ResponseCodesEnum.A0001);
         }
-        if(StringUtils.isNotEmpty(ad.getAdminId())){
+
+        ad.setModifyDate(new Date());
+        TAd oldAd = adService.getById(ad.getId());
+        if(StringUtils.isNotEmpty(ad.getUrl())){
+            oldAd.setUrl(ad.getUrl());
+        }
+        if(StringUtils.isNotEmpty(ad.getName())){
+            oldAd.setName(ad.getName());
+        }
+        oldAd.setEquipmentType(ad.getEquipmentType());
+        if(StringUtils.isNotEmpty(ad.getStatus())){
+            oldAd.setStatus(ad.getStatus());
+        }
+        if(StringUtils.isNotEmpty(ad.getMediaPreview())){
+            oldAd.setMediaPreview(ad.getMediaPreview());
+        }
+        if(StringUtils.isNotEmpty(ad.getUsername())){
             LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-            query.eq(TAdmin::getUsername,ad.getAdminId());
+            query.eq(TAdmin::getUsername,ad.getUsername());
             List<TAdmin> list = adminService.list(query);
             TAdmin tAdmin = list.get(0);
-            ad.setAdminId(String.valueOf(tAdmin.getId()));
+            oldAd.setAdminId(String.valueOf(tAdmin.getId()));
+        }else {
+            oldAd.setAdminId(ad.getAdminId());
         }
-        ad.setModifyDate(new Date());
-        adService.updateById(ad);
-        return R.ok(ad);
+        oldAd.setAdType(ad.getAdType());
+        oldAd.setDuration(ad.getDuration());
+        oldAd.setOrders(ad.getOrders());
+        oldAd.setLocationType(ad.getLocationType());
+        oldAd.setPlays(ad.getPlays());
+        oldAd.setScreenType(ad.getScreenType());
+        oldAd.setTimeRule(ad.getTimeRule());
+        oldAd.setType(ad.getType());
+        adService.updateById(oldAd);
+        return R.ok();
     }
 
 }

src/main/java/com/szwl/controller/TAdminController.java

@@ -20,6 +20,8 @@ import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.bo.UserDetailBO;
 import com.szwl.model.entity.*;
 import com.szwl.model.param.AddLoginUserParam;
+import com.szwl.model.param.UpdateLoginUserParam;
+import com.szwl.model.param.UpdateSysRoleParam;
 import com.szwl.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -78,11 +80,17 @@ public class TAdminController {
         param.setAdminId(null);
         TAdmin entity = BeanUtil.copyProperties(param,TAdmin.class);
         entity.setParentId(parentId);
+        if(parentId.toString().equals("1")){
+            entity.setType(1);
+        }else {
+            entity.setType(3);
+        }
 //        entity.setParentId(34l);
         entity.setIsAdmined(false);
         entity.setCreateDate(now);
         entity.setModifyDate(now);
         entity.setIsLocked(false);
+        entity.setIsEnabled(true);
         entity.setLoginFailureCount(0);
         entity.setEmail(param.getEmail());
         entity.setPhone(param.getPhone());
@@ -120,11 +128,143 @@ public class TAdminController {
         }
         return R.ok(entity);
     }
+    @ApiOperation(value = "修改子账号")
+    @PostMapping("/updateLoginUser")
+    @Transactional
+    @Audit(type = AuditEnum.UPDATE,content = "#loginUser.name + '修改账号'")
+    public ResponseModel<?> updateLoginUser(@RequestBody @Valid UpdateLoginUserParam param) {
+//    public ResponseModel<?> addLoginUser(@RequestBody  AddLoginUserParam param) {
+        //获取当前操作人员
+        UserDetailBO loginUser = tokenManager.getLoginUserDetails();
+        // 保存用户实体
+        Date now = new Date();
+        Long parentId = param.getAdminId();
+        if(parentId==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        param.setAdminId(null);
+//        TAdmin entity = BeanUtil.copyProperties(param,TAdmin.class);
+//        entity.setParentId(parentId);
+////        entity.setParentId(34l);
+//        entity.setIsAdmined(false);
+//        entity.setCreateDate(now);
+//        entity.setModifyDate(now);
+//        entity.setIsLocked(false);
+//        entity.setIsEnabled(true);
+//        entity.setLoginFailureCount(0);
+//        entity.setEmail(param.getEmail());
+//        entity.setPhone(param.getPhone());
+//        tAdminService.save(entity);
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+        query.eq(TAdmin::getParentId,parentId);
+        query.eq(TAdmin::getId,param.getId());
+        List<TAdmin> list = tAdminService.list(query);
+        if(list.size()>0){
+            TAdmin admin = list.get(0);
+            // 管理的机器 需要再建立一个关系表 type区分全部还是部分
+            String equipmentIds = param.getEquipmentIds();
+            if(StringUtils.isNotEmpty(equipmentIds)){
+                LambdaQueryWrapper<TAdminEquipment> query1 = Wrappers.lambdaQuery();
+                query1.eq(TAdminEquipment::getAdminId,admin.getId());
+                List<TAdminEquipment> list1 = tAdminEquipmentService.list(query1);
+                if(list1.size()>0){
+                    TAdminEquipment tAdminEquipment1 = list1.get(0);
+                    if(equipmentIds.equals("all")){
+                        //管理全部机器
+                        //0:全部机器，1：部分机器
+                        tAdminEquipment1.setType("0");
+                        tAdminEquipment1.setEquipmentIds(null);
+                    }else {
+                        //部分机器
+                        //0:全部机器，1：部分机器
+                        tAdminEquipment1.setType("1");
+                        tAdminEquipment1.setEquipmentIds(param.getEquipmentIds());
+                    }
+                    tAdminEquipmentService.updateById(tAdminEquipment1);
+                }
+
+            }
+            LambdaQueryWrapper<SysUserRole> query1 = Wrappers.lambdaQuery();
+            query1.eq(SysUserRole::getUserId,admin.getId());
+            List<SysUserRole> list1 = sysUserRoleService.list(query1);
+            if(list1.size()>0){
+                for(SysUserRole sysUserRole:list1){
+                    sysUserRoleService.removeById(sysUserRole.getId());
+                }
 
+            }
+            // 保存用户角色关系
+            List<SysUserRole> userRoleList = param.getRoleList()
+                    .stream()
+                    .map(e -> new SysUserRole().setRoleId(e).setUserId(String.valueOf(admin.getId())) )
+                    .collect(Collectors.toList());
+
+            if(CollUtil.isNotEmpty(userRoleList)){
+                sysUserRoleService.saveBatch(userRoleList);
+            }
+            admin.setIsEnabled(param.getIsEnabled());
+            admin.setPhone(param.getPhone());
+            admin.setEmail(param.getEmail());
+            admin.setIsEnabled(param.getIsEnabled());
+            if(StringUtils.isNotEmpty(param.getPassword())){
+                admin.setPassword(param.getPassword());
+            }
+            tAdminService.updateById(admin);
+            log.debug("修改账号 id:{},TAdmin:{}",admin.getId(),admin);
+            return R.ok(admin);
+        }
+        return R.fail(ResponseCodesEnum.A0100);
+    }
+    @ApiOperation(value = "删除子账号")
+    @PostMapping("/deleteLoginUser")
+    @Transactional
+    @Audit(type = AuditEnum.DELETE,content = "#loginUser.name + '删除账号'")
+    public ResponseModel<?> deleteLoginUser(@RequestBody @Valid UpdateLoginUserParam param) {
+//    public ResponseModel<?> addLoginUser(@RequestBody  AddLoginUserParam param) {
+        //获取当前操作人员
+        UserDetailBO loginUser = tokenManager.getLoginUserDetails();
+        // 保存用户实体
+        Date now = new Date();
+        Long parentId = param.getAdminId();
+        if(parentId==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        param.setAdminId(null);
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+        query.like(TAdmin::getParentId,parentId);
+        query.like(TAdmin::getId,param.getId());
+        List<TAdmin> list = tAdminService.list(query);
+        if(list.size()>0){
+            TAdmin admin = list.get(0);
+            // 管理的机器 需要再建立一个关系表 type区分全部还是部分
+            String equipmentIds = param.getEquipmentIds();
+            if(StringUtils.isNotEmpty(equipmentIds)){
+                LambdaQueryWrapper<TAdminEquipment> query1 = Wrappers.lambdaQuery();
+                query1.eq(TAdminEquipment::getAdminId,admin.getId());
+                List<TAdminEquipment> list1 = tAdminEquipmentService.list(query1);
+                if(list1.size()>0){
+                    TAdminEquipment tAdminEquipment1 = list1.get(0);
+                    tAdminEquipmentService.removeById(tAdminEquipment1.getAdminId());
+                }
+            }
+            // 用户角色关系
+            LambdaQueryWrapper<SysUserRole> query2 = Wrappers.lambdaQuery();
+            query2.eq(SysUserRole::getUserId,admin.getId());
+            List<SysUserRole> list2 = sysUserRoleService.list(query2);
+            if(list2.size()>0){
+                SysUserRole sysUserRole = list2.get(0);
+                sysUserRoleService.removeById(sysUserRole.getId());
+            }
+            tAdminService.removeById(admin.getId());
+            log.debug("删除账号 id:{},TAdmin:{}",admin.getId(),admin);
+            return R.ok(admin);
+        }
+        return R.fail(ResponseCodesEnum.A0100);
+    }
     @ApiOperation(value = "获取所有子账号信息")
     @GetMapping("/getChildDrenAdminList")
     public ResponseModel<?> getChildDrenAdminList(String adminId,String userName,String name) {
-        List<String> returnList = new ArrayList<>();
+        List<AddLoginUserParam> returnList = new ArrayList<>();
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getParentId,adminId);
         if(StringUtils.isNotEmpty(userName)){
@@ -133,25 +273,71 @@ public class TAdminController {
         if(StringUtils.isNotEmpty(name)){
             query.eq(TAdmin::getName,name);
         }
+        if(StringUtils.isNotEmpty(adminId)){
+            if(adminId.equals("1")){
+//                query.in(TAdmin::getType,"1","3");
+                query.eq(TAdmin::getType,"1");
+            }else {
+                query.eq(TAdmin::getType,"3");
+            }
+        }else {
+            return  R.fail(ResponseCodesEnum.A0100);
+        }
         query.eq(TAdmin::getIsAdmined,false);
         List<TAdmin> list = tAdminService.list(query);
         if(list.size()>0){
+
             for(TAdmin admin:list){
+                AddLoginUserParam addLoginUserParam = new AddLoginUserParam();
+                JSONObject jsonObject = new JSONObject();
+                addLoginUserParam.setUsername(admin.getUsername());
+                addLoginUserParam.setName(admin.getName());
+                addLoginUserParam.setEmail(admin.getEmail());
+                addLoginUserParam.setPhone(admin.getPhone());
+                addLoginUserParam.setIsEnabled(admin.getIsEnabled());
+                addLoginUserParam.setId(admin.getId());
+                LambdaQueryWrapper<TAdminEquipment> query2 = Wrappers.lambdaQuery();
+                query2.eq(TAdminEquipment::getAdminId,admin.getId());
+                List<TAdminEquipment> list1 = tAdminEquipmentService.list(query2);
+                if(list1.size()>0){
+                    TAdminEquipment tAdminEquipment1 = list1.get(0);
+                    if(tAdminEquipment1.getType().equals("0")){
+                        //管理全部机器
+                        //0:全部机器，1：部分机器
+                        tAdminEquipment1.setType("0");
+                        tAdminEquipment1.setEquipmentIds(null);
+                        addLoginUserParam.setEquipmentIds("all");
+                    }else {
+                        //部分机器
+                        //0:全部机器，1：部分机器
+                        tAdminEquipment1.setType("1");
+                        addLoginUserParam.setEquipmentIds(tAdminEquipment1.getEquipmentIds());
+                    }
+                }
                 LambdaQueryWrapper<SysUserRole> query1 = Wrappers.lambdaQuery();
                 query1.eq(SysUserRole::getUserId,admin.getId());
                 List<SysUserRole> roleList = sysUserRoleService.list(query1);
+                List<String> ids = new ArrayList<>();
+                StringBuilder roleName = new StringBuilder();
                 if(roleList.size()>0){
-                    SysUserRole sysUserRole = roleList.get(0);
-                    SysRole sysRole = sysRoleService.getById(sysUserRole.getRoleId());
-                    String roleName = sysRole.getRoleName();
-                    JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("roleName", roleName);
-                    jsonObject.put("userName", admin.getUsername());
-                    jsonObject.put("name", admin.getName());
-                    jsonObject.put("email", admin.getEmail());
-                    jsonObject.put("phone", admin.getPhone());
-                    returnList.add(jsonObject.toJSONString());
+                    for(int i=0;i<roleList.size();i++){
+                        SysUserRole sysUserRole = roleList.get(0);
+                        ids.add(sysUserRole.getRoleId());
+                        SysRole sysRole = sysRoleService.getById(sysUserRole.getRoleId());
+                        if(i<roleList.size()-1){
+                            roleName.append(sysRole.getRoleName()).append(",");
+                        }else {
+                            roleName.append(sysRole.getRoleName());
+                        }
+//                    addLoginUserParam.setRoleName(roleName);
+//                    List<String> list2 = Arrays.asList(sysRole.getMenuCodesJson().split(","));
+//                    addLoginUserParam.setRoleList(list2);
+                    }
+
                 }
+                addLoginUserParam.setRoleName(roleName.toString());
+                addLoginUserParam.setRoleList(ids);
+                returnList.add(addLoginUserParam);
             }
 
         }

src/main/java/com/szwl/controller/TJoinpayMchCheckController.java

@@ -55,7 +55,8 @@ public class TJoinpayMchCheckController {
         }
         TAdmin admin = adminService.getById(adminId);
         if(admin.getType()>1){
-            return R.fail(ResponseCodesEnum.A0100);
+            // todo
+//            return R.fail(ResponseCodesEnum.A0100);
         }
         if(type.equals("0")){
             //汇聚的审核信息

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -98,6 +98,8 @@ public class TJoinpayMchController {
         LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
         query.eq(TJoinpayMch::getAdminId,tJoinpayMch.getAdminId());
         List<TJoinpayMch> list = tJoinpayMchService.list(query);
+        tJoinpayMch.setCreateDate(new Date());
+        tJoinpayMch.setModifyDate(new Date());
         if(list.size()>0){
             //已有，属于第二次提交信息，需要审核
             TJoinpayMch mch = list.get(0);
@@ -106,6 +108,7 @@ public class TJoinpayMchController {
         }else {
             //没有，直接保存
             tJoinpayMch.setStep("0");
+
             String result = tJoinpayMchService.createMch(tJoinpayMch);
             return R.fail("尚未注册！");
         }
@@ -178,6 +181,8 @@ public class TJoinpayMchController {
                 return R.fail("重复提交！");
             }
             TJoinpayMchCheck joinpayMchCheck = new TJoinpayMchCheck();
+            joinpayMchCheck.setCreateDate(new Date());
+            joinpayMchCheck.setModifyDate(new Date());
             joinpayMchCheck.setAdminId(tJoinpayMch.getAdminId());
             joinpayMchCheck.setAltMainBalance(tJoinpayMch.getAltMainBalance());
             joinpayMchCheck.setAltGuarBalance(tJoinpayMch.getAltGuarBalance());

src/main/java/com/szwl/model/entity/SysRole.java

@@ -36,6 +36,9 @@ public class SysRole implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "备注")
+    private Long adminId;
+
     @ApiModelProperty(value = "权限菜单json")
     private String menuCodesJson;
 }

src/main/java/com/szwl/model/entity/TAd.java

@@ -38,6 +38,8 @@ public class TAd implements Serializable {
     private Integer locationType;
 
     private String name;
+
+    private String username;
     /**
      * 广告地址
      */

src/main/java/com/szwl/model/entity/TAdminEquipment.java

@@ -1,6 +1,9 @@
 package com.szwl.model.entity;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +23,7 @@ import lombok.EqualsAndHashCode;
 public class TAdminEquipment implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @TableId(value = "admin_id", type = IdType.ASSIGN_ID)
     private Long adminId;
 
     private String equipmentIds;

src/main/java/com/szwl/model/param/AddLoginUserParam.java

@@ -30,6 +30,10 @@ public class AddLoginUserParam {
 
     @ApiModelProperty(value = "电话")
     private String phone;
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+    @ApiModelProperty(value = "当前子账户id")
+    private Long id;
 
     @ApiModelProperty(value = "当前登录账户id")
     private Long adminId;

src/main/java/com/szwl/model/param/AddSysRoleParam.java

@@ -20,6 +20,9 @@ public class AddSysRoleParam {
     @ApiModelProperty("角色备注")
     private String remark;
 
+    @ApiModelProperty("当前登录用户的id")
+    private Long adminId;
+
     @NotEmpty(message = "请选择权限菜单")
     @ApiModelProperty("菜单code list")
     List<String> menuCodeList;

src/main/java/com/szwl/model/param/UpdateLoginUserParam.java

@@ -0,0 +1,48 @@
+package com.szwl.model.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Accessors(chain = true)
+@ApiModel(description = "添加账号 参数")
+@Data
+public class UpdateLoginUserParam {
+//    @NotBlank(message = "账号 不能为空")
+    @ApiModelProperty(value = "登录名、账号")
+    private String username;
+
+//    @NotBlank(message = "密码 不能为空")
+    @ApiModelProperty("密码")
+    private String password;
+
+    @ApiModelProperty(value = "真实姓名")
+    private String name;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+    @ApiModelProperty(value = "当前子账户id")
+    private Long id;
+
+    @ApiModelProperty(value = "当前登录账户id")
+    private Long adminId;
+
+//    @NotNull
+    @ApiModelProperty(value = "是否启用")
+    private Boolean isEnabled;
+
+//    @NotEmpty(message = "请选择角色")
+    @ApiModelProperty("角色id list")
+    List<String> roleList;
+
+    @ApiModelProperty(value = "机器列表")
+    private String equipmentIds;
+}

src/main/java/com/szwl/model/param/UpdateSysRoleParam.java

@@ -16,7 +16,8 @@ public class UpdateSysRoleParam {
     @NotBlank
     @ApiModelProperty(value = "角色id")
     private String roleId;
-
+    @ApiModelProperty("当前登录用户的id")
+    private Long adminId;
     @NotBlank(message = "角色名称 不能为空")
     @ApiModelProperty(value = "角色名称")
     private String roleName;

src/main/java/com/szwl/service/impl/SysRoleServiceImpl.java

@@ -74,6 +74,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         this.checkRoleName(param.getRoleName());
         SysRole sysRole = new SysRole()
                 .setRoleName(param.getRoleName())
+                .setAdminId(param.getAdminId())
                 .setMenuCodesJson(JSON.toJSONString(param.getMenuCodeList()))
                 .setRemark(param.getRemark());
         save(sysRole);
@@ -83,9 +84,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     public void updateSysRole(UpdateSysRoleParam param){
         SysRole sysRole = Optional.ofNullable(this.getById(param.getRoleId()))
                 .orElseThrow(() ->new BizException(ResponseCodesEnum.B0005,"无法根据id："+param.getRoleId()+" 找到角色配置"));
-        if(StrUtil.equals(param.getRoleName(),sysRole.getRoleName())){
-            this.checkRoleName(param.getRoleName());
-        }
+//        if(StrUtil.equals(param.getRoleName(),sysRole.getRoleName())){
+//            this.checkRoleName(param.getRoleName());
+//        }
         BeanUtil.copyProperties(param,sysRole);
         sysRole.setMenuCodesJson(JSON.toJSONString(param.getMenuCodeList()));
         updateById(sysRole);