Commit 837c6158 by guojuxing

pmd规范

parent 811522ec
...@@ -13,7 +13,13 @@ import com.gic.cloud.service.DataAuthApiService; ...@@ -13,7 +13,13 @@ import com.gic.cloud.service.DataAuthApiService;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.ResultControllerUtils; import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils; import com.gic.enterprise.utils.UserDetailUtils;
/**
* 数据权限
* @ClassName: DataAuthController

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:59 AM

*/
@RestController @RestController
@RequestMapping("/data-auth") @RequestMapping("/data-auth")
public class DataAuthController { public class DataAuthController {
......
...@@ -13,7 +13,13 @@ import com.gic.cloud.web.vo.FunctionVO; ...@@ -13,7 +13,13 @@ import com.gic.cloud.web.vo.FunctionVO;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.ResultControllerUtils; import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils; import com.gic.enterprise.utils.UserDetailUtils;
/**
* 功能
* @ClassName: FunctionController

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:58 AM

*/
@RestController @RestController
@RequestMapping("/function") @RequestMapping("/function")
public class FunctionController { public class FunctionController {
......
...@@ -20,7 +20,13 @@ import com.gic.store.dto.StoreSearchDTO; ...@@ -20,7 +20,13 @@ import com.gic.store.dto.StoreSearchDTO;
import com.gic.store.dto.StoreWidgetDTO; import com.gic.store.dto.StoreWidgetDTO;
import com.gic.store.service.StoreApiService; import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreWidgetApiService; import com.gic.store.service.StoreWidgetApiService;
/**
* 门店暂存区
* @ClassName: TempStoreConditionController

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:59 AM

*/
@RestController @RestController
@RequestMapping("temp-store") @RequestMapping("temp-store")
public class TempStoreConditionController { public class TempStoreConditionController {
...@@ -65,7 +71,8 @@ public class TempStoreConditionController { ...@@ -65,7 +71,8 @@ public class TempStoreConditionController {
if (storeWidgetDTO != null) { if (storeWidgetDTO != null) {
String authSearchParam = storeWidgetDTO.getAuthSearchParam(); String authSearchParam = storeWidgetDTO.getAuthSearchParam();
String searchParam = storeWidgetDTO.getSearchParam(); String searchParam = storeWidgetDTO.getSearchParam();
if (StringUtils.isNotBlank(authSearchParam) && !"{}".equals(authSearchParam)) { String authSearchParamSign = "{}";
if (StringUtils.isNotBlank(authSearchParam) && !authSearchParamSign.equals(authSearchParam)) {
storeSearchDTO.setAuthSearchJson(authSearchParam); storeSearchDTO.setAuthSearchJson(authSearchParam);
} }
storeSearchDTO.setSearchJson(searchParam); storeSearchDTO.setSearchJson(searchParam);
......
package com.gic.cloud.web.controller; package com.gic.cloud.web.controller;
/**test
* @ClassName: TestController

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:58 AM

*/
public class TestController { public class TestController {
} }
...@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.cloud.dto.AccountGroupDTO; import com.gic.cloud.dto.AccountGroupDTO;
import com.gic.cloud.dto.UserDTO; import com.gic.cloud.dto.UserDTO;
import com.gic.cloud.qo.UserQO; import com.gic.cloud.qo.UserQo;
import com.gic.cloud.service.*; import com.gic.cloud.service.*;
import com.gic.cloud.web.vo.*; import com.gic.cloud.web.vo.*;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
...@@ -23,7 +23,13 @@ import com.gic.enterprise.utils.ResultControllerUtils; ...@@ -23,7 +23,13 @@ import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils; import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.member.config.api.dto.OwnerMemberCardDTO; import com.gic.member.config.api.dto.OwnerMemberCardDTO;
import com.gic.member.config.api.service.MemberCardApiService; import com.gic.member.config.api.service.MemberCardApiService;
/**
* 用户
* @ClassName: UserController

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:58 AM

*/
@RestController @RestController
@RequestMapping("/user") @RequestMapping("/user")
public class UserController { public class UserController {
...@@ -108,16 +114,16 @@ public class UserController { ...@@ -108,16 +114,16 @@ public class UserController {
} }
@RequestMapping("/page-user") @RequestMapping("/page-user")
public RestResponse pageUser(UserQO userQO) { public RestResponse pageUser(UserQo userQo) {
userQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()); userQo.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return ResultControllerUtils.commonPageResult(userApiService.pageUser(userQO), UserVO.class); return ResultControllerUtils.commonPageResult(userApiService.pageUser(userQo), UserVO.class);
} }
@RequestMapping("/bulk-transfer-user-to-new-account-group") @RequestMapping("/bulk-transfer-user-to-new-account-group")
public RestResponse bulkTransferAccountGroup(String userIds, Integer targetAccountGroupId, boolean isAll) { public RestResponse bulkTransferAccountGroup(String userIds, Integer targetAccountGroupId, boolean isAll) {
List<Integer> userIdList = null; List<Integer> userIdList = null;
if (isAll) { if (isAll) {
ServiceResponse<List<UserDTO>> result = userApiService.listUser(new UserQO() ServiceResponse<List<UserDTO>> result = userApiService.listUser(new UserQo()
.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId())); .setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()));
if (result.isSuccess()) { if (result.isSuccess()) {
List<UserDTO> userList = result.getResult(); List<UserDTO> userList = result.getResult();
......
package com.gic.cloud.web.qo; package com.gic.cloud.web.qo;
/**test
* @ClassName: TestQo

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:58 AM

*/
public class TestQo { public class TestQo {
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 账号分组
* @ClassName: AccountGroupVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:54 AM

*/
public class AccountGroupVO implements Serializable{ public class AccountGroupVO implements Serializable{
private static final long serialVersionUID = 2326242081989824390L; private static final long serialVersionUID = 2326242081989824390L;
...@@ -60,4 +66,9 @@ public class AccountGroupVO implements Serializable{ ...@@ -60,4 +66,9 @@ public class AccountGroupVO implements Serializable{
this.memberCount = memberCount; this.memberCount = memberCount;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
...@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo; ...@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.io.Serializable; import java.io.Serializable;
/**
* 数据权限详情
* @ClassName: DataAuthDetailVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:56 AM

*/
public class DataAuthDetailVO implements Serializable{ public class DataAuthDetailVO implements Serializable{
private static final long serialVersionUID = 720678159449334770L; private static final long serialVersionUID = 720678159449334770L;
...@@ -126,4 +132,9 @@ public class DataAuthDetailVO implements Serializable{ ...@@ -126,4 +132,9 @@ public class DataAuthDetailVO implements Serializable{
this.noOwnerStore = noOwnerStore; this.noOwnerStore = noOwnerStore;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 数据权限
* @ClassName: DataAuthListVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:56 AM

*/
public class DataAuthListVO implements Serializable{ public class DataAuthListVO implements Serializable{
private static final long serialVersionUID = -7549685019392230748L; private static final long serialVersionUID = -7549685019392230748L;
...@@ -32,4 +38,9 @@ public class DataAuthListVO implements Serializable{ ...@@ -32,4 +38,9 @@ public class DataAuthListVO implements Serializable{
this.dataAuthName = dataAuthName; this.dataAuthName = dataAuthName;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 数据权限
* @ClassName: DataAuthVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:56 AM

*/
public class DataAuthVO implements Serializable{ public class DataAuthVO implements Serializable{
private static final long serialVersionUID = -6485807150571326830L; private static final long serialVersionUID = -6485807150571326830L;
...@@ -46,4 +52,9 @@ public class DataAuthVO implements Serializable{ ...@@ -46,4 +52,9 @@ public class DataAuthVO implements Serializable{
this.memberCount = memberCount; this.memberCount = memberCount;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
...@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo; ...@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.io.Serializable; import java.io.Serializable;
/**
* 功能详情
* @ClassName: FunctionDetailVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:55 AM

*/
public class FunctionDetailVO implements Serializable{ public class FunctionDetailVO implements Serializable{
private static final long serialVersionUID = -3211293345162922378L; private static final long serialVersionUID = -3211293345162922378L;
...@@ -53,4 +59,9 @@ public class FunctionDetailVO implements Serializable{ ...@@ -53,4 +59,9 @@ public class FunctionDetailVO implements Serializable{
this.functionComponent = functionComponent; this.functionComponent = functionComponent;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 功能
* @ClassName: FunctionListVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:55 AM

*/
public class FunctionListVO implements Serializable{ public class FunctionListVO implements Serializable{
private static final long serialVersionUID = 855201859340536651L; private static final long serialVersionUID = 855201859340536651L;
...@@ -32,4 +38,9 @@ public class FunctionListVO implements Serializable{ ...@@ -32,4 +38,9 @@ public class FunctionListVO implements Serializable{
this.functionName = functionName; this.functionName = functionName;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 功能模块
* @ClassName: FunctionModuleVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:55 AM

*/
public class FunctionModuleVO implements Serializable{ public class FunctionModuleVO implements Serializable{
private static final long serialVersionUID = -9142772989283876602L; private static final long serialVersionUID = -9142772989283876602L;
...@@ -61,4 +67,9 @@ public class FunctionModuleVO implements Serializable{ ...@@ -61,4 +67,9 @@ public class FunctionModuleVO implements Serializable{
this.logo = logo; this.logo = logo;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 功能
* @ClassName: FunctionVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:56 AM

*/
public class FunctionVO implements Serializable{ public class FunctionVO implements Serializable{
private static final long serialVersionUID = 2470057820888440245L; private static final long serialVersionUID = 2470057820888440245L;
...@@ -46,4 +52,9 @@ public class FunctionVO implements Serializable{ ...@@ -46,4 +52,9 @@ public class FunctionVO implements Serializable{
this.memberCount = memberCount; this.memberCount = memberCount;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
...@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo; ...@@ -3,7 +3,13 @@ package com.gic.cloud.web.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable; import java.io.Serializable;
/**
* 会员卡
* @ClassName: MemberCardVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:58 AM

*/
public class MemberCardVO implements Serializable{ public class MemberCardVO implements Serializable{
private static final long serialVersionUID = -8228087541902310573L; private static final long serialVersionUID = -8228087541902310573L;
...@@ -66,4 +72,9 @@ public class MemberCardVO implements Serializable{ ...@@ -66,4 +72,9 @@ public class MemberCardVO implements Serializable{
this.cardName = cardName; this.cardName = cardName;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 门店暂存区
* @ClassName: TempStoreConditionDetailVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:57 AM

*/
public class TempStoreConditionDetailVO implements Serializable{ public class TempStoreConditionDetailVO implements Serializable{
private static final long serialVersionUID = -7805642144310444982L; private static final long serialVersionUID = -7805642144310444982L;
...@@ -32,4 +38,9 @@ public class TempStoreConditionDetailVO implements Serializable{ ...@@ -32,4 +38,9 @@ public class TempStoreConditionDetailVO implements Serializable{
this.storeWidgetId = storeWidgetId; this.storeWidgetId = storeWidgetId;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
/**test
* @ClassName: TestVo

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:58 AM

*/
public class TestVo { public class TestVo {
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 用户详情
* @ClassName: UserDetailVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:55 AM

*/
public class UserDetailVO implements Serializable{ public class UserDetailVO implements Serializable{
private static final long serialVersionUID = -8143187697602019230L; private static final long serialVersionUID = -8143187697602019230L;
...@@ -103,4 +109,9 @@ public class UserDetailVO implements Serializable{ ...@@ -103,4 +109,9 @@ public class UserDetailVO implements Serializable{
this.functionAuthId = functionAuthId; this.functionAuthId = functionAuthId;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
/**
* 用户
* @ClassName: UserVO

* @Description: 

* @author guojuxing

* @date 2020/9/7 10:54 AM

*/
public class UserVO implements Serializable{ public class UserVO implements Serializable{
private static final long serialVersionUID = -3942964711245259430L; private static final long serialVersionUID = -3942964711245259430L;
...@@ -135,4 +141,9 @@ public class UserVO implements Serializable{ ...@@ -135,4 +141,9 @@ public class UserVO implements Serializable{
this.functionAuthName = functionAuthName; this.functionAuthName = functionAuthName;
return this; return this;
} }
@Override
public String toString() {
return super.toString();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment