'1'

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysAttachmentController.java

@@ -0,0 +1,98 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.domain.SysAttachment;
+import com.miaxis.system.service.ISysAttachmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 附件Controller
+ * 
+ * @author yinjinlu
+ * @date 2022-07-26
+ */
+@RestController
+@RequestMapping("/system/attachment")
+public class SysAttachmentController extends BaseController
+{
+    @Autowired
+    private ISysAttachmentService sysAttachmentService;
+
+    /**
+     * 查询附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:list')")
+    @GetMapping("/list")
+    public ResponsePageInfo list(SysAttachment sysAttachment)
+    {
+        startPage();
+        List<SysAttachment> list = sysAttachmentService.selectSysAttachmentList(sysAttachment);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:export')")
+    @Log(title = "附件", businessType = BusinessTypeEnum.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysAttachment sysAttachment)
+    {
+        List<SysAttachment> list = sysAttachmentService.selectSysAttachmentList(sysAttachment);
+        ExcelUtil<SysAttachment> util = new ExcelUtil<SysAttachment>(SysAttachment.class);
+        util.exportExcel(list, "附件数据");
+    }
+
+    /**
+     * 获取附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:query')")
+    @GetMapping(value = "/{attachmentId}")
+    public Response getInfo(@PathVariable("attachmentId") Long attachmentId)
+    {
+        return Response.success(sysAttachmentService.selectSysAttachmentByAttachmentId(attachmentId));
+    }
+
+    /**
+     * 新增附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:add')")
+    @Log(title = "附件", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    public Response add(@RequestBody SysAttachment sysAttachment)
+    {
+        return toResponse(sysAttachmentService.insertSysAttachment(sysAttachment));
+    }
+
+    /**
+     * 修改附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:edit')")
+    @Log(title = "附件", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    public Response edit(@RequestBody SysAttachment sysAttachment)
+    {
+        return toResponse(sysAttachmentService.updateSysAttachment(sysAttachment));
+    }
+
+    /**
+     * 删除附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:remove')")
+    @Log(title = "附件", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{attachmentIds}")
+    public Response remove(@PathVariable Long[] attachmentIds)
+    {
+        return toResponse(sysAttachmentService.deleteSysAttachmentByAttachmentIds(attachmentIds));
+    }
+}

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysAutoCodeController.java

@@ -0,0 +1,32 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.system.strategy.AutoCodeUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api("用户信息管理")
+@RestController
+@RequestMapping("/system/autocode")
+public class SysAutoCodeController {
+
+    @Autowired
+    private AutoCodeUtil autoCodeUtil;
+
+    @ApiOperation("获取一个自动生成的编码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ruleCode", value = "规则编码", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "inputCharacter", value = "输入字符", required = false,dataType = "String", paramType = "path", dataTypeClass = String.class)
+    })
+    @GetMapping(value = {"/get/{ruleCode}/{inputCharacter}","/get/{ruleCode}"})
+    public String getAutoCode(@PathVariable String ruleCode, @PathVariable(required = false) String inputCharacter){
+        return autoCodeUtil.genSerialCode(ruleCode,inputCharacter);
+    }
+
+}

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysAutoCodePartController.java

@@ -0,0 +1,71 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysAutoCodePart;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.system.service.IAutoCodePartService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/system/autocode/part")
+public class SysAutoCodePartController extends BaseController {
+
+    @Autowired
+    private IAutoCodePartService iAutoCodePartService;
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:part:list')")
+    @GetMapping("/list")
+    public ResponsePageInfo list(SysAutoCodePart sysAutoCodePart){
+        startPage();
+        List<SysAutoCodePart> parts = iAutoCodePartService.listPart(sysAutoCodePart);
+        return toResponsePageInfo(parts);
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:part:query')")
+    @GetMapping("/{partId}")
+    public Response getInfo(@PathVariable Long partId){
+        return Response.success(iAutoCodePartService.findById(partId));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:part:insert')")
+    @Log(title = "新增编码生产规则组成部分",businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    public Response add(@Validated @RequestBody SysAutoCodePart part){
+        if(UserConstants.NOT_UNIQUE.equals(iAutoCodePartService.checkPartUnique(part))){
+            throw new CustomException("规则组成不唯一，清检查组成编码、组成名称、组成序号");
+        }
+        part.setCreateBy(getUsername());
+        return toResponse(iAutoCodePartService.insertPart(part));
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:part:update')")
+    @Log(title = "更新物料编码",businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    public Response update(@Validated @RequestBody SysAutoCodePart sysAutoCodePart){
+        if(UserConstants.NOT_UNIQUE.equals(iAutoCodePartService.checkPartUnique(sysAutoCodePart))){
+            throw new CustomException("规则组成不唯一，清检查组成编码、组成名称、组成序号");
+        }
+        sysAutoCodePart.setUpdateBy(getUsername());
+        return toResponse(iAutoCodePartService.updatePart(sysAutoCodePart));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:part:remove')")
+    @Log(title = "删除物料编码",businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{partIds}")
+    public Response delete(@PathVariable Long[] partIds){
+        return toResponse(iAutoCodePartService.deleteByIds(partIds));
+    }
+
+}

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysAutoCodeRuleController.java

@@ -0,0 +1,80 @@
+package com.miaxis.system.controller.system;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.UserConstants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysAutoCodeRule;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.system.service.IAutoCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/system/autocode/rule")
+public class SysAutoCodeRuleController extends BaseController {
+
+    @Autowired
+    private IAutoCodeRuleService iAutoCodeRuleService;
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:rule:list')")
+    @GetMapping("/list")
+    public ResponsePageInfo list(SysAutoCodeRule sysAutoCodeRule){
+        startPage();
+        List<SysAutoCodeRule> rules = iAutoCodeRuleService.selectAutoCodeList(sysAutoCodeRule);
+        return toResponsePageInfo(rules);
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:rule:query')")
+    @GetMapping("/{ruleId}")
+    public Response getInfo(@PathVariable Long ruleId){
+        return Response.success(iAutoCodeRuleService.findById(ruleId));
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:rule:add')")
+    @Log(title = "新增自动编码规则",businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    public Response add(@Validated @RequestBody SysAutoCodeRule sysAutoCodeRule){
+        if(UserConstants.NOT_UNIQUE.equals(iAutoCodeRuleService.checkRuleCodeUnique(sysAutoCodeRule))){
+            throw new CustomException("自动编码规则的编号重复");
+        }
+        if(UserConstants.NOT_UNIQUE.equals(iAutoCodeRuleService.checkRuleNameUnique(sysAutoCodeRule))){
+            throw new CustomException("自动编码规则的名称重复");
+        }
+        if("N".equals(sysAutoCodeRule.getIsPadded())){
+            sysAutoCodeRule.setPaddedChar(null);
+            sysAutoCodeRule.setPaddedMethod(null);
+        }
+        sysAutoCodeRule.setCreateBy(getUsername());
+        return toResponse(iAutoCodeRuleService.insertInfo(sysAutoCodeRule));
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:rule:edit')")
+    @Log(title = "更新自动编码规则",businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    public Response updateInfo(@Validated @RequestBody SysAutoCodeRule sysAutoCodeRule){
+        if(UserConstants.NOT_UNIQUE.equals(iAutoCodeRuleService.checkRuleCodeUnique(sysAutoCodeRule))){
+            throw new CustomException("自动编码规则的编号重复");
+        }
+        if(UserConstants.NOT_UNIQUE.equals(iAutoCodeRuleService.checkRuleNameUnique(sysAutoCodeRule))){
+            throw new CustomException("自动编码规则的名称重复");
+        }
+        sysAutoCodeRule.setUpdateBy(getUsername());
+        return toResponse(iAutoCodeRuleService.updateInfo(sysAutoCodeRule));
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:autocode:rule:remove')")
+    @Log(title = "删除自动编码规则",businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{ruleIds}")
+    public Response remove(@PathVariable Long[] ruleIds){
+
+        return toResponse(iAutoCodeRuleService.deleteByIds(ruleIds));
+    }
+
+}

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java

@@ -12,7 +12,9 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.system.domain.SysConfig;
 import com.miaxis.system.service.ISysConfigService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -99,7 +101,7 @@ public class SysConfigController extends BaseController
     ){
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
-            return Response.error(ResponseEnum.CONFIG_ADD_ERROR_EXIST);
+            Response.error(ResponseEnum.CONFIG_ADD_ERROR_EXIST);
         }
         config.setCreateBy(SecurityUtils.getUsername());
         return toResponse(configService.insertConfig(config));
@@ -117,7 +119,7 @@ public class SysConfigController extends BaseController
     ){
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
-            return Response.error(ResponseEnum.CONFIG_UPDATE_ERROR_EXIST);
+            Response.error(ResponseEnum.CONFIG_UPDATE_ERROR_EXIST);
         }
         config.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(configService.updateConfig(config));

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java

@@ -124,7 +124,7 @@ public class SysDeptController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
         {
-            return Response.error(ResponseEnum.DEPARTMENT_ADD_ERROR_EXIST);
+            Response.error(ResponseEnum.DEPARTMENT_ADD_ERROR_EXIST);
         }
         dept.setCreateBy(SecurityUtils.getUsername());
         return toResponse(deptService.insertDept(dept));
@@ -141,16 +141,16 @@ public class SysDeptController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
         {
-            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_EXIST);
+            Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_EXIST);
         }
         else if (dept.getParentId().equals(dept.getDeptId()))
         {
-            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SELF);
+            Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SELF);
         }
         else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
                 && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
         {
-            return Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SUB);
+            Response.error(ResponseEnum.DEPARTMENT_UPDATE_ERROR_SUB);
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(deptService.updateDept(dept));
@@ -169,11 +169,11 @@ public class SysDeptController extends BaseController
     ){
         if (deptService.hasChildByDeptId(deptId))
         {
-            return Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_SUB);
+            Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_SUB);
         }
         if (deptService.checkDeptExistUser(deptId))
         {
-            return Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_USER);
+            Response.error(ResponseEnum.DEPARTMENT_DELETE_ERROR_USER);
         }
         return toResponse(deptService.deleteDeptById(deptId));
     }

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java

@@ -81,7 +81,7 @@ public class SysDictTypeController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
         {
-            return Response.error(ResponseEnum.DICTIONARY_ADD_ERROR_EXIST);
+            Response.error(ResponseEnum.DICTIONARY_ADD_ERROR_EXIST);
         }
         dict.setCreateBy(SecurityUtils.getUsername());
         return toResponse(dictTypeService.insertDictType(dict));
@@ -98,7 +98,7 @@ public class SysDictTypeController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
         {
-            return Response.error(ResponseEnum.DICTIONARY_UPDATE_ERROR_EXIST);
+            Response.error(ResponseEnum.DICTIONARY_UPDATE_ERROR_EXIST);
         }
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(dictTypeService.updateDictType(dict));

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -19,7 +19,6 @@ import com.miaxis.system.service.ISysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -104,7 +103,7 @@ public class SysLoginController
 //            return Response.success(tokenDTO) ;
 //        }
 //        else{
-//            return Response.error(500,wxResult.getErrmsg());
+//            Response.error(500,wxResult.getErrmsg());
 //        }
 //
 //    }

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java

@@ -110,12 +110,12 @@ public class SysMenuController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
         {
-            return Response.error(ResponseEnum.MENU_ADD_ERROR_EXIST);
+            Response.error(ResponseEnum.MENU_ADD_ERROR_EXIST);
         }
         else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
                 && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
         {
-            return Response.error(ResponseEnum.MENU_ADD_ERROR_HTTP);
+            Response.error(ResponseEnum.MENU_ADD_ERROR_HTTP);
         }
         menu.setCreateBy(SecurityUtils.getUsername());
         return toResponse(menuService.insertMenu(menu));
@@ -132,16 +132,16 @@ public class SysMenuController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
         {
-            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_EXIST);
+            Response.error(ResponseEnum.MENU_UPDATE_ERROR_EXIST);
         }
         else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
                 && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
         {
-            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_HTTP);
+            Response.error(ResponseEnum.MENU_UPDATE_ERROR_HTTP);
         }
         else if (menu.getMenuId().equals(menu.getParentId()))
         {
-            return Response.error(ResponseEnum.MENU_UPDATE_ERROR_SELF);
+            Response.error(ResponseEnum.MENU_UPDATE_ERROR_SELF);
         }
         menu.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(menuService.updateMenu(menu));
@@ -160,11 +160,11 @@ public class SysMenuController extends BaseController
     ){
         if (menuService.hasChildByMenuId(menuId))
         {
-            return Response.error(ResponseEnum.MENU_DELETE_ERROR_SUB);
+            Response.error(ResponseEnum.MENU_DELETE_ERROR_SUB);
         }
         if (menuService.checkMenuExistRole(menuId))
         {
-            return Response.error(ResponseEnum.MENU_DELETE_ERROR_ROLE);
+            Response.error(ResponseEnum.MENU_DELETE_ERROR_ROLE);
         }
         return toResponse(menuService.deleteMenuById(menuId));
     }

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java

@@ -84,11 +84,11 @@ public class SysPostController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
         {
-            return Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_NAME);
+            Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_NAME);
         }
         else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
         {
-            return Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_CODE);
+            Response.error(ResponseEnum.POST_ADD_ERROR_EXIST_CODE);
         }
         post.setCreateBy(SecurityUtils.getUsername());
         return toResponse(postService.insertPost(post));
@@ -105,11 +105,11 @@ public class SysPostController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
         {
-            return Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_NAME);
+            Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_NAME);
         }
         else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
         {
-            return Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_CODE);
+            Response.error(ResponseEnum.POST_UPDATE_ERROR_EXIST_CODE);
         }
         post.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(postService.updatePost(post));

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java

@@ -90,11 +90,11 @@ public class SysProfileController extends BaseController
         String password = loginUser.getPassword();
         if (!SecurityUtils.matchesPassword(updatePwdDTO.getOldPassword(), password))
         {
-            return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_ERROR);
+            Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_ERROR);
         }
         if (SecurityUtils.matchesPassword(updatePwdDTO.getNewPassword(), password))
         {
-            return Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_REPEAT);
+            Response.error(ResponseEnum.UPDATE_PASSWORD_ERROR_OLD_REPEAT);
         }
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(updatePwdDTO.getNewPassword())) > 0)
         {
@@ -127,6 +127,6 @@ public class SysProfileController extends BaseController
                 return response;
             }
         }
-        return Response.error(ResponseEnum.ABNORMAL_PICTURE_UPLOAD);
+       return Response.error(ResponseEnum.ABNORMAL_PICTURE_UPLOAD);
     }
 }

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java

@@ -96,11 +96,11 @@ public class SysRoleController extends BaseController
     {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
-            return Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_NAME);
+            Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_NAME);
         }
         else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
         {
-            return Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_AUTHORITY);
+            Response.error(ResponseEnum.ROLE_ADD_ERROR_EXIST_AUTHORITY);
         }
         role.setCreateBy(SecurityUtils.getUsername());
         return toResponse(roleService.insertRole(role));
@@ -119,11 +119,11 @@ public class SysRoleController extends BaseController
         roleService.checkRoleAllowed(role);
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
-            return Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_NAME);
+            Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_NAME);
         }
         else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
         {
-            return Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_AUTHORITY);
+            Response.error(ResponseEnum.ROLE_UPDATE_ERROR_EXIST_AUTHORITY);
         }
         role.setUpdateBy(SecurityUtils.getUsername());
 

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -1,10 +1,8 @@
 package com.miaxis.system.controller.system;
 
 import com.miaxis.common.annotation.Log;
-import com.miaxis.common.constant.UserConstants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.ResponseEnum;
 import com.miaxis.common.core.domain.entity.SysRole;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.model.LoginUser;
@@ -140,15 +138,15 @@ public class SysUserController extends BaseController
     {
 //        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
 //        {
-//            return Response.error(ResponseEnum.USER_ADD_ERROR_USERNAME);
+//            throw new CustomException(ResponseEnum.USER_ADD_ERROR_USERNAME);
 //        }
 //        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
 //        {
-//            return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
+//            throw new CustomException(ResponseEnum.USER_ADD_ERROR_PHONE);
 //        }
 //        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
 //        {
-//            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
+//            throw new CustomException(ResponseEnum.USER_ADD_ERROR_MAIL);
 //        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -167,11 +165,11 @@ public class SysUserController extends BaseController
         userService.checkUserAllowed(user);
 //        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
 //        {
-//            return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
+//            throw new CustomException(ResponseEnum.USER_UPDATE_ERROR_PHONE);
 //        }
 //        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
 //        {
-//            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
+//            throw new CustomException(ResponseEnum.USER_UPDATE_ERROR_MAIL);
 //        }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(userService.updateUser(user));