Browse Source

静态代码扫描 - 编码规范调整,修复编码规范相关问题

yucheng 3 years ago
parent
commit
30b69f71ab
26 changed files with 192 additions and 213 deletions
  1. 6 6
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictDataMapServiceImpl.java
  2. 3 3
      dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictDataServiceImpl.java
  3. 6 4
      dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/rwd/demand/controller/DictionaryDemandController.java
  4. 1 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/CalRuleTypeEnum.java
  5. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/ComputationalStateEnum.java
  6. 1 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/utils/GeoToolsUtil.java
  7. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java
  8. 8 11
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/DigitalEquipClassRelServiceImpl.java
  9. 2 5
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/RelationDefineServiceImpl.java
  10. 5 9
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java
  11. 8 9
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java
  12. 2 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCalServiceImpl.java
  13. 1 2
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java
  14. 3 3
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/iot/service/impl/SettingIotServiceImpl.java
  15. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/parser/service/InfoDataFactory.java
  16. 1 0
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/parser/service/impl/BooleanInfoParser.java
  17. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/parser/service/impl/MEnumInfoParser.java
  18. 1 1
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/dao/EquipmentReportMapper.java
  19. 7 7
      dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/service/impl/EquipmentReportServiceImpl.java
  20. 1 3
      dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/config/HDFSFileConfiguration.java
  21. 1 1
      dmp-common/src/main/java/com/persagy/dmp/common/handler/CommonExceptionHandler.java
  22. 114 108
      dmp-common/src/main/java/com/persagy/dmp/common/utils/DateHelper.java
  23. 4 4
      dmp-common/src/main/java/com/persagy/dmp/common/utils/JsonHelper.java
  24. 0 8
      dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/storage/service/impl/HdfsStorageServiceImpl.java
  25. 0 4
      dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/storage/service/impl/MinioStorageServiceImpl.java
  26. 13 12
      dmp-server/src/main/java/com/persagy/aspects/RequestLogAspect.java

+ 6 - 6
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictDataMapServiceImpl.java

@@ -67,8 +67,8 @@ public class DictDataMapServiceImpl implements DictDataMapService {
      */
     @Override
     public DictDataMap update(DictDataMap vo) {
-        DictDataMap DictDataMap = dao.selectById(vo.getId());
-        if (DictDataMap == null || 0 == DictDataMap.getValid()) {
+        DictDataMap dictDataMap = dao.selectById(vo.getId());
+        if (dictDataMap == null || 0 == dictDataMap.getValid()) {
             throw new BusinessException("数据不存在!");
         }
         dao.updateById(vo);
@@ -82,12 +82,12 @@ public class DictDataMapServiceImpl implements DictDataMapService {
      */
     @Override
     public void delete(DictDataMap vo) {
-        DictDataMap DictDataMap = dao.selectById(vo.getId());
-        if (DictDataMap == null || 0 == DictDataMap.getValid()) {
+        DictDataMap dictDataMap = dao.selectById(vo.getId());
+        if (dictDataMap == null || 0 == dictDataMap.getValid()) {
             throw new BusinessException("数据不存在!");
         }
-        DictDataMap.setValid(ValidEnum.FALSE.getType());
-        dao.updateById(DictDataMap);
+        dictDataMap.setValid(ValidEnum.FALSE.getType());
+        dao.updateById(dictDataMap);
     }
 }
 

+ 3 - 3
dmp-business/dmp-dic/src/main/java/com/persagy/dmp/dic/service/impl/DictDataServiceImpl.java

@@ -76,8 +76,8 @@ public class DictDataServiceImpl implements DictDataService {
      */
     @Override
     public DictData update(DictData vo) {
-        DictData DictData = dao.selectById(vo.getId());
-        if (DictData == null || 0 == DictData.getValid()) {
+        DictData dictData = dao.selectById(vo.getId());
+        if (dictData == null || 0 == dictData.getValid()) {
             throw new BusinessException("数据不存在!");
         }
         dao.updateById(vo);
@@ -122,7 +122,7 @@ public class DictDataServiceImpl implements DictDataService {
         List<DictDataMap> dictDataMapList = dictDataMapService.queryByCondition(queryMapWrapper);
 
         //存储映射关系
-        Map<String, DictDataMap> dtDataMapMap = new HashMap<>();
+        Map<String, DictDataMap> dtDataMapMap = new HashMap<>(16);
         for(DictDataMap dictDataMap : dictDataMapList){
            dtDataMapMap.put(dictDataMap.getTargetCode(),dictDataMap);
         }

+ 6 - 4
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/rwd/demand/controller/DictionaryDemandController.java

@@ -58,8 +58,9 @@ public class DictionaryDemandController {
     public CommonResult<DictionaryDemand> save(@Valid @RequestBody DictionaryDemand vo) {
         ParamCheckUtil.checkParam(CommonConstant.QUERY_USERID);
         // 校验
-        if(vo.getBillState() != null && !(DemandBillState.SAVING.getIndex().equals(vo.getBillState())
-                || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState()))) {
+        boolean canEdit = vo.getBillState() != null && (DemandBillState.SAVING.getIndex().equals(vo.getBillState())
+                || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState()));
+        if(!canEdit) {
             throw new BusinessException("只有待提交和待完善的需求可以修改");
         }
         vo = service.saveOrSubmit(vo, false);
@@ -75,8 +76,9 @@ public class DictionaryDemandController {
     public CommonResult<DictionaryDemand> submit(@Valid @RequestBody DictionaryDemand vo) {
         ParamCheckUtil.checkParam(CommonConstant.QUERY_USERID);
         // 校验
-        if(vo.getBillState() != null && !(DemandBillState.SAVING.getIndex().equals(vo.getBillState())
-                || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState()))) {
+        boolean canEdit = vo.getBillState() != null && (DemandBillState.SAVING.getIndex().equals(vo.getBillState())
+                || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState()));
+        if(!canEdit) {
             throw new BusinessException("只有待提交和待完善的需求可以修改");
         }
         vo = service.saveOrSubmit(vo, true);

+ 1 - 5
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/CalRuleTypeEnum.java

@@ -1,10 +1,6 @@
 package com.persagy.dmp.rwd.basic.constant;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.EnumUtil;
-import lombok.Data;
 import lombok.Getter;
-import lombok.Setter;
 import org.apache.commons.lang3.EnumUtils;
 
 import java.util.List;
@@ -19,7 +15,7 @@ import java.util.stream.Collectors;
  */
 @Getter
 public enum CalRuleTypeEnum {
-
+    /** 计算规则种类 */
     REL_CHAIN("1","relChainCalculateService"),
     COORDINATE("2","coordinateCalculateService");
 

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/constant/ComputationalStateEnum.java

@@ -10,7 +10,7 @@ import lombok.Getter;
  */
 @Getter
 public enum ComputationalStateEnum {
-
+    /** 计算状态 */
     INIT(1,"初始状态"),
     NEED_COMPUTE(2,"需要计算"),
     COMPUTING(3,"计算中"),

+ 1 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/utils/GeoToolsUtil.java

@@ -55,8 +55,7 @@ public class GeoToolsUtil {
         //注意数据的闭合
         Coordinate[] coordinates = objects.toArray(new Coordinate[0]);
         LinearRing ring = geometryFactory.createLinearRing(coordinates);
-        LinearRing holes[] = null;
-        Polygon polygon = geometryFactory.createPolygon(ring, holes);
+        Polygon polygon = geometryFactory.createPolygon(ring, null);
 
         return polygon;
    }

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java

@@ -109,7 +109,7 @@ public class ObjectInfoController {
         if (StrUtil.isNotBlank(objectTypeDefine.getParentCode())){
             arrayNode.add(objectTypeDefine.getParentCode());
         }
-        objectNode.put(ObjectDigital.CLASS_CODE_HUM,arrayNode);
+        objectNode.set(ObjectDigital.CLASS_CODE_HUM,arrayNode);
     }
 
     @PostMapping("/create")

+ 8 - 11
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/DigitalEquipClassRelServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.dmp.basic.dto.DefineRequestData;
-import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.common.constant.ResponseCode;
@@ -20,7 +19,6 @@ import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.DigitalEquipClassRel;
 import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
 import com.persagy.dmp.rwd.define.dao.DigitalEquipClassRelMapper;
 import com.persagy.dmp.rwd.define.service.DigitalEquipClassRelService;
 import com.persagy.dmp.rwd.define.service.IRelationDefineService;
@@ -60,17 +58,16 @@ implements DigitalEquipClassRelService {
         Set<String> calcNames = new HashSet<>();
         // 1.如果关系类型code与图类型编码为空且calcName为空则报错
         for (DigitalEquipClassRel vo : voList) {
-            if ((StrUtil.isBlank(vo.getGraphCode())
-                    || StrUtil.isBlank(vo.getRelCode()))
-                    && StrUtil.isBlank(vo.getCalcName())){
-                throw new BusinessException(ResponseCode.A0402.getCode(),"缺少图类型编码和关系类型编码");
-            }
             if (StrUtil.isNotBlank(vo.getCalcName())){
                 calcNames.add(vo.getCalcName());
+                continue;
+            }
+            if (StrUtil.isBlank(vo.getGraphCode()) || StrUtil.isBlank(vo.getRelCode())){
+                throw new BusinessException(ResponseCode.A0402.getCode(),"缺少图类型编码和关系类型编码");
             }
         }
         // 2.根据名称填充图类型编码及关系类型编码
-        Map<String, RelationDefine> relationDefineMap = new HashMap<>();
+        Map<String, RelationDefine> relationDefineMap = new HashMap<>(16);
         if (CollUtil.isNotEmpty(calcNames)){
             // 根据名称查询图类型编码和关系类型编码
             List<RelationDefine> defines = queryRelationDefinesByRelNames(calcNames);
@@ -193,7 +190,7 @@ implements DigitalEquipClassRelService {
         if (StrUtil.isNotBlank(AppContext.getContext().getProjectId())){
             queryWrapper.eq(DigitalEquipClassRel::getProjectId,AppContext.getContext().getProjectId());
         }
-        Map<String, String> relNameMap = new HashMap<>();
+        Map<String, String> relNameMap = new HashMap<>(16);
         if (CollUtil.isNotEmpty(defineRequestData.getRelNames())){
             queryWrapper.and(wrapper->{
                 Set<String> relNames = defineRequestData.getRelNames();
@@ -230,12 +227,12 @@ implements DigitalEquipClassRelService {
      */
     private Map<String, RelationDefine> queryRelationDefineMapByRelNames(Set<String> relNames) {
         if (CollUtil.isEmpty(relNames)){
-            return new HashMap<>();
+            return new HashMap<>(16);
         }
         // 1.根据边类型名称查询边类型定义
         List<RelationDefine> defines = queryRelationDefinesByRelNames(relNames);
         if (CollUtil.isEmpty(defines)){
-            return new HashMap<>();
+            return new HashMap<>(16);
         }
         // 获得名称与边类型的映射
         return defines.stream()

+ 2 - 5
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/RelationDefineServiceImpl.java

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.persagy.dmp.common.constant.ValidEnum;
-import com.persagy.dmp.define.entity.DigitalEquipClassRel;
 import com.persagy.dmp.define.entity.RelationDefine;
-import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
-import com.persagy.dmp.rwd.define.dao.DigitalEquipClassRelMapper;
 import com.persagy.dmp.rwd.define.dao.RelationDefineMapper;
 import com.persagy.dmp.rwd.define.service.IRelationDefineService;
 import org.springframework.stereotype.Service;
@@ -81,7 +78,7 @@ public class RelationDefineServiceImpl  extends ServiceImpl<RelationDefineMapper
     public Map<String, RelationDefine> queryRelMapByCodes(Set<String> graphCodes, Set<String> relCodes) {
         if (CollUtil.isEmpty(graphCodes)
                 || CollUtil.isEmpty(relCodes)){
-            return new HashMap<>();
+            return new HashMap<>(16);
         }
         LambdaQueryWrapper<RelationDefine> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(RelationDefine::getGraphCode,graphCodes);
@@ -89,7 +86,7 @@ public class RelationDefineServiceImpl  extends ServiceImpl<RelationDefineMapper
         queryWrapper.eq(RelationDefine::getValid,true);
         List<RelationDefine> relationDefines = this.list(queryWrapper);
         if (CollUtil.isEmpty(relationDefines)){
-            return new HashMap<>();
+            return new HashMap<>(16);
         }
         return relationDefines.stream().collect(Collectors.toMap(relationDefine -> relationDefine.getGraphCode()
                 + StrUtil.UNDERLINE+relationDefine.getCode(),relationDefine -> relationDefine,(k1,k2)->k1));

+ 5 - 9
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectDigitalController.java

@@ -4,16 +4,15 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.mysql.cj.xdevapi.JsonArray;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.model.QueryOperator;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
 import com.persagy.dmp.basic.validations.QueryClassCodeVadition;
 import com.persagy.dmp.basic.validations.QueryFloorIdVadition;
 import com.persagy.dmp.basic.validations.QuerySpaceIdVadition;
@@ -28,9 +27,6 @@ import com.persagy.dmp.common.utils.ParamCheckUtil;
 import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
-import com.persagy.dmp.mybatis.utils.ConditionUtil;
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
-import com.persagy.dmp.rwd.basic.constant.BusinessErrorRwdCode;
 import com.persagy.dmp.rwd.basic.constant.DigitalObjectType;
 import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
 import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
@@ -330,7 +326,7 @@ public class ObjectDigitalController{
         if (StrUtil.isNotBlank(requestData.getClassCode())){
             ObjectNode classCodeObj = objectMapper.createObjectNode();
             classCodeObj.put(QueryOperator.LIKE_RIGHT.getIndex(),requestData.getClassCode());
-            objectNode.put(ObjectDigital.CLASS_CODE_HUM,classCodeObj);
+            objectNode.set(ObjectDigital.CLASS_CODE_HUM,classCodeObj);
         }
         // 楼层id
         if (StrUtil.isNotBlank(requestData.getFloorId())){
@@ -338,7 +334,7 @@ public class ObjectDigitalController{
             ObjectNode criteriaObj = objectMapper.createObjectNode();
             criteriaObj.put(ObjectRelation.REL_CODE_HUM, DigitalRelCode.EQ_2_FL.getIndex());
             criteriaObj.put(ObjectRelation.OBJ_TO_HUM, requestData.getFloorId());
-            objectNode.put(ObjectRelation.RELATION_FROM_HUM,criteriaObj);
+            objectNode.set(ObjectRelation.RELATION_FROM_HUM,criteriaObj);
         }
         // 系统id
         if (StrUtil.isNotBlank(requestData.getSystemId())){
@@ -346,7 +342,7 @@ public class ObjectDigitalController{
             ObjectNode criteriaObj = objectMapper.createObjectNode();
             criteriaObj.put(ObjectRelation.REL_CODE_HUM, DigitalRelCode.SY_2_EQ.getIndex());
             criteriaObj.put(ObjectRelation.OBJ_FROM_HUM, requestData.getFloorId());
-            objectNode.put(ObjectRelation.RELATION_TO_HUM,criteriaObj);
+            objectNode.set(ObjectRelation.RELATION_TO_HUM,criteriaObj);
         }
         // installLocation安装位置
         if (StrUtil.isNotBlank(requestData.getInstallLocation())){
@@ -368,7 +364,7 @@ public class ObjectDigitalController{
         if (StrUtil.isNotBlank(requestData.getKeyword())){
             ObjectNode keywordObj = objectMapper.createObjectNode();
             keywordObj.put(QueryOperator.LIKE.getIndex(),requestData.getKeyword());
-            objectNode.put(ObjectDigital.LOCAL_NAME_HUM,keywordObj);
+            objectNode.set(ObjectDigital.LOCAL_NAME_HUM,keywordObj);
         }
         // 传值数组
         if (CollUtil.isNotEmpty(requestData.getProjectIds())){

+ 8 - 9
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -45,7 +45,6 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -144,11 +143,11 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
             ObjectDigital newDbVO = dbVO;
             // 合并通用信息点数据
             if (!vo.getObjType().equals(vo.getClassCode())){
-                Map<String, ObjectInfoDefine> commonInfoMap = allInfoMap.getOrDefault(vo.getObjType(), new HashMap<>());
+                Map<String, ObjectInfoDefine> commonInfoMap = allInfoMap.getOrDefault(vo.getObjType(), new HashMap<>(16));
                 dataMerge(newDbVO,vo,commonInfoMap,fieldSet);
             }
             // 合并对象分类信息点数据
-            Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.getOrDefault(vo.getClassCode(),new HashMap<>());
+            Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.getOrDefault(vo.getClassCode(),new HashMap<>(16));
             dataMerge(newDbVO,vo,infoDefineMap,fieldSet);
 
             //移除需要删除的信息点
@@ -657,7 +656,7 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
         // 信息点校验器
         for(ObjectDigital vo:voList) {
             //设置自定义信息点
-            Map<String, ObjectInfoDefine> infoMap = new HashMap<>();
+            Map<String, ObjectInfoDefine> infoMap = new HashMap<>(16);
             if(CollUtil.isNotEmpty(allInfoMap)){
                 Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.get(vo.getClassCode());
                 if(CollUtil.isNotEmpty(infoDefineMap)){
@@ -667,7 +666,7 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
             String objType = objTypeMap.getOrDefault(vo.getClassCode(),"");
             //设置通用信息点
             if(!objType.equals(vo.getClassCode()) && MapUtil.isNotEmpty(allInfoMap)){
-                Map<String, ObjectInfoDefine> commonInfoDefineMap = allInfoMap.getOrDefault(objType,new HashMap<>());
+                Map<String, ObjectInfoDefine> commonInfoDefineMap = allInfoMap.getOrDefault(objType,new HashMap<>(16));
                 if(null!=commonInfoDefineMap && commonInfoDefineMap.size()>0){
                     infoMap.putAll(commonInfoDefineMap);
                 }
@@ -704,7 +703,7 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
      * @return
      */
     private Map<String, Object> getRemoveInfo(List<ObjectDigital> voList){
-        Map<String, Object> removeMap = new HashMap<>();
+        Map<String, Object> removeMap = new HashMap<>(16);
         for (ObjectDigital digital : voList) {
             ObjectNode infos = digital.getInfos();
             if(infos!=null){
@@ -789,16 +788,16 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
      * 删除需要移除的信息点
      * @param dbVO
      * @param remove
-     * @param BasicfieldSet
+     * @param basicFieldSet
      */
-    private void remove(ObjectDigital dbVO,Object remove,Set<String> BasicfieldSet){
+    private void remove(ObjectDigital dbVO,Object remove,Set<String> basicFieldSet){
         if(remove == null){
             return;
         }
         JSONArray array = JSONArray.parseArray(remove.toString());
         array.forEach(item->{
             String removeCode = (String) item;
-            if(BasicfieldSet.contains(removeCode)){
+            if(basicFieldSet.contains(removeCode)){
                 //基础信息
                 if("name".equals(removeCode)){
                     dbVO.setName(null);

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCalServiceImpl.java

@@ -376,7 +376,7 @@ public class RelationCalServiceImpl implements RelationCalService {
      */
     private Map<String, ObjectRelation> queryObjectRelationMapByFromIdAndToIds(String fromId, List<String> toIds) {
         if (StrUtil.isBlank(fromId) || CollUtil.isEmpty(toIds)){
-            return new HashMap<>();
+            return new HashMap<>(16);
         }
         LambdaQueryWrapper<ObjectRelation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(ObjectRelation::getObjTo,toIds);
@@ -384,7 +384,7 @@ public class RelationCalServiceImpl implements RelationCalService {
         queryWrapper.eq(ObjectRelation::getValid,true);
         List<ObjectRelation> objectRelations = objectRelationService.list(queryWrapper);
         if (CollUtil.isEmpty(objectRelations)){
-            return new HashMap<>();
+            return new HashMap<>(16);
         }
         return objectRelations.stream()
                 .collect(Collectors.toMap(objectRelation -> StrUtil.format(CommonConstant.RELATION_UNIQUE_KEY_FORMAT,

+ 1 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/utils/ObjectDigitalCriteriaHelper.java

@@ -16,7 +16,6 @@ import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.*;
 
@@ -82,7 +81,7 @@ public class ObjectDigitalCriteriaHelper {
      */
     private static void ensureJsonCond(ObjectNode criteria) {
         Iterator<String> fieldNames = criteria.fieldNames();
-        Map<String, JsonNode> valueMap = new HashMap<>();
+        Map<String, JsonNode> valueMap = new HashMap<>(16);
         while (fieldNames.hasNext()) {
             String infoCode = fieldNames.next();
             // 20210903 grouping字段特殊处理,解决mysql关键字问题

+ 3 - 3
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/iot/service/impl/SettingIotServiceImpl.java

@@ -3,7 +3,6 @@ package com.persagy.dmp.rwd.iot.service.impl;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -87,7 +86,7 @@ public class SettingIotServiceImpl implements SettingIotService {
         //查询虚拟信息点
         Map<String, List<String>> virtualCodeMap = getVirtualCodeMap(param);
 
-        Map<String, Set<String>> virtualPointCache = new HashMap<>();
+        Map<String, Set<String>> virtualPointCache = new HashMap<>(16);
         for (SettingDataModel model : param) {
             model.setStatus("success");
 
@@ -119,7 +118,8 @@ public class SettingIotServiceImpl implements SettingIotService {
             ObjectNode point = pointValueList.addObject();
             point.put("meter", meter);
             point.put("funcid", Long.parseLong(function));
-            point.put("data", model.getValue()); // TODO 要细分类型
+            // TODO 要细分类型
+            point.put("data", model.getValue());
 
             //设置虚拟信息点
             if (!virtualPointCache.containsKey(objectId)) {

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/parser/service/InfoDataFactory.java

@@ -48,7 +48,7 @@ public class InfoDataFactory {
             parserMap.put(DigitalDataType.INTEGER.getIndex(), new IntegerInfoParser());
             parserMap.put(DigitalDataType.STRING.getIndex(), new StringInfoParser());
             parserMap.put(DigitalDataType.PIC.getIndex(), new PicInfoParser());
-            parserMap.put(DigitalDataType.MENUM.getIndex(), new MEnumInfoParser());
+            parserMap.put(DigitalDataType.MENUM.getIndex(), new MenumInfoParser());
         }
         // 校验类型传值
         if(!parserMap.containsKey(dataType)) {

+ 1 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/parser/service/impl/BooleanInfoParser.java

@@ -47,6 +47,7 @@ public class BooleanInfoParser extends AbstractInfoDataParser {
      * @param <T>
      * @return
      */
+    @Override
     protected <T> T formatValue(JsonNode value, Class<T> clazz) throws IOException {
         if(value == null || JsonNodeType.NULL == value.getNodeType()) {
             return null;

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/parser/service/impl/MEnumInfoParser.java

@@ -17,7 +17,7 @@ import java.util.Set;
  * @author Charlie Yu
  * @date 2021-08-11
  */
-public class MEnumInfoParser extends AbstractInfoDataParser {
+public class MenumInfoParser extends AbstractInfoDataParser {
 
     @Override
     protected void validateDefine(ParserResult result) throws IOException {

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/dao/EquipmentReportMapper.java

@@ -36,7 +36,7 @@ public interface EquipmentReportMapper {
      * @date :2021/9/13 21:50
      * Update By lijie 2021/9/13 21:50
      */
-    List<Map<String, Object>> queryObjectCountByObjInfos(@Param("param") RequestData requestData,@Param("groups") List<GroupDTO> groupDTOS);
+    List<Map<String, Object>> queryObjectCountByObjInfos(@Param("param") RequestData requestData,@Param("groups") List<GroupDTO> groups);
 
     /**
      * 统计当前设备下部件分类及数量

+ 7 - 7
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/service/impl/EquipmentReportServiceImpl.java

@@ -37,15 +37,15 @@ public class EquipmentReportServiceImpl implements IEquipmentReportService {
     public List<Map<String, Object>> queryExpectScrapCountByProjects(List<String> projectIds) {
         Date date = DateHelper.addMonth(new Date(), 6);
         // 日期格式,标准字典是yyyy-MM-dd,应该不会改。有改动再改为查字典获取格式
-        String scrapDate = DateHelper.DateToString(date, "yyyy-MM-dd");
+        String scrapDate = DateHelper.dateToString(date, "yyyy-MM-dd");
         return mapper.queryExpectScrapCountByProjects(scrapDate, projectIds);
     }
 
     @Override
     public List<CountTypeEquipmentVO> queryEquipmentCountByType(List<String> projectIds) {
         // TODO 获取专业、系统的code,name对照 - 先不转了,回头再加
-        Map<String, String> majorMap = new HashMap<>();
-        Map<String, String> systemMap = new HashMap<>();
+        Map<String, String> majorMap = new HashMap<>(16);
+        Map<String, String> systemMap = new HashMap<>(16);
         // 项目不为空,把平台级和集团级的加上
         if(CollUtil.isNotEmpty(projectIds)) {
             projectIds.add(CommonConstant.DEFAULT_ID);
@@ -69,15 +69,15 @@ public class EquipmentReportServiceImpl implements IEquipmentReportService {
         requestData.setProjectId(AppContext.getContext().getProjectId());
         Set<String> digitalFields = ObjectDigitalCriteriaHelper.DIGITAL_FIELDS;
         List<String> groups = requestData.getGroups();
-        List<GroupDTO> groupDTOS = new ArrayList<>();
+        List<GroupDTO> groupDos = new ArrayList<>();
         for (String group : groups) {
             if (digitalFields.contains(group)){
-                groupDTOS.add(GroupDTO.builder().field(group).column(StrUtil.toUnderlineCase(group)).fieldFlag(true).build());
+                groupDos.add(GroupDTO.builder().field(group).column(StrUtil.toUnderlineCase(group)).fieldFlag(true).build());
                 continue;
             }
-            groupDTOS.add(GroupDTO.builder().field(group).column(group).fieldFlag(false).build());
+            groupDos.add(GroupDTO.builder().field(group).column(group).fieldFlag(false).build());
         }
-        return mapper.queryObjectCountByObjInfos(requestData,groupDTOS);
+        return mapper.queryObjectCountByObjInfos(requestData,groupDos);
     }
 
     /**

+ 1 - 3
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/config/HDFSFileConfiguration.java

@@ -2,9 +2,7 @@ package com.persagy.dmp.file.config;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import com.persagy.dmp.file.service.IFileService;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -13,7 +11,7 @@ import java.util.Map;
 @Data
 @Configuration
 @ConfigurationProperties(prefix = "persagy.hdfs.file")
-public class HDFSFileConfiguration {
+public class HdfsFileConfiguration {
 
     private static Map<String,String> accounts;
 

+ 1 - 1
dmp-common/src/main/java/com/persagy/dmp/common/handler/CommonExceptionHandler.java

@@ -51,7 +51,7 @@ public class CommonExceptionHandler {
      * @return
      */
     @ExceptionHandler(SQLException.class)
-    public CommonResult handleSQLException(SQLException e) {
+    public CommonResult handleSqlException(SQLException e) {
         log.error(e.getMessage(), e);
         return ResultHelper.failure(ResponseCode.A0400.getCode(), e.getMessage());
     }

+ 114 - 108
dmp-common/src/main/java/com/persagy/dmp/common/utils/DateHelper.java

@@ -18,9 +18,9 @@ import java.util.*;
 @Slf4j
 public class DateHelper {
 
-	private static final ThreadLocal<SimpleDateFormat> threadLocal = new ThreadLocal<SimpleDateFormat>();
+	private static final ThreadLocal<SimpleDateFormat> THREAD_LOCAL = new ThreadLocal<>();
 
-	private static final Object object = new Object();
+	private static final Object INSTANCE = new Object();
 
 	/**
 	 * 获取SimpleDateFormat
@@ -30,13 +30,13 @@ public class DateHelper {
 	 * @throws RuntimeException 异常:非法日期格式
 	 */
 	private static SimpleDateFormat getDateFormat(String pattern) throws RuntimeException {
-		SimpleDateFormat dateFormat = threadLocal.get();
+		SimpleDateFormat dateFormat = THREAD_LOCAL.get();
 		if (dateFormat == null) {
-			synchronized (object) {
+			synchronized (INSTANCE) {
 				if (dateFormat == null) {
 					dateFormat = new SimpleDateFormat(pattern);
 					dateFormat.setLenient(false);
-					threadLocal.set(dateFormat);
+					THREAD_LOCAL.set(dateFormat);
 				}
 			}
 		}
@@ -73,9 +73,9 @@ public class DateHelper {
 		String dateString = null;
 		DateStyle dateStyle = getDateStyle(date);
 		if (dateStyle != null) {
-			Date myDate = StringToDate(date, dateStyle);
+			Date myDate = stringToDate(date, dateStyle);
 			myDate = addInteger(myDate, dateType, amount);
-			dateString = DateToString(myDate, dateStyle);
+			dateString = dateToString(myDate, dateStyle);
 		}
 		return dateString;
 	}
@@ -124,7 +124,7 @@ public class DateHelper {
 	private static Date getAccurateDate(List<Long> timestamps) {
 		Date date = null;
 		long timestamp = 0;
-		Map<Long, long[]> map = new HashMap<Long, long[]>();
+		Map<Long, long[]> map = new HashMap<>(16);
 		List<Long> absoluteValues = new ArrayList<Long>();
 
 		if (timestamps != null && timestamps.size() > 0) {
@@ -194,8 +194,8 @@ public class DateHelper {
 	 */
 	public static DateStyle getDateStyle(String date) {
 		DateStyle dateStyle = null;
-		Map<Long, DateStyle> map = new HashMap<Long, DateStyle>();
-		List<Long> timestamps = new ArrayList<Long>();
+		Map<Long, DateStyle> map = new HashMap<>(16);
+		List<Long> timestamps = new ArrayList<>();
 		for (DateStyle style : DateStyle.values()) {
 			if (style.isShowOnly()) {
 				continue;
@@ -229,9 +229,9 @@ public class DateHelper {
 	 * @param date 日期字符串
 	 * @return 日期
 	 */
-	public static Date StringToDate(String date) {
+	public static Date stringToDate(String date) {
 		DateStyle dateStyle = getDateStyle(date);
-		return StringToDate(date, dateStyle);
+		return stringToDate(date, dateStyle);
 	}
 
 	/**
@@ -241,7 +241,7 @@ public class DateHelper {
 	 * @param pattern 日期格式
 	 * @return 日期
 	 */
-	public static Date StringToDate(String date, String pattern) {
+	public static Date stringToDate(String date, String pattern) {
 		Date myDate = null;
 		if (date != null) {
 			try {
@@ -259,10 +259,10 @@ public class DateHelper {
 	 * @param dateStyle 日期风格
 	 * @return 日期
 	 */
-	public static Date StringToDate(String date, DateStyle dateStyle) {
+	public static Date stringToDate(String date, DateStyle dateStyle) {
 		Date myDate = null;
 		if (dateStyle != null) {
-			myDate = StringToDate(date, dateStyle.getValue());
+			myDate = stringToDate(date, dateStyle.getValue());
 		}
 		return myDate;
 	}
@@ -274,7 +274,7 @@ public class DateHelper {
 	 * @param pattern 日期格式
 	 * @return 日期字符串
 	 */
-	public static String DateToString(Date date, String pattern) {
+	public static String dateToString(Date date, String pattern) {
 		String dateString = null;
 		if (date != null) {
 			try {
@@ -292,10 +292,10 @@ public class DateHelper {
 	 * @param dateStyle 日期风格
 	 * @return 日期字符串
 	 */
-	public static String DateToString(Date date, DateStyle dateStyle) {
+	public static String dateToString(Date date, DateStyle dateStyle) {
 		String dateString = null;
 		if (dateStyle != null) {
-			dateString = DateToString(date, dateStyle.getValue());
+			dateString = dateToString(date, dateStyle.getValue());
 		}
 		return dateString;
 	}
@@ -307,9 +307,9 @@ public class DateHelper {
 	 * @param newPattern 新日期格式
 	 * @return 新日期字符串
 	 */
-	public static String StringToString(String date, String newPattern) {
+	public static String stringToString(String date, String newPattern) {
 		DateStyle oldDateStyle = getDateStyle(date);
-		return StringToString(date, oldDateStyle, newPattern);
+		return stringToString(date, oldDateStyle, newPattern);
 	}
 
 	/**
@@ -319,9 +319,9 @@ public class DateHelper {
 	 * @param newDateStyle 新日期风格
 	 * @return 新日期字符串
 	 */
-	public static String StringToString(String date, DateStyle newDateStyle) {
+	public static String stringToString(String date, DateStyle newDateStyle) {
 		DateStyle oldDateStyle = getDateStyle(date);
-		return StringToString(date, oldDateStyle, newDateStyle);
+		return stringToString(date, oldDateStyle, newDateStyle);
 	}
 
 	/**
@@ -332,8 +332,8 @@ public class DateHelper {
 	 * @param newPattern 新日期格式
 	 * @return 新日期字符串
 	 */
-	public static String StringToString(String date, String olddPattern, String newPattern) {
-		return DateToString(StringToDate(date, olddPattern), newPattern);
+	public static String stringToString(String date, String olddPattern, String newPattern) {
+		return dateToString(stringToDate(date, olddPattern), newPattern);
 	}
 
 	/**
@@ -344,10 +344,10 @@ public class DateHelper {
 	 * @param newParttern 新日期格式
 	 * @return 新日期字符串
 	 */
-	public static String StringToString(String date, DateStyle olddDteStyle, String newParttern) {
+	public static String stringToString(String date, DateStyle olddDteStyle, String newParttern) {
 		String dateString = null;
 		if (olddDteStyle != null) {
-			dateString = StringToString(date, olddDteStyle.getValue(), newParttern);
+			dateString = stringToString(date, olddDteStyle.getValue(), newParttern);
 		}
 		return dateString;
 	}
@@ -360,10 +360,10 @@ public class DateHelper {
 	 * @param newDateStyle 新日期风格
 	 * @return 新日期字符串
 	 */
-	public static String StringToString(String date, String olddPattern, DateStyle newDateStyle) {
+	public static String stringToString(String date, String olddPattern, DateStyle newDateStyle) {
 		String dateString = null;
 		if (newDateStyle != null) {
-			dateString = StringToString(date, olddPattern, newDateStyle.getValue());
+			dateString = stringToString(date, olddPattern, newDateStyle.getValue());
 		}
 		return dateString;
 	}
@@ -376,10 +376,10 @@ public class DateHelper {
 	 * @param newDateStyle 新日期风格
 	 * @return 新日期字符串
 	 */
-	public static String StringToString(String date, DateStyle olddDteStyle, DateStyle newDateStyle) {
+	public static String stringToString(String date, DateStyle olddDteStyle, DateStyle newDateStyle) {
 		String dateString = null;
 		if (olddDteStyle != null && newDateStyle != null) {
-			dateString = StringToString(date, olddDteStyle.getValue(), newDateStyle.getValue());
+			dateString = stringToString(date, olddDteStyle.getValue(), newDateStyle.getValue());
 		}
 		return dateString;
 	}
@@ -523,7 +523,7 @@ public class DateHelper {
 	 * @return 年份
 	 */
 	public static int getYear(String date) {
-		return getYear(StringToDate(date));
+		return getYear(stringToDate(date));
 	}
 
 	/**
@@ -543,7 +543,7 @@ public class DateHelper {
 	 * @return 月份
 	 */
 	public static int getMonth(String date) {
-		return getMonth(StringToDate(date));
+		return getMonth(stringToDate(date));
 	}
 
 	/**
@@ -563,7 +563,7 @@ public class DateHelper {
 	 * @return 天
 	 */
 	public static int getDay(String date) {
-		return getDay(StringToDate(date));
+		return getDay(stringToDate(date));
 	}
 
 	/**
@@ -583,7 +583,7 @@ public class DateHelper {
 	 * @return 小时
 	 */
 	public static int getHour(String date) {
-		return getHour(StringToDate(date));
+		return getHour(stringToDate(date));
 	}
 
 	/**
@@ -603,7 +603,7 @@ public class DateHelper {
 	 * @return 分钟
 	 */
 	public static int getMinute(String date) {
-		return getMinute(StringToDate(date));
+		return getMinute(stringToDate(date));
 	}
 
 	/**
@@ -623,7 +623,7 @@ public class DateHelper {
 	 * @return 秒钟
 	 */
 	public static int getSecond(String date) {
-		return getSecond(StringToDate(date));
+		return getSecond(stringToDate(date));
 	}
 
 	/**
@@ -643,7 +643,7 @@ public class DateHelper {
 	 * @return 日期
 	 */
 	public static String getDate(String date) {
-		return StringToString(date, DateStyle.YYYY_MM_DD);
+		return stringToString(date, DateStyle.YYYY_MM_DD);
 	}
 
 	/**
@@ -653,7 +653,7 @@ public class DateHelper {
 	 * @return 日期
 	 */
 	public static String getDate(Date date) {
-		return DateToString(date, DateStyle.YYYY_MM_DD);
+		return dateToString(date, DateStyle.YYYY_MM_DD);
 	}
 
 	/**
@@ -663,7 +663,7 @@ public class DateHelper {
 	 * @return 时间
 	 */
 	public static String getTime(String date) {
-		return StringToString(date, DateStyle.HH_MM_SS);
+		return stringToString(date, DateStyle.HH_MM_SS);
 	}
 
 	/**
@@ -673,7 +673,7 @@ public class DateHelper {
 	 * @return 时间
 	 */
 	public static String getTime(Date date) {
-		return DateToString(date, DateStyle.HH_MM_SS);
+		return dateToString(date, DateStyle.HH_MM_SS);
 	}
 
 	/**
@@ -684,7 +684,7 @@ public class DateHelper {
 	 * @return 相差天数。如果失败则返回-1
 	 */
 	public static int getIntervalDays(String date, String otherDate) {
-		return getIntervalDays(StringToDate(date), StringToDate(otherDate));
+		return getIntervalDays(stringToDate(date), stringToDate(otherDate));
 	}
 
 	/**
@@ -694,8 +694,8 @@ public class DateHelper {
 	 */
 	public static int getIntervalDays(Date date, Date otherDate) {
 		int num = -1;
-		Date dateTmp = DateHelper.StringToDate(DateHelper.getDate(date), DateStyle.YYYY_MM_DD);
-		Date otherDateTmp = DateHelper.StringToDate(DateHelper.getDate(otherDate), DateStyle.YYYY_MM_DD);
+		Date dateTmp = DateHelper.stringToDate(DateHelper.getDate(date), DateStyle.YYYY_MM_DD);
+		Date otherDateTmp = DateHelper.stringToDate(DateHelper.getDate(otherDate), DateStyle.YYYY_MM_DD);
 		if (dateTmp != null && otherDateTmp != null) {
 			long time = Math.abs(dateTmp.getTime() - otherDateTmp.getTime());
 			num = (int) (time / (24 * 60 * 60 * 1000));
@@ -711,7 +711,7 @@ public class DateHelper {
 	 */
 	public static Date getDayStart(Date date) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-		return StringToDate(sdf.format(date));
+		return stringToDate(sdf.format(date));
 	}
 
 	/**
@@ -722,7 +722,7 @@ public class DateHelper {
 	 */
 	public static Date getDayEnd(Date date) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-		return StringToDate(sdf.format(date));
+		return stringToDate(sdf.format(date));
 	}
 
 	/**
@@ -731,11 +731,12 @@ public class DateHelper {
 	 * @return
 	 */
 	public static Date getCurrentWeekStart(Date date) {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>(16);
 		Calendar cal = Calendar.getInstance();
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); // 获取本周一的日期
-		return StringToDate(df.format(cal.getTime()));
+		// 获取本周一的日期
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+		return stringToDate(df.format(cal.getTime()));
 	}
 
 	/**
@@ -744,13 +745,13 @@ public class DateHelper {
 	 * @return
 	 */
 	public static Date getCurrentWeekEnd() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>(16);
 		Calendar cal = Calendar.getInstance();
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
 		cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
 		// 增加一个星期,才是我们中国人理解的本周日的日期
 		cal.add(Calendar.WEEK_OF_YEAR, 1);
-		return StringToDate(df.format(cal.getTime()));
+		return stringToDate(df.format(cal.getTime()));
 	}
 
 	/**
@@ -759,11 +760,13 @@ public class DateHelper {
 	 * @return
 	 */
 	public static Date getCurrentMonthStart() {
-		Calendar cal = Calendar.getInstance();// 获取当前日期
+		// 获取当前日期
+		Calendar cal = Calendar.getInstance();
 		cal.add(Calendar.MONTH, 0);
-		cal.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天
+		// 设置为1号,当前日期既为本月第一天
+		cal.set(Calendar.DAY_OF_MONTH, 1);
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-		return StringToDate(df.format(cal.getTime()));
+		return stringToDate(df.format(cal.getTime()));
 	}
 
 	/**
@@ -776,7 +779,7 @@ public class DateHelper {
 		// 设置为1号,当前日期既为本月第一天
 		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-		return StringToDate(df.format(cal.getTime()));
+		return stringToDate(df.format(cal.getTime()));
 	}
 
 	/**
@@ -787,17 +790,19 @@ public class DateHelper {
 	 * @return
 	 */
 	public static Date getMonthStart(String strYear, String strMonth) {
-		Calendar cal = Calendar.getInstance();// 获取当前日期
+		// 获取当前日期
+		Calendar cal = Calendar.getInstance();
 		cal.set(Calendar.YEAR, Integer.parseInt(strYear));
 		cal.set(Calendar.MONTH, Integer.parseInt(strMonth));
-		cal.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天
+		// 设置为1号,当前日期既为本月第一天
+		cal.set(Calendar.DAY_OF_MONTH, 1);
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
 		cal.set(Calendar.DAY_OF_MONTH, 1);
 		cal.add(Calendar.DAY_OF_MONTH, -1);
 		cal.set(Calendar.DAY_OF_MONTH, 1);
 		Date firstDate = cal.getTime();
 
-		return StringToDate(df.format(firstDate));
+		return stringToDate(df.format(firstDate));
 	}
 
 	/**
@@ -817,7 +822,7 @@ public class DateHelper {
 		cal.set(Calendar.DAY_OF_MONTH, 1);
 		cal.add(Calendar.DAY_OF_MONTH, -1);
 		Date lastDate = cal.getTime();
-		return StringToDate(df.format(lastDate));
+		return stringToDate(df.format(lastDate));
 	}
 
 	/**
@@ -872,7 +877,8 @@ public class DateHelper {
 			list = new ArrayList<String>();
 
 			String firstDay = StrUtil.EMPTY;
-			Date date = new SimpleDateFormat("yyyy-MM").parse(month);// 定义起始日期
+			// 定义起始日期
+			Date date = new SimpleDateFormat("yyyy-MM").parse(month);
 
 			Date now = new Date();
 
@@ -880,13 +886,13 @@ public class DateHelper {
 				date = now;
 			}
 
-			List<String> mlist = getYearMonthBetweenDate(DateToString(date, "yyyy-MM"), DateToString(now, "yyyy-MM"));
+			List<String> mlist = getYearMonthBetweenDate(dateToString(date, "yyyy-MM"), dateToString(now, "yyyy-MM"));
 
 			if (mlist.size() <= offset) {
 				int preOffSet = offset * 2 + 1 - mlist.size();
 				for (int i = preOffSet; i >= 1; i--) {
 					Date d = addMonth(date, i * -1);
-					list.add(DateToString(d, "yyyy-MM"));
+					list.add(dateToString(d, "yyyy-MM"));
 				}
 				list.addAll(mlist);
 				return list;
@@ -895,7 +901,7 @@ public class DateHelper {
 			// 往前数n月
 			for (int i = offset; i >= 1; i--) {
 				Date d = addMonth(date, i * -1);
-				list.add(DateToString(d, "yyyy-MM"));
+				list.add(dateToString(d, "yyyy-MM"));
 			}
 
 			list.add(month);
@@ -903,7 +909,7 @@ public class DateHelper {
 			// 往后数n月
 			for (int i = 1; i <= offset; i++) {
 				Date d = addMonth(date, i);
-				list.add(DateToString(d, "yyyy-MM"));
+				list.add(dateToString(d, "yyyy-MM"));
 			}
 
 		} catch (ParseException e) {
@@ -913,61 +919,53 @@ public class DateHelper {
 		return list;
 	}
 
+	/**
+	 * 获取两个日期间的年月
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
 	public static List<String> getYearMonthBetweenDate(String startDate, String endDate) {
-		List<String> list = null;
+		List<String> list = new ArrayList<>();
 		try {
-			list = new ArrayList<String>();
-
-			String firstDay = StrUtil.EMPTY;
-			String lastDay = StrUtil.EMPTY;
-			Date d1 = new SimpleDateFormat("yyyy-MM").parse(startDate);// 定义起始日期
-			Date d2 = new SimpleDateFormat("yyyy-MM").parse(endDate);// 定义结束日期
+			Date d1 = new SimpleDateFormat("yyyy-MM").parse(startDate);
+			Date d2 = new SimpleDateFormat("yyyy-MM").parse(endDate);
 
-			Calendar dd = Calendar.getInstance();// 定义日期实例
-			dd.setTime(d1);// 设置日期起始时间
+			Calendar calendar1 = Calendar.getInstance();
+			calendar1.setTime(d1);
+			Calendar calendar2 = Calendar.getInstance();
+			calendar2.setTime(d2);
 			Calendar cale = Calendar.getInstance();
 
-			Calendar c = Calendar.getInstance();
-			c.setTime(d2);
-
-			int startDay = d1.getDate();
-			int endDay = d2.getDate();
+			int startDay = calendar1.get(Calendar.DAY_OF_MONTH);
+			int endDay = calendar2.get(Calendar.DAY_OF_MONTH);
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-
-			String keyValueForDate = null;
-
-			while (dd.getTime().compareTo(d2) <= 0) {// 判断是否到结束日期
-				keyValueForDate = new String();
-				cale.setTime(dd.getTime());
-
-				if (dd.getTime().equals(d1)) {
-					cale.set(Calendar.DAY_OF_MONTH, dd.getActualMaximum(Calendar.DAY_OF_MONTH));
-					keyValueForDate = sdf.format(d1);
-
-				} else if (dd.get(Calendar.MONTH) == d2.getMonth() && dd.get(Calendar.YEAR) == c.get(Calendar.YEAR)) {
-					cale.set(Calendar.DAY_OF_MONTH, 1);// 取第一天
-					firstDay = sdf.format(cale.getTime());
-					keyValueForDate = firstDay;
-
+			// 判断是否到结束日期
+			while (calendar1.compareTo(calendar2) <= 0) {
+				cale.setTime(calendar1.getTime());
+				// 如果是同一天
+				if (calendar1.equals(calendar2)) {
+					cale.set(Calendar.DAY_OF_MONTH, calendar1.getActualMaximum(Calendar.DAY_OF_MONTH));
+					list.add(sdf.format(d1));
+				} else if (calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH)
+						&& calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR)) {
+					// 如果是同月 - 取第一天
+					cale.set(Calendar.DAY_OF_MONTH, 1);
+					list.add(sdf.format(cale.getTime()));
 				} else {
-					cale.set(Calendar.DAY_OF_MONTH, 1);// 取第一天
-					firstDay = sdf.format(cale.getTime());
-					cale.set(Calendar.DAY_OF_MONTH, dd.getActualMaximum(Calendar.DAY_OF_MONTH));
-					keyValueForDate = firstDay;
-
+					// 非同月 - 取第一天
+					cale.set(Calendar.DAY_OF_MONTH, 1);
+					list.add(sdf.format(cale.getTime()));
+					cale.set(Calendar.DAY_OF_MONTH, calendar1.getActualMaximum(Calendar.DAY_OF_MONTH));
 				}
-				list.add(keyValueForDate);
-				dd.add(Calendar.MONTH, 1);// 进行当前日期月份加1
+				// 进行当前日期月份加1
+				calendar1.add(Calendar.MONTH, 1);
 			}
-
 			if (endDay < startDay) {
-				keyValueForDate = new String();
-
 				cale.setTime(d2);
-				cale.set(Calendar.DAY_OF_MONTH, 1);// 取第一天
-				firstDay = sdf.format(cale.getTime());
-				keyValueForDate = firstDay;
-				list.add(keyValueForDate);
+				// 取第一天
+				cale.set(Calendar.DAY_OF_MONTH, 1);
+				list.add(sdf.format(cale.getTime()));
 			}
 		} catch (ParseException e) {
 			return null;
@@ -980,7 +978,8 @@ public class DateHelper {
 		startDate.set(Calendar.YEAR, year);
 		startDate.set(Calendar.MONTH, month-1);
 		startDate.set(Calendar.DAY_OF_MONTH,1);
-		startDate.set(Calendar.HOUR_OF_DAY , 0);    //HOUR是12小时制
+		//HOUR是12小时制
+		startDate.set(Calendar.HOUR_OF_DAY, 0);
 		startDate.set(Calendar.MINUTE, 0);
 		startDate.set(Calendar.SECOND, 0);
 		startDate.set(Calendar.MILLISECOND, 0);
@@ -1015,6 +1014,13 @@ public class DateHelper {
 		return new BigDecimal(diff / nh).setScale(2,   BigDecimal.ROUND_HALF_UP);
 	}
 
+	/**
+	 * 清理缓存
+	 */
+	public static void clear() {
+		THREAD_LOCAL.remove();
+	}
+
 	public static void main(String[] args) {
 		//getMonthWithOffset("2017-03", 3);
 //		System.out.println(getDateTimeDifferenceHours(

+ 4 - 4
dmp-common/src/main/java/com/persagy/dmp/common/utils/JsonHelper.java

@@ -41,7 +41,7 @@ public class JsonHelper {
      * @param obj
      * @return
      */
-    public static JSONObject toJSONObjectQuietly(Object obj) {
+    public static JSONObject toJsonObjectQuietly(Object obj) {
         String jsonStr = toJsonStrQuietly(obj);
         return JSONObject.parseObject(jsonStr);
     }
@@ -51,7 +51,7 @@ public class JsonHelper {
      * @param obj
      * @return
      */
-    public static JSONArray toJSONArrayQuietly(Object obj) {
+    public static JSONArray toJsonArrayQuietly(Object obj) {
         String jsonStr = toJsonStrQuietly(obj);
         return JSONArray.parseArray(jsonStr);
     }
@@ -105,7 +105,7 @@ public class JsonHelper {
      * @param obj
      * @return
      */
-    public static JSONObject toJSONObject(Object obj) throws IOException {
+    public static JSONObject toJsonObject(Object obj) throws IOException {
         String jsonStr = toJsonStr(obj);
         return JSONObject.parseObject(jsonStr);
     }
@@ -115,7 +115,7 @@ public class JsonHelper {
      * @param obj
      * @return
      */
-    public static JSONArray toJSONArray(Object obj) throws IOException {
+    public static JSONArray toJsonArray(Object obj) throws IOException {
         String jsonStr = toJsonStr(obj);
         return JSONArray.parseArray(jsonStr);
     }

+ 0 - 8
dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/storage/service/impl/HdfsStorageServiceImpl.java

@@ -4,30 +4,22 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
-import com.persagy.dmp.storage.constant.FileCommonConst;
 import com.persagy.dmp.storage.service.IFileStorageService;
-import com.sun.imageio.plugins.common.ImageUtil;
-import io.minio.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 
 /**
  * MinIO存储服务实现类
  * @author Charlie Yu
  * @date 2021-05-15
  */
-// @Service
 @Slf4j
 @RequiredArgsConstructor
 public class HdfsStorageServiceImpl implements IFileStorageService {

+ 0 - 4
dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/storage/service/impl/MinioStorageServiceImpl.java

@@ -7,10 +7,7 @@ import com.persagy.dmp.storage.service.IFileStorageService;
 import io.minio.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.io.InputStream;
 
 /**
@@ -18,7 +15,6 @@ import java.io.InputStream;
  * @author Charlie Yu
  * @date 2021-05-15
  */
-// @Service
 @Slf4j
 @RequiredArgsConstructor
 public class MinioStorageServiceImpl implements IFileStorageService {

+ 13 - 12
dmp-server/src/main/java/com/persagy/aspects/RequestLogAspect.java

@@ -32,10 +32,11 @@ import java.util.List;
 @EnableAspectJAutoProxy
 public class RequestLogAspect {
 
-	private static final ThreadLocal<LogData> dataStorage = new ThreadLocal<>();
+	private static final ThreadLocal<LogData> DATA_STORAGE = new ThreadLocal<>();
 
+	/** @Pointcut("execution(* *(..))") */
 	@Pointcut("execution(public * com.persagy.dmp..*.controller.*.*(..))")
-	//@Pointcut("execution(* *(..))")
+
 	public void controllerPoint() {
 	}
 
@@ -51,7 +52,7 @@ public class RequestLogAspect {
 			return;
 		}
 		LogData data = initFlag(request);
-		dataStorage.set(data);
+		DATA_STORAGE.set(data);
 		log.info("{} REQUEST URL      : {} {} {} {}", data.intFlag, data.method, data.url, data.remoteIp, data.remotePort);
 		log.info("{} REQUEST ARGS     : {} ", data.intFlag, JsonHelper.toJsonStrQuietly(prepare(joinPoint)));
 	}
@@ -80,10 +81,10 @@ public class RequestLogAspect {
 
 	@AfterReturning(returning = "ret", pointcut = "controllerPoint()")
 	public void doAfterReturning(Object ret) {
-		if (null==dataStorage.get()){
+		if (null== DATA_STORAGE.get()){
 			return;
 		}
-		LogData data = dataStorage.get();
+		LogData data = DATA_STORAGE.get();
 		String result = null;
 		if (ret != null) {
 			if (ret instanceof CommonResult) {
@@ -93,17 +94,17 @@ public class RequestLogAspect {
 			}
 		}
 		log.info("{} REQUEST DURATION : {} {} {}", data.intFlag, System.currentTimeMillis() - data.timestamp, result, data.url);
-		dataStorage.remove();
+		DATA_STORAGE.remove();
 	}
 
 	@AfterThrowing(throwing = "ex", pointcut = "controllerPoint()")
 	public void doAfterThrowing(Throwable ex) {
-		if (null==dataStorage.get()){
+		if (null== DATA_STORAGE.get()){
 			return;
 		}
-		LogData data = dataStorage.get();
+		LogData data = DATA_STORAGE.get();
 		log.error("{} REQUEST EXCEPTION: {} {} {}", data.intFlag, System.currentTimeMillis() - data.timestamp, data.url, ex);
-		dataStorage.remove();
+		DATA_STORAGE.remove();
 	}
 
 	/**
@@ -119,11 +120,11 @@ public class RequestLogAspect {
 		data.remotePort = request.getRemotePort();
 		data.timestamp = System.currentTimeMillis();
 		data.method = request.getMethod();
-		String requestURI = request.getRequestURI();
+		String uri = request.getRequestURI();
 		String queryString = request.getQueryString();
-		data.url = StrUtil.isBlank(queryString) ? requestURI : StrUtil.concat(true, requestURI, "?", queryString);
+		data.url = StrUtil.isBlank(queryString) ? uri : StrUtil.concat(true, uri, "?", queryString);
 		data.intFlag = IdUtil.fastSimpleUUID();
-		dataStorage.set(data);
+		DATA_STORAGE.set(data);
 		return data;
 	}