修改错误返回代码 使其唯一以便前端进行中英文切换

dgtly-admin/src/main/java/com/dgtly/web/controller/system/SysDeptController.java

@@ -2,6 +2,7 @@ package com.dgtly.web.controller.system;
 
 import java.util.List;
 
+import com.dgtly.common.exception.BusinessException;
 import com.dgtly.system.domain.SysUser;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -152,11 +153,11 @@ public class SysDeptController extends BaseController
     {
         if (deptService.selectDeptCount(deptId) > 0)
         {
-            return AjaxResult.error(300,"存在下级部门,不允许删除");
+            throw new BusinessException("存在下级部门,不允许删除");
         }
         if (deptService.checkDeptExistUser(deptId))
         {
-            return AjaxResult.error(300,"部门存在用户,不允许删除");
+            throw new BusinessException("部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));
     }

dgtly-admin/src/main/java/com/dgtly/web/controller/system/SysMenuController.java

@@ -1,6 +1,8 @@
 package com.dgtly.web.controller.system;
 
 import java.util.List;
+
+import com.dgtly.common.exception.BusinessException;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,11 +66,11 @@ public class SysMenuController extends BaseController
     {
         if (menuService.selectCountMenuByParentId(menuId) > 0)
         {
-            return AjaxResult.error(300,"存在子菜单,不允许删除");
+            throw new BusinessException("存在子菜单,不允许删除");
         }
         if (menuService.selectCountRoleMenuByMenuId(menuId) > 0)
         {
-            return AjaxResult.error(300,"菜单已分配,不允许删除");
+            throw new BusinessException("菜单已分配,不允许删除");
         }
         ShiroUtils.clearCachedAuthorizationInfo();
         return toAjax(menuService.deleteMenuById(menuId));

dgtly-api/src/main/java/com/dgtly/api/controller/SysCompanyController.java

@@ -119,16 +119,16 @@ public class SysCompanyController extends ApiBaseController {
 
         if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(cr.getLoginName())))
         {
-            return AjaxResult.error(300,"新增用户'" + cr.getLoginName() + "'失败，登录账号已存在");
+            return AjaxResult.error(ResultType.LOGINNAMEREPEAT);
         }
         else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(companyReviewedService.checkLoginNameUnique(cr.getLoginName())))
         {
-            return AjaxResult.error(301,"新增用户'" + cr.getLoginName() + "'失败，登录账号在审核列表中已存在");
+            return AjaxResult.error(ResultType.LOGINNAMEREPEAT);
         }
         else if (cr.getPassword().length() < UserConstants.PASSWORD_MIN_LENGTH
                 || cr.getPassword().length() > UserConstants.PASSWORD_MAX_LENGTH)
         {
-            return  AjaxResult.error(302,"密码长度为6-19，请重新设置！！");
+            return  AjaxResult.error(ResultType.PASSWORD_LENGTH_ERROR);
         }
         int i=  companyReviewedService.insertCompanyReviewed(cr);
 

dgtly-apiframework/src/main/java/com/dgtly/apiframework/exception/ApiGlobalExceptionHandler.java

@@ -38,7 +38,7 @@ public class ApiGlobalExceptionHandler
     public AjaxResult handleException(LessParamException e)
     {
         log.error(e.getMessage(), e);
-        return AjaxResult.error(ResultType.LESSPARAM.value(),e.getMessage());
+        return AjaxResult.error(ResultType.LESSPARAM,e.getMessage());
     }
     /**
      * 未登录

dgtly-common/src/main/java/com/dgtly/common/core/domain/AjaxResult.java

@@ -194,19 +194,29 @@ public class AjaxResult
      *
      * @return
      */
-    public static AjaxResult error(int code,String msg)
+    public static AjaxResult error(ResultType t,String msg) {
+        AjaxResult  a = new AjaxResult(ResultType.SUCCESS);
+        a.msg = msg;
+        return a;
+    }
+    /**
+     * 返回错误消息
+     *
+     * @return
+     */
+   /* public static AjaxResult error(int code,String msg)
     {
         return new AjaxResult(code,msg);
-    }
+    }*/
 
     /**
      * 返回错误消息
      *
      * @return
      */
-    public static AjaxResult error(int code,String msg,Object data){
+    /*public static AjaxResult error(int code,String msg,Object data){
         return new AjaxResult(code,msg).parseBean(data);
-    }
+    }*/
 
 
 

dgtly-common/src/main/java/com/dgtly/common/core/domain/ResultType.java

@@ -5,6 +5,17 @@ package com.dgtly.common.core.domain;
 public enum ResultType {
     /** 成功 */
     SUCCESS(0,"成功")
+
+    ,LOGINNAMEREPEAT(301,"登录名重复")
+    ,PHONEREPEAT(302,"电话号码重复")
+    ,PASSWORDERROR(303,"账号或密码错误")
+    ,VERIFICATIONERROR(304,"验证码错误")
+    ,PASSWORD_LENGTH_ERROR(305,"密码长度为6~19位")
+
+
+
+
+
     /** 查询结果为空错误 */
     ,LESSPARAM(402,"缺少请求参数")
     /** 查询结果为空错误 */
@@ -50,4 +61,5 @@ public enum ResultType {
     }
 
 
+
 }

dgtly-goods/dgtly-goods-admin/src/main/java/com/dgtly/goods/controller/GoodsTypeController.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.dgtly.common.constant.UserConstants;
 import com.dgtly.common.core.domain.Ztree;
+import com.dgtly.common.exception.BusinessException;
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.framework.util.ShiroUtils;
 import com.dgtly.goods.domain.GoodsInfo;
@@ -175,12 +176,12 @@ public class GoodsTypeController extends BaseController
         paramGoodsTyep.setAncestors(id.toString());
         if (goodsTypeService.selectGoodsTypeCount(paramGoodsTyep) > 1)
         {
-            return AjaxResult.error(300,"存在子菜单,不允许删除");
+            throw new BusinessException("分类有子菜单，不允许删除");
         }
 
         if (goodsInfoService.selectGoodsInfoCountByTypeId(id) > 0)
         {
-            return AjaxResult.error(300,"分类已有商品,不允许删除");
+            throw new BusinessException("分类已有商品,不允许删除");
         }
         return toAjax(goodsTypeService.deleteGoodsTypeById(id));
     }

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/DemandInfoController.java

@@ -30,7 +30,6 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/demand/info")
-@ApiPassToken/* 不用验证token  方法上可用*/
 @ApiNoCheckSign/* 不用验证 签名 方法上可用*/
 public class DemandInfoController extends ApiBaseController {
 
@@ -45,6 +44,7 @@ public class DemandInfoController extends ApiBaseController {
      * @auther: LiuLingChao
      * @date: 2020-2-25 10:11
      */
+    @ApiPassToken/* 不用验证token  方法上可用*/
     @PostMapping("/getDemandInfoTenList")
     public Object getDemandInfoTenList(){
         List<NoticeDemand> noticeDemandList = noticeDemandService.getDemandInfoTenList();
@@ -59,6 +59,7 @@ public class DemandInfoController extends ApiBaseController {
      * @auther: LiuLingChao
      * @date: 2020-2-25 10:54
      */
+    @ApiPassToken/* 不用验证token  方法上可用*/
     @PostMapping("/getDemandInfo")
     public Object getDemandInfo(){
         ParameterObject obj =  getParameterObject();
@@ -74,6 +75,7 @@ public class DemandInfoController extends ApiBaseController {
      * @auther: LiuLingChao
      * @date: 2020-2-25 11:02
      */
+    @ApiPassToken/* 不用验证token  方法上可用*/
     @PostMapping("/getDemandInfoAllList")
     public Object getDemandInfoAllList(){
         ParameterObject obj =  getParameterObject();
@@ -93,7 +95,6 @@ public class DemandInfoController extends ApiBaseController {
     @PostMapping("/insertDemandInfo")
     public Object insertDemandInfo(){
         String userId = TokenUtil.getTokenUserId();
-        if(StringUtils.isNotEmpty(userId)){
             ParameterObject obj =  getParameterObject();
             NoticeDemand noticeDemand = obj.parseBean(NoticeDemand.class);
             noticeDemand.setMemberId(Long.parseLong(userId));
@@ -101,10 +102,6 @@ public class DemandInfoController extends ApiBaseController {
             noticeDemand.setReleaseTime(DateUtils.getNowDate());
             int flag = noticeDemandService.insertNoticeDemand(noticeDemand);
             return toAjax(flag);
-        }else{
-            return AjaxResult.error(301,"获取token信息出错");
-        }
-
     }
 
 
@@ -119,7 +116,6 @@ public class DemandInfoController extends ApiBaseController {
     @PostMapping("/getMemberDemandList")
     public Object getMemberDemandList(){
         String userId = TokenUtil.getTokenUserId();
-        if(StringUtils.isNotEmpty(userId)){
             ParameterObject obj =  getParameterObject();
             startPage(obj);
             NoticeDemand noticeDemand = new NoticeDemand();
@@ -127,10 +123,6 @@ public class DemandInfoController extends ApiBaseController {
             noticeDemand.setMemberId(Long.parseLong(userId));
             List<NoticeDemand> noticeDemandList = noticeDemandService.selectNoticeDemandList(noticeDemand);
             return AjaxResult.success(getDataTable(noticeDemandList));
-
-        }else{
-            return AjaxResult.error(301,"获取token信息出错");
-        }
     }
 
 

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/MemberFollowApi.java

@@ -52,16 +52,12 @@ public class MemberFollowApi extends ApiBaseController {
     public Object addMemberFollow(){
         //获取token中用户id
         String userId = TokenUtil.getTokenUserId();
-        if(StringUtils.isNotEmpty(userId)){
             ParameterObject obj =  getParameterObject();
             MemberFollow memberFollow = obj.parseBean(MemberFollow.class);
             memberFollow.setMemberId(Long.parseLong(userId));
             memberFollow.setFollowDate(DateUtils.getNowDate());
             int flag = iMemberFollowService.insertMemberFollow(memberFollow);
             return toAjax(flag);
-        }else{
-            return AjaxResult.error(301,"获取token出错");
-        }
     }
 
     /**
@@ -102,17 +98,13 @@ public class MemberFollowApi extends ApiBaseController {
     @PostMapping("/getMemberFollowList")
     public Object getMemberFollowList(){
         String userId = TokenUtil.getTokenUserId();
-        if(StringUtils.isNotEmpty(userId)){
-            ParameterObject obj =  getParameterObject();
-            startPage(obj);
-            MemberFollow memberFollow = new MemberFollow();
-            memberFollow.setMemberId(Long.parseLong(userId));
+        ParameterObject obj =  getParameterObject();
+        startPage(obj);
+        MemberFollow memberFollow = new MemberFollow();
+        memberFollow.setMemberId(Long.parseLong(userId));
 
-            List<MemberFollow> memberFollowList = iMemberFollowService.getMemberFollowList(memberFollow);
-            return AjaxResult.success(getDataTable(memberFollowList));
-        }else{
-            return AjaxResult.error(301,"获取token出错");
-        }
+        List<MemberFollow> memberFollowList = iMemberFollowService.getMemberFollowList(memberFollow);
+        return AjaxResult.success(getDataTable(memberFollowList));
 
     }
 }

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/MemberInfoController.java

@@ -8,6 +8,7 @@ import com.dgtly.common.annotation.ApiPassToken;
 import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
+import com.dgtly.common.core.domain.ResultType;
 import com.dgtly.common.utils.DateUtils;
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.member.domain.MemberInfo;
@@ -36,7 +37,6 @@ import java.util.Date;
  */
 @RestController
 @RequestMapping("/member/info")
-@ApiPassToken/* 不用验证token  方法上可用*/
 @ApiNoCheckSign/* 不用验证 签名 方法上可用*/
 public class MemberInfoController extends ApiBaseController {
 
@@ -52,6 +52,7 @@ public class MemberInfoController extends ApiBaseController {
      */
     @ApiOperation(value = "网站用户注册")
     @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiPassToken/* 不用验证token  方法上可用*/
     @PostMapping("/userRegister")
     public Object userRegister(){
         ParameterObject obj =  getParameterObject();
@@ -59,12 +60,12 @@ public class MemberInfoController extends ApiBaseController {
         //校验用户名唯一性
         MemberInfo memberInfo1 = iMemberInfoService.checkMemberUnique(memberInfo.getLoginAccount());
         if(memberInfo1 != null){
-            return AjaxResult.error(301,"登录账号已存在");
+            return AjaxResult.error(ResultType.LOGINNAMEREPEAT);
         }
         //校验手机号码唯一性
         MemberInfo memberInfo2 = iMemberInfoService.checkMemberPhoneUnique(memberInfo.getPhone());
         if(memberInfo1 != null){
-            return AjaxResult.error(302,"手机号码已存在");
+            return AjaxResult.error(ResultType.PHONEREPEAT);
         }
         memberInfo.setLoginTime(DateUtils.getNowDate());
         memberInfo.setCreateTime(DateUtils.getNowDate());
@@ -82,6 +83,7 @@ public class MemberInfoController extends ApiBaseController {
      */
     @ApiOperation(value = "会员登录")
     @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiPassToken/* 不用验证token  方法上可用*/
     @PostMapping("/memberLogin")
     public Object memberLogin(){
         ParameterObject obj =  getParameterObject();
@@ -93,7 +95,7 @@ public class MemberInfoController extends ApiBaseController {
         if(null != key && key.equals(memberInfo.getValidateCode())){
             MemberInfo memberInfo1 = iMemberInfoService.memberLogin(memberInfo);
             if(memberInfo1 == null){
-                return AjaxResult.error(304,"登录账号或密码错误");
+                return AjaxResult.error(ResultType.PASSWORDERROR);
             }
             Date start = new Date();
             long currentTime = System.currentTimeMillis() + 12*60* 60 * 1000;//12小时有效时间
@@ -106,7 +108,7 @@ public class MemberInfoController extends ApiBaseController {
             return AjaxResult.success().putKV("token",token);
         }
 
-       return AjaxResult.error(303,"验证码错误");
+       return AjaxResult.error(ResultType.VERIFICATIONERROR);
 
     }
 
@@ -125,14 +127,8 @@ public class MemberInfoController extends ApiBaseController {
     @PostMapping("/getMemberInfo")
     public Object getMemberInfo(){
         String userId  = TokenUtil.getTokenUserId();
-
-        if(StringUtils.isNotEmpty(userId)){
-            MemberInfo memberInfo = iMemberInfoService.selectMemberInfoById(Long.parseLong(userId));
-            return AjaxResult.success().putKV("memberInfo",memberInfo);
-        }else{
-            return AjaxResult.error(305,"根据token获取用户id出错");
-        }
-
+        MemberInfo memberInfo = iMemberInfoService.selectMemberInfoById(Long.parseLong(userId));
+        return AjaxResult.success().putKV("memberInfo",memberInfo);
     }
 
 
@@ -151,18 +147,10 @@ public class MemberInfoController extends ApiBaseController {
     @PostMapping("/editMemberInfo")
     public Object editMemberInfo(){
         String userId  = TokenUtil.getTokenUserId();
-
-        if(StringUtils.isNotEmpty(userId)){
-            ParameterObject obj =  getParameterObject();
-            MemberInfo memberInfo = obj.parseBean(MemberInfo.class);
-            memberInfo.setId(Long.parseLong(userId));
-            int flag = iMemberInfoService.updateMemberInfo(memberInfo);
-            return toAjax(flag);
-        }else{
-            return AjaxResult.error(305,"根据token获取用户id出错");
-        }
-
-
-
+        ParameterObject obj =  getParameterObject();
+        MemberInfo memberInfo = obj.parseBean(MemberInfo.class);
+        memberInfo.setId(Long.parseLong(userId));
+        int flag = iMemberInfoService.updateMemberInfo(memberInfo);
+        return toAjax(flag);
     }
 }