pmd规范

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/GoDownComponent.java

@@ -87,11 +87,11 @@ public class GoDownComponent {
     }
 
     public LevelVo setValue(AbstractCommonQo params, BaseSalesVo vo){
-        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         /******线下渠道需要点击下钻，该值只会在线下时才会使用********/
-        LevelVo levelVo = this.storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
+        LevelVo levelVo = this.storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         if(params.getLevel() == null){
             params.setLevel(levelVo.getLevel());
         }
@@ -105,7 +105,7 @@ public class GoDownComponent {
         /****首页进入基础页面时，如果渠道为空，根据当前条件判断渠道，channel==null表示多渠道***/
         if(params.getChannel() == null){
             /**********设置层级名称，只有在首次进入页面会展示，下钻均显示返回上一级*********/
-            Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
+            Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
             params.setChannel(newChannel);
         }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
@@ -126,7 +126,7 @@ public class GoDownComponent {
 
 
     public void setValueTotal(AbstractCommonQo params, LevelVo levelVo){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         boolean isContainNoOwnership = (params.getChannel() == null || (params.getChannel() == StoreChannelEnum.OFFLINE.getChannel().intValue() && params.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
         if(isContainNoOwnership){
@@ -142,7 +142,7 @@ public class GoDownComponent {
     }
 
     public void setValueTotal(AbstractCommonQo params){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         if(wgs == 1){
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
@@ -157,7 +157,7 @@ public class GoDownComponent {
     }
 
     public void setValueWgs(AbstractCommonQo params, LevelVo levelVo){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue() && wgs == 1){
             params.setChannel(null);
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
@@ -174,7 +174,7 @@ public class GoDownComponent {
     }
 
     public void setValueWgs(AbstractCommonQo params){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         if(wgs == 1){
             params.setChannel(null);
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
@@ -224,7 +224,7 @@ public class GoDownComponent {
                 }
             }
             if(channel == StoreChannelEnum.OFFLINE.getChannel().intValue()){
-                List<ClerkDTO> clerkDTOS = new ArrayList<>();
+                List<ClerkDTO> clerkDtoS = new ArrayList<>();
 
                 if(level.intValue() == clerkLevel){
                     List<String> clerkIdList = page.getResult().stream().map(b -> {
@@ -232,18 +232,18 @@ public class GoDownComponent {
                         return baseSalesDTO.getAreaId() == null ? baseSalesDTO.getId() : baseSalesDTO.getAreaId();
                     }).collect(Collectors.toList());
                     log.info("clerkIdList:{}", JSON.toJSONString(clerkIdList));
-                    clerkDTOS = this.clerkApiService.listClerkByIds(enterpriseId, StringUtils.join(clerkIdList, ",")).getResult();
-                    log.info("clerkDtos:{}", clerkDTOS);
+                    clerkDtoS = this.clerkApiService.listClerkByIds(enterpriseId, StringUtils.join(clerkIdList, ",")).getResult();
+                    log.info("clerkDtos:{}", clerkDtoS);
                 }
-                final Map<Integer, ClerkDTO> clerkDTOMap = CollectionUtil.toMap(clerkDTOS, "clerkId");
-                log.info("clerkDTOMap:{}", JSON.toJSONString(clerkDTOMap));
+                final Map<Integer, ClerkDTO> clerkDtoMap = CollectionUtil.toMap(clerkDtoS, "clerkId");
+                log.info("clerkDTOMap:{}", JSON.toJSONString(clerkDtoMap));
                 page.getResult().stream().forEach(b -> {
                     BaseDTO baseSalesDTO = (BaseDTO) b;
                     baseSalesDTO.setLevel(level);
                     baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
                     baseSalesDTO.setHasChildren(level <= maxLevel ? 1 : 0);
-                    if(clerkDTOMap != null && level.intValue() == clerkLevel){
-                        ClerkDTO clerkDTO = clerkDTOMap.get(baseSalesDTO.getAreaId() == null ? Integer.valueOf(baseSalesDTO.getId()) : Integer.valueOf(baseSalesDTO.getAreaId()));
+                    if(clerkDtoMap != null && level.intValue() == clerkLevel){
+                        ClerkDTO clerkDTO = clerkDtoMap.get(baseSalesDTO.getAreaId() == null ? Integer.valueOf(baseSalesDTO.getId()) : Integer.valueOf(baseSalesDTO.getAreaId()));
                         if(clerkDTO != null){
                             baseSalesDTO.setName(clerkDTO.getClerkName());
                         }else{

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

@@ -56,20 +56,20 @@ public class IndexController {
     }
 
     @RequestMapping("index-sales")
-    public RestResponse indexSales(Integer userId, Integer enterpriseId, String searchJSON,
+    public RestResponse indexSales(Integer userId, Integer enterpriseId, String searchJson,
                                    DateTypeQo dateTypeQo, String mbrAreaId, Integer dataType){
-        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
-        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
+        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
+        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
         ServiceResponse<IndexSalesDTO> indexSales = this.indexSalesApiService.getIndexSales(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null, dateTypeQo.getType(), dateTypeQo.getDate(), dataType);
         return RestResponse.success(EntityUtil.changeEntityByJSON(IndexSalesVo.class, indexSales.getResult()));
     }
 
     @RequestMapping("index-member")
-    public RestResponse indexMember(Integer userId, Integer enterpriseId, String searchJSON,
+    public RestResponse indexMember(Integer userId, Integer enterpriseId, String searchJson,
                                    DateTypeQo dateTypeQo, String mbrAreaId){
-        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
-        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
+        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
+        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
         ServiceResponse<IndexMemberDTO> indexMember = this.indexSalesApiService.getIndexMember(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
@@ -78,10 +78,10 @@ public class IndexController {
     }
 
     @RequestMapping("index-consume")
-    public RestResponse indexConsume(Integer userId, Integer enterpriseId, String searchJSON,
+    public RestResponse indexConsume(Integer userId, Integer enterpriseId, String searchJson,
                                      DateTypeQo dateTypeQo, String mbrAreaId){
-        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
-        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
+        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
+        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
         ServiceResponse<IndexMemberOrderCntDTO> response1 = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
@@ -101,11 +101,11 @@ public class IndexController {
         log.info("birthOrderCnt:{}", JSON.toJSONString(birthOrderCnt));
         IndexConsume consume = new IndexConsume();
         if(response1.isSuccess() && response1.getResult() != null && response2.getResult() != null){
-            IndexMemberOrderCntDTO indexMemberOrderCntDTO1 = response1.getResult();
-            IndexMemberOrderCntDTO indexMemberOrderCntDTO2 = response2.getResult();
-            consume.setMemberRate(DataFormatUtils.rate(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCnt()));
-            String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCntHb()),
-                    DataFormatUtils.divideDouble(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCntHb()));
+            IndexMemberOrderCntDTO indexMemberOrderCntDto1 = response1.getResult();
+            IndexMemberOrderCntDTO indexMemberOrderCntDto2 = response2.getResult();
+            consume.setMemberRate(DataFormatUtils.rate(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCnt()));
+            String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCntHb()),
+                    DataFormatUtils.divideDouble(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCntHb()));
             consume.setMemberHb(divide);
         }
         if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){
@@ -140,8 +140,8 @@ public class IndexController {
     }
 
     @RequestMapping("get-level")
-    public RestResponse getLevel(Integer userId, Integer enterpriseId, String searchJSON){
-        LevelVo level = this.storeSearchUtils.getLevel(userId, enterpriseId, searchJSON);
+    public RestResponse getLevel(Integer userId, Integer enterpriseId, String searchJson){
+        LevelVo level = this.storeSearchUtils.getLevel(userId, enterpriseId, searchJson);
         List<LevelNameVo> list = new ArrayList<>();
         LevelNameVo vo1 = new LevelNameVo(1, "第一层级", 1 >= level.getLevel() && 1 <= level.getMaxLevel() ? 1: 0);
         LevelNameVo vo2 = new LevelNameVo(2, "第二层级", 2 >= level.getLevel() && 2 <= level.getMaxLevel() ? 1: 0);

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java

@@ -58,7 +58,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-distribution-trend")
     public RestResponse queryMemberDistributionTrend(MemberDistributionTrendQoAbstract params) {
         log.info("会员分布-趋势参数：{}", JSON.toJSONString(params));
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         params.setOnlineStoreIdList(new ArrayList<>());
         goDownComponent.setValueTotal(params);
@@ -126,7 +126,7 @@ public class MemberCloudDataController {
     public RestResponse queryMemberBasicPortrait(MemberPortraitQoAbstract params) {
         log.info("会员基础画像参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberBasicPortrait(params));
@@ -136,7 +136,7 @@ public class MemberCloudDataController {
     public RestResponse getMemberPortraitOverview(MemberPortraitQoAbstract params) {
         log.info("会员画像-概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.getMemberPortraitOverview(params));
@@ -146,7 +146,7 @@ public class MemberCloudDataController {
     public RestResponse queryMemberCustomPortrait(MemberCustomPortraitQoAbstract params) {
         log.info("会员自定义画像参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberCustomPortrait(params));
@@ -156,7 +156,7 @@ public class MemberCloudDataController {
     public RestResponse getMemberRecruitOverview(MemberOverviewQoAbstract params) {
         log.info("会员概况-会员招募概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.getMemberRecruitOverview(params));
@@ -166,7 +166,7 @@ public class MemberCloudDataController {
     public RestResponse queryMemberRecruitTrend(MemberOverviewQoAbstract params) {
         log.info("会员概况-会员招募趋势参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberRecruitTrend(params));
@@ -212,7 +212,7 @@ public class MemberCloudDataController {
         log.info("会员自定义画像-字段筛选参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         Integer enterpriseId = params.getEnterpriseId();
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         ServiceResponse<List<MemberCustomPortraitDTO>> fieldListRes = memberCloudDataApiService.listCustomField(params);

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreWidgetController.java

@@ -323,7 +323,7 @@ public class StoreWidgetController {
                 storeSearchDTO.setEnterpriseId(enterpriseId);
                 storeSearchDTO.setStoreInfoIds(StringUtils.join(storeAuth.getStoreInfoIdList(), " "));
                 Page<StoreDTO> result = this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize).getResult();
-                Map<Integer, AttentionStoreDTO> attentionStoreDTOMap = this.storeAttentionApiService.getAllAttenttionStore(userId, enterpriseId).getResult();
+                Map<Integer, AttentionStoreDTO> attentionStoreDtoMap = this.storeAttentionApiService.getAllAttenttionStore(userId, enterpriseId).getResult();
                 page.setTotalCount(result.getTotalCount());
                 page.setTotalPage(result.getTotalPage());
                 if(CollectionUtils.isNotEmpty(result.getResult())){
@@ -334,7 +334,7 @@ public class StoreWidgetController {
                         searchVo.setName(storeDTO.getStoreName());
                         searchVo.setIdChain((map.get(storeDTO.getStoreGroupId()) != null ? map.get(storeDTO.getStoreGroupId()).getIdChain() : "") + storeDTO.getStoreInfoId()+"_");
                         searchVo.setNameChain((map.get(storeDTO.getStoreGroupId())!= null ? map.get(storeDTO.getStoreGroupId()).getNameChain() : "") + storeDTO.getStoreName() + "/");
-                        searchVo.setHasAttention(attentionStoreDTOMap.get(storeDTO.getStoreInfoId()) == null ? 0 : 1);
+                        searchVo.setHasAttention(attentionStoreDtoMap.get(storeDTO.getStoreInfoId()) == null ? 0 : 1);
                         storeSearchVoList.add(searchVo);
                     }
                     page.setResult(storeSearchVoList);
@@ -397,10 +397,10 @@ public class StoreWidgetController {
     }
 
     @RequestMapping("get-store-count")
-    public RestResponse getStoreCount(String searchJSON, Integer userId, Integer enterpriseId){
-        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
-        List<String> stringList = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
-        log.info("getStoreCount:{},{},{},{},{}", searchJSON, userId, enterpriseId, list.size(), stringList.size());
+    public RestResponse getStoreCount(String searchJson, Integer userId, Integer enterpriseId){
+        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
+        List<String> stringList = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
+        log.info("getStoreCount:{},{},{},{},{}", searchJson, userId, enterpriseId, list.size(), stringList.size());
         return RestResponse.success(list.size() + stringList.size());
     }
 

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/qo/BaseSalesParamQo.java

@@ -10,7 +10,7 @@ public class BaseSalesParamQo {
     private Integer channel;
     private Integer userId;
     private Integer enterpriseId;
-    private String searchJSON;
+    private String searchJson;
     private Integer type;
     private String date;
     private String mbrAreaId;
@@ -45,12 +45,13 @@ public class BaseSalesParamQo {
         this.enterpriseId = enterpriseId;
     }
 
-    public String getSearchJSON() {
-        return searchJSON;
+    public String getSearchJson() {
+        return searchJson;
     }
 
-    public void setSearchJSON(String searchJSON) {
-        this.searchJSON = searchJSON;
+    public BaseSalesParamQo setSearchJson(String searchJson) {
+        this.searchJson = searchJson;
+        return this;
     }
 
     public Integer getType() {