Merge branch 'dev_ic_mp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

 Conflicts:

	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@@ -147,10 +147,12 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             updatedTime = metaObject.getValue(FieldConstant.UPDATED_TIME_HUMP);
         }
         if (updatedTime == null) {
-            if(metaObject.hasGetter(FieldConstant.CREATED_TIME_HUMP))
+            if(metaObject.hasGetter(FieldConstant.CREATED_TIME_HUMP)) {
                 updatedTime = metaObject.getValue(FieldConstant.CREATED_TIME_HUMP);
-            if(updatedTime == null)
+            }
+            if(updatedTime == null) {
                 updatedTime = new Date();
+            }
         }
         return updatedTime;
     }
@@ -163,11 +165,13 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             }
 
             if (value == null) {
-                if(metaObject.hasGetter(FieldConstant.CREATED_BY_HUMP))
+                if(metaObject.hasGetter(FieldConstant.CREATED_BY_HUMP)) {
                     value = metaObject.getValue(FieldConstant.CREATED_BY_HUMP);
+                }
 
-                if(null == value)
+                if(null == value) {
                     value = Optional.ofNullable(loginUserUtil.getLoginUserId()).orElse(Constant.APP_USER_FLAG);
+                }
             }
 
         return value;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -11,6 +11,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -281,7 +283,10 @@ public abstract class BaseRequestLogAspect {
         } else {
             StringBuilder builder = new StringBuilder("[");
             for (Object object : args) {
-                if (object != null) {
+                if (object != null
+                        && !(object instanceof ServletRequest)
+                        && !(object instanceof ServletResponse)
+                ) {
                     try {
                         // 尝试作为json解析
                         String objectString = JSON.toJSONString(object);

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -113,6 +113,7 @@ public enum EpmetErrorCode {
 	CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"),
 	RESI_EVENT_CAN_NOT_CLOSE_CASE(8607,"事件尚未处理，请处理完成后进行办结"),
 	RESI_EVENT_SHIFT_PROJECT(8608,"事件已立项，请勿重复操作"),
+	RESI_EVENT_SUBMIT(8616,"事件内容和语音不能同时为空"),
 
 	PLEASE_CHOOSE_RECEIVER(8609,"请选择接收人"),
 	REPLY_INFO_CONTENT_NOT_NULL(8610,"回复内容不能为空"),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@@ -193,7 +193,9 @@ public class RedisUtils {
 
     public <T> List<T> lrange(String key,long start,long end,Class<T> clazz){
         List<Object> content =  redisTemplate.opsForList().range(key,start,end);
-        if(CollectionUtils.isEmpty(content)) return null;
+        if(CollectionUtils.isEmpty(content)) {
+            return null;
+        }
          return content.stream().map( o -> {
                 try {
                     T target = clazz.newInstance();
@@ -314,7 +316,9 @@ public class RedisUtils {
     **/
     public Map<String, Object> hincrby(String key,String field,Long delta){
         Map<String,Object> existed = hGetAll(key);
-        if(null == existed || existed.size() < NumConstant.ONE) return null;
+        if(null == existed || existed.size() < NumConstant.ONE) {
+            return null;
+        }
 
         //hincrby
         redisTemplate.opsForHash().increment(key,field,delta);
@@ -367,7 +371,9 @@ public class RedisUtils {
 
     public <T> Set<T> zReverseRange(String key, long start, long end, Class<T> clazz) {
         Set<Object> objects = redisTemplate.opsForZSet().reverseRange(key, start, end);
-        if(CollectionUtils.isEmpty(objects)) return null;
+        if(CollectionUtils.isEmpty(objects)) {
+            return null;
+        }
         return objects.stream().map(o->{
             try {
                 T target = clazz.newInstance();

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -200,8 +200,9 @@ public class HttpClientManager {
 			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (null != headerMap) {
 				headerMap.forEach((k, v) -> {
-					if (v != null)
+					if (v != null) {
 						httppost.addHeader(k, v.toString());
+					}
 				});
 			}
 			if (StringUtils.isNotEmpty(jsonStrParam)) {

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java

@@ -141,8 +141,9 @@ public class IpUtils {
 	}
 
 	private static boolean isValidAddress(InetAddress address) {
-		if (address == null || address.isLoopbackAddress())
+		if (address == null || address.isLoopbackAddress()) {
-			return false;
+            return false;
+        }
 		String name = address.getHostAddress();
 		return (name != null
 				&& !ANYHOST.equals(name)

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Md5Util.java

@@ -55,16 +55,18 @@ public class Md5Util {
 
 	private static String byteArrayToHexString(byte[] b) {
 		StringBuffer resultSb = new StringBuffer();
-		for (int i = 0; i < b.length; i++)
+		for (int i = 0; i < b.length; i++) {
-			resultSb.append(byteToHexString(b[i]));
+            resultSb.append(byteToHexString(b[i]));
+        }
 
 		return resultSb.toString();
 	}
 
 	private static String byteToHexString(byte b) {
 		int n = b;
-		if (n < 0)
+		if (n < 0) {
-			n += 256;
+            n += 256;
+        }
 		int d1 = n / 16;
 		int d2 = n % 16;
 		return hexDigits[d1] + "" + hexDigits[d2];
@@ -75,12 +77,13 @@ public class Md5Util {
 		try {
 			resultString = origin;
 			MessageDigest md = MessageDigest.getInstance("MD5");
-			if (charsetname == null || "".equals(charsetname))
+			if (charsetname == null || "".equals(charsetname)) {
-				resultString = byteArrayToHexString(md.digest(resultString
+                resultString = byteArrayToHexString(md.digest(resultString
-						.getBytes()));
+                        .getBytes()));
-			else
+            } else {
-				resultString = byteArrayToHexString(md.digest(resultString
+                resultString = byteArrayToHexString(md.digest(resultString
-						.getBytes(charsetname)));
+                        .getBytes(charsetname)));
+            }
 		} catch (Exception e) {
 			log.error("MD5Encode is error,msg={0}", e);
 		}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java

@@ -121,7 +121,9 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
                 resultDTO.setImgUrl(StrConstant.EPMETY_STR);
             }
         }
-        if(null == result) return new ArrayList<>();
+        if(null == result) {
+            return new ArrayList<>();
+        }
         return result;
     }
 
@@ -348,7 +350,9 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
 
 
     private String convertPercentStr(BigDecimal percent,Integer digits){
-        if(null == percent) percent = BigDecimal.ZERO;
+        if(null == percent) {
+            percent = BigDecimal.ZERO;
+        }
         String percentStr = percent.setScale(digits, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
         return percentStr.concat(ModuleConstant.SYMBOL_PERCENT);
     }
@@ -362,7 +366,9 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
     */
     private ScreenCustomerAgencyDTO agencyInfo(String agencyId){
         ScreenCustomerAgencyDTO agencyInfo = agencyDao.selectByAgencyId(agencyId);
-        if(null == agencyInfo) throw new RenException("获取Agency信息失败");
+        if(null == agencyInfo) {
+            throw new RenException("获取Agency信息失败");
+        }
         return agencyInfo;
     }
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -249,7 +249,9 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         if(StringUtils.isBlank(param.getMonthId())){
             param.setMonthId(dateUtils.getCurrentMonthId());
         }
-        if(NumConstant.ZERO == param.getTopNum()) param.setTopNum(NumConstant.MAX);
+        if(NumConstant.ZERO == param.getTopNum()) {
+            param.setTopNum(NumConstant.MAX);
+        }
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
         List<BranchBuildOrderByCountResultDTO> orderList =
             screenPartyBranchDataDao.selectBranchDataByTypeOrder(param.getAgencyId(),param.getCategory(),param.getMonthId(),param.getBottomMonthId());
@@ -278,7 +280,9 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
 
 
     private String convertPercentStr(BigDecimal percent){
-        if (null == percent || BigDecimal.ZERO.equals(percent)) return "0.00%";
+        if (null == percent || BigDecimal.ZERO.equals(percent)) {
+            return "0.00%";
+        }
         String percentStr = percent.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
         return percentStr.concat(ModuleConstant.SYMBOL_PERCENT);
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -166,7 +166,9 @@ public class IndexServiceImpl implements IndexService {
         //针对X轴，数据集合不全则进行数据填充
         a:for(int i = NumConstant.ZERO; i < _ymList.size(); i++){
             //这里的collect必须是有序且升序的
-            if(cursor >= collect.size()) break a;
+            if(cursor >= collect.size()) {
+                break a;
+            }
             //如果存在过期数据，即从数据库中查询出超出横坐标左边界的月份值
             if(Integer.parseInt(collect.get(cursor).getMonthId()) < Integer.parseInt(_ymList.get(NumConstant.ZERO))) {
                 //控制当前循环重复进行

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java

@@ -276,7 +276,9 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
                 PageHelper.startPage(NumConstant.ONE,param.getTopNum());
                 gridData = screenOrgRankDataDao.selectGridDataMonthlyAreaCode(monthId,param.getAreaCode());
             }
-            if(null == gridData || gridData.isEmpty()) return result;
+            if(null == gridData || gridData.isEmpty()) {
+                return result;
+            }
             int num=1;
             for(OrgRankDataResultDTO data:gridData){
                 AdvanceBranchRankResultDTO o = ConvertUtils.sourceToTarget(data,AdvanceBranchRankResultDTO.class);
@@ -297,7 +299,9 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
                 PageHelper.startPage(NumConstant.ONE,param.getTopNum());
                 gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId);
             }
-            if(null == gridData || gridData.isEmpty()) return result;
+            if(null == gridData || gridData.isEmpty()) {
+                return result;
+            }
             int num=1;
             for(OrgRankDataResultDTO data:gridData){
                 AdvanceBranchRankResultDTO o = ConvertUtils.sourceToTarget(data,AdvanceBranchRankResultDTO.class);
@@ -323,7 +327,9 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<PartyUserPointResultDTO> advancedPartymemberRank(AgencyAndNumFormDTO param) {
-        if(null == param.getTopNum()) param.setTopNum(NumConstant.TEN);
+        if(null == param.getTopNum()) {
+            param.setTopNum(NumConstant.TEN);
+        }
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
         List<PartyUserPointResultDTO> result=new ArrayList<>();
         if(StringUtils.isNotBlank(param.getAreaCode())){
@@ -332,13 +338,17 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         }else{
             result=screenPartyUserRankDataDao.selectPartymemberPointOrder(param.getAgencyId());
         }
-        if(null == result) return new ArrayList<>();
+        if(null == result) {
+            return new ArrayList<>();
+        }
         return result;
     }
 
 
     private String convertPercentStr(BigDecimal percent){
-        if (null == percent || BigDecimal.ZERO.equals(percent)) return "0.0%";
+        if (null == percent || BigDecimal.ZERO.equals(percent)) {
+            return "0.0%";
+        }
         String percentStr = percent.setScale(NumConstant.ONE, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
         return percentStr.concat(ModuleConstant.SYMBOL_PERCENT);
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -337,7 +337,9 @@ public class ProjectServiceImpl implements ProjectService {
             }
         }
 
-        if (null == resultList) return new ArrayList<>();
+        if (null == resultList) {
+            return new ArrayList<>();
+        }
         return resultList;
     }
 
@@ -360,7 +362,9 @@ public class ProjectServiceImpl implements ProjectService {
 
             result.get(i).setImgUrlList(imgUrlList);
         }
-        if (null == result) return new ArrayList<>();
+        if (null == result) {
+            return new ArrayList<>();
+        }
         return result;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/ParseIndexExcelResult.java

@@ -39,8 +39,12 @@ public class ParseIndexExcelResult implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
+        if (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         ParseIndexExcelResult that = (ParseIndexExcelResult) o;
         return indexCode.equals(that.indexCode) &&
                 indexName.equals(that.indexName) &&

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java

@@ -98,7 +98,9 @@ public class GroupExtractServiceImpl implements GroupExtractService {
                 for(Iterator<FactOriginGroupMainDailyDTO> iter = originGroupData.iterator();
                     iter.hasNext();){
                     FactOriginGroupMainDailyDTO pointer = iter.next();
-                    if(null == gridMap.get(pointer.getGridId()))iter.remove();
+                    if(null == gridMap.get(pointer.getGridId())) {
+                        iter.remove();
+                    }
 
                 }
             //记录全量中的垃圾数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -494,7 +494,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 	public void projectProcessCostTimeDataCompensation() {
 
     	List<String> customers = dimCustomerService.getAllCustomerId();
-    	if(CollectionUtils.isEmpty(customers)) return ;
+    	if(CollectionUtils.isEmpty(customers)) {
+            return ;
+        }
     	customers.forEach(local -> {
 				//	projectProcessService.getProjectPeriod(true, local,null);
 		});

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java

@@ -218,7 +218,9 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                 return false;
             }
             customerIds = externalCustomerIds.getData();
-        }else customerIds.add(formDTO.getCustomerId());
+        }else {
+            customerIds.add(formDTO.getCustomerId());
+        }
         List<String> monthIds = new ArrayList<>();
         if (StringUtils.isNotEmpty(formDTO.getStartMonth()) && StringUtils.isNotEmpty(formDTO.getEndMonth())){
             monthIds = DateUtils.getMonthBetween(formDTO.getStartMonth(),formDTO.getEndMonth());
@@ -227,7 +229,9 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
             if (StringUtils.isEmpty(formDTO.getMonthId())){
                 // 默认上月
                 monthIds.add(DimIdGenerator.getMonthDimId(DateUtils.addDateMonths(new Date(), -1)));
-            }else monthIds.add(formDTO.getMonthId());
+            }else {
+                monthIds.add(formDTO.getMonthId());
+            }
         }
         List<String> finalMonthIds = monthIds;
         customerIds.forEach(customerId -> {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java

@@ -47,7 +47,9 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
 
     @Override
     public List<String> selectExistedInfo(String customerId) {
-        if (baseDao.selectCountByCustomerId(customerId) > NumConstant.ZERO) return baseDao.selectClosedProjectId(customerId);
+        if (baseDao.selectCountByCustomerId(customerId) > NumConstant.ZERO) {
+            return baseDao.selectClosedProjectId(customerId);
+        }
         return null;
     }
 
@@ -80,4 +82,4 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
     public List<ScreenDifficultyDataEntity> getAllDifficultyByCustomerId(String customerId) {
         return baseDao.selectAllDifficultyByCustomerId(customerId);
     }
-}
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -139,9 +139,13 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      */
     @Override
     public void updateProjectStatus(List<ScreenProjectDataDTO> list,String dateId,String customerId) {
-        if(CollectionUtils.isEmpty(list)) return;
+        if(CollectionUtils.isEmpty(list)) {
+            return;
+        }
         List<ProjectProcessDTO> closedInfo = baseDao.selectClosedProjectOnAppointedDay(customerId, dateId);
-        if(CollectionUtils.isEmpty(closedInfo)) return;
+        if(CollectionUtils.isEmpty(closedInfo)) {
+            return;
+        }
 
         list = list.stream().flatMap(target -> closedInfo.stream().filter(closedCase -> StringUtils.equals(closedCase.getProjectId(),target.getProjectId())).map(
                 merge -> {
@@ -161,9 +165,13 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      */
     @Override
     public void updateProjectCloseTime(List<ScreenProjectDataDTO> list) {
-        if(CollectionUtils.isEmpty(list)) return;
+        if(CollectionUtils.isEmpty(list)) {
+            return;
+        }
         List<ProjectProcessDTO> closedInfo = baseDao.selectClosedProjectByProjectIds(list.stream().map(ScreenProjectDataDTO::getProjectId).distinct().collect(Collectors.toList()));
-        if(CollectionUtils.isEmpty(closedInfo)) return;
+        if(CollectionUtils.isEmpty(closedInfo)) {
+            return;
+        }
 
         list = list.stream().flatMap(target -> closedInfo.stream().filter(closedCase -> StringUtils.equals(closedCase.getProjectId(),target.getProjectId())).map(
                 merge -> {
@@ -186,7 +194,9 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     @Override
     public List<ScreenProjectProcessDTO> buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged, String projectId) {
         List<ScreenProjectProcessDTO> processes = baseDao.selectProjectProcessAndDirection(customerId, ifRanged ? null : dateId, dateId, projectId);
-        if(CollectionUtils.isEmpty(processes)) return null;
+        if(CollectionUtils.isEmpty(processes)) {
+            return null;
+        }
         return processes.stream().map(target -> {
             List<ProjectStaffDTO> points = target.getPoints();
             if(!CollectionUtils.isEmpty(points)){

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -98,7 +98,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public Integer getOvertimeProjectByParameter(String customerId) {
 		String parameter = baseDao.selectParameterValueByKey(customerId);
-		if(StringUtils.isBlank(parameter)) parameter = baseDao.selectParameterValueByKey("default");
+		if(StringUtils.isBlank(parameter)) {
+            parameter = baseDao.selectParameterValueByKey("default");
+        }
 		return StringUtils.isBlank(parameter) ? NumConstant.FIVE : Integer.parseInt(parameter);
 	}
 
@@ -136,9 +138,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
 	@Override
 	public Map<String, Set<String>> getProjectCategory(List<String> projectIds) {
-		if(CollectionUtils.isEmpty(projectIds)) return null;
+		if(CollectionUtils.isEmpty(projectIds)) {
+            return null;
+        }
 		List<ProjectCategoryDTO> categories = baseDao.selectProjectCategory(projectIds);
-		if(CollectionUtils.isEmpty(categories)) return null;
+		if(CollectionUtils.isEmpty(categories)) {
+            return null;
+        }
 		Map<String, Set<String>> map = new HashMap<>();
 		Map<String, List<ProjectCategoryDTO>> projectMap = categories.stream().collect(Collectors.groupingBy(ProjectCategoryDTO::getProjectId));
 		projectMap.forEach((k,v) -> {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java

@@ -66,7 +66,9 @@ public class DimTopicStatusServiceImpl extends BaseServiceImpl<DimTopicStatusDao
     private QueryWrapper<DimTopicStatusEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
         String delFlag = (String)params.get(FieldConstant.DEL_FLAG_HUMP);
-        if(StringUtils.isBlank(delFlag)) delFlag = NumConstant.ZERO_STR;
+        if(StringUtils.isBlank(delFlag)) {
+            delFlag = NumConstant.ZERO_STR;
+        }
 
         QueryWrapper<DimTopicStatusEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +103,4 @@ public class DimTopicStatusServiceImpl extends BaseServiceImpl<DimTopicStatusDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java

@@ -77,7 +77,9 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
             if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){
                 result = factRegUserGridDailyDao.selectUserAndPartymemberByOrgLevel(ORG_LEVEL_AGENCY,customerId,DateUtils.getBeforeNDay(NumConstant.TWO));
             }
-            if(null == result) result = new LinkedList<>();
+            if(null == result) {
+                result = new LinkedList<>();
+            }
         }
         // 网格级别
         List<ScreenUserTotalDataEntity> gridUserResult =

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/TopicStatisticalServiceImpl.java

@@ -52,7 +52,9 @@ public class TopicStatisticalServiceImpl implements TopicStatisticalService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertUniquely(TopicStatisticalData data) {
-        if(null == data) return;
+        if(null == data) {
+            return;
+        }
 
         if(StringUtils.isBlank(data.getDateId()) || StringUtils.isBlank(data.getMonthId())){
             logger.warn("缺失重要参数:dateId或monthId");

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -149,9 +149,13 @@ public class TopicServiceImpl implements TopicService {
      */
     @Override
     public Map<String,List<ScreenDifficultyImgDataEntity>> getTopicImgs(List<ProjectSourceMapFormDTO> list) {
-        if(CollectionUtils.isEmpty(list)) return Collections.EMPTY_MAP;
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.EMPTY_MAP;
+        }
         List<ScreenDifficultyImgDataEntity> imgs = topicDao.selectTopicImgs(list);
-        if(CollectionUtils.isEmpty(imgs)) return Collections.EMPTY_MAP;
+        if(CollectionUtils.isEmpty(imgs)) {
+            return Collections.EMPTY_MAP;
+        }
         //key -> topicId  | value -> projectId
         Map<String,String> projectTopicMap = list.stream().collect(Collectors.toMap(ProjectSourceMapFormDTO :: getSourceId,ProjectSourceMapFormDTO :: getProjectId,(o,n)->n));
         //key -> topicId
@@ -179,9 +183,13 @@ public class TopicServiceImpl implements TopicService {
      */
     @Override
     public Map<String, String> getTopicContent(List<ProjectSourceMapFormDTO> list) {
-        if(CollectionUtils.isEmpty(list)) return Collections.EMPTY_MAP;
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.EMPTY_MAP;
+        }
         List<TopicContentResultDTO> contents = topicDao.selectTopicContent(list);
-        if(CollectionUtils.isEmpty(contents)) return Collections.EMPTY_MAP;
+        if(CollectionUtils.isEmpty(contents)) {
+            return Collections.EMPTY_MAP;
+        }
         Map<String,String> topicContentMap = contents.stream().collect(Collectors.toMap(TopicContentResultDTO :: getTopicId,TopicContentResultDTO::getContent));
         //key -> topicId  | value -> projectId
         Map<String,String> projectTopicMap = list.stream().collect(Collectors.toMap(ProjectSourceMapFormDTO :: getSourceId,ProjectSourceMapFormDTO :: getProjectId,(o,n)->n));
@@ -227,7 +235,9 @@ public class TopicServiceImpl implements TopicService {
     @Override
     public List<ScreenProjectImgDataDTO> buildNewScreenProjectImgData(List<ScreenProjectDataDTO> list) {
         List<ScreenProjectImgDataDTO> imgs = topicDao.initNewScreenProjectImgData(list.get(NumConstant.ZERO).getCustomerId(), list);
-        if(CollectionUtils.isEmpty(imgs)) return null;
+        if(CollectionUtils.isEmpty(imgs)) {
+            return null;
+        }
         return imgs.stream().flatMap(img -> list.stream().filter(project -> StringUtils.equals(img.getTopicId(),project.getTopicId())).map(
                 match -> {
                     ScreenProjectImgDataDTO matchedImg

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java

@@ -168,7 +168,9 @@ public abstract class ScoreCalculator<T> {
      */
     protected BigDecimal calcuteCoefficient(BigDecimal min, BigDecimal max) {
         BigDecimal fenmu = max.subtract(min);
-        if (fenmu.compareTo(BigDecimal.ZERO)==0)return new BigDecimal(0);
+        if (fenmu.compareTo(BigDecimal.ZERO)==0) {
+            return new BigDecimal(0);
+        }
         BigDecimal fenzi = maxScore.subtract(minScore);
         BigDecimal divide = fenzi.divide(fenmu, MathContext.DECIMAL32);
         return divide;

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java

@@ -119,7 +119,9 @@ public class WorkDayServiceImpl implements WorkDayService {
     @Override
     public Map<String,Integer> workMinutes(WorkMinuteFormDTO param) {
         List<TimestampIntervalFormDTO> params = param.getTimeList();
-        if(CollectionUtils.isEmpty(params)) return null;
+        if(CollectionUtils.isEmpty(params)) {
+            return null;
+        }
         Map<String,Integer> result = new LinkedHashMap<>();
         //默认非精准计算
         if(StringUtils.isBlank(param.getIfPrecise()) || !StringUtils.equals(ProjectConstant.PRECISE_CALCULATION,param.getIfPrecise())){
@@ -192,7 +194,9 @@ public class WorkDayServiceImpl implements WorkDayService {
     private Integer calculateImpreciseDetentionMinutes(Date left, Date right){
         if(null == left){ logger.error("计算工作日，传入的开始日期为空！");return null;}
         //给右区间赋值，默认当前时间
-        if(null == right || right.compareTo(left) < NumConstant.ZERO) right = new Date();
+        if(null == right || right.compareTo(left) < NumConstant.ZERO) {
+            right = new Date();
+        }
 
         List<CalenderEntity> list = calenderDao.selectByStartAndEnd(format.format(left),format.format(right));
         if(!CollectionUtils.isEmpty(list)){
@@ -204,10 +208,14 @@ public class WorkDayServiceImpl implements WorkDayService {
             //集合中有两个元素以上，说明两个时间存在跨度
             else{
                 int costMin = NumConstant.ZERO;
-                if(NumConstant.TWO == list.size()) return costMin;
+                if(NumConstant.TWO == list.size()) {
-                for(int index = NumConstant.ZERO ; index < list.size() ; index++)
+                    return costMin;
-                    if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType()))
+                }
+                for(int index = NumConstant.ZERO ; index < list.size() ; index++) {
+                    if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType())) {
                         costMin += NumConstant.TWENTY_FOUR * NumConstant.SIXTY;
+                    }
+                }
 
                 return costMin;
             }
@@ -228,15 +236,17 @@ public class WorkDayServiceImpl implements WorkDayService {
     private Integer calculateDetentionMinutes(Date left ,Date right){
         if(null == left){ logger.error("计算工作日，传入的开始日期为空！");return null;}
         //给右区间赋值，默认当前时间
-        if(null == right || right.compareTo(left) < NumConstant.ZERO) right = new Date();
+        if(null == right || right.compareTo(left) < NumConstant.ZERO) {
+            right = new Date();
+        }
 
         List<CalenderEntity> list = calenderDao.selectByStartAndEnd(format.format(left),format.format(right));
         if(!CollectionUtils.isEmpty(list)){
             //集合中只有一个元素，说明两个时间在同一天
             if(list.size() == NumConstant.ONE){
-                if(ProjectConstant.DAY_TYPE_WORK.equals(list.get(NumConstant.ZERO).getType()))
+                if(ProjectConstant.DAY_TYPE_WORK.equals(list.get(NumConstant.ZERO).getType())) {
                     return (int)((right.getTime() - left.getTime())/NumConstant.ONE_THOUSAND/NumConstant.SIXTY);
-                else {
+                } else {
                     logger.warn("计算工作日，传入的起始时间都在同一天且是在节假日，开始时间：{}，结束时间：{}，节日类型：{}(1工作日、2周末、3、节假日)",left,right);
                     return NumConstant.ZERO;
                 }
@@ -263,10 +273,14 @@ public class WorkDayServiceImpl implements WorkDayService {
                     //ChronoUnit日期枚举类,between方法计算两个时间对象之间的时间量
                     costMin += ChronoUnit.SECONDS.between(localDateTime, initialTime)/NumConstant.SIXTY;
                 }
-                if(NumConstant.TWO == list.size()) return costMin;
+                if(NumConstant.TWO == list.size()) {
-                for(int index = NumConstant.ONE ; index < list.size() - NumConstant.ONE ; index++)
+                    return costMin;
-                    if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType()))
+                }
+                for(int index = NumConstant.ONE ; index < list.size() - NumConstant.ONE ; index++) {
+                    if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType())) {
                         costMin += NumConstant.TWENTY_FOUR * NumConstant.SIXTY;
+                    }
+                }
 
                 return costMin;
             }
@@ -290,7 +304,9 @@ public class WorkDayServiceImpl implements WorkDayService {
         if(null == left){ logger.error("计算工作日，传入的开始日期为空！");return null;}
         if(null == start || null == end){start = "9:00:00"; end = "17:00:00";}
         //给右区间赋值，默认当前时间
-        if(null == right || right.compareTo(left) < NumConstant.ZERO) right = new Date();
+        if(null == right || right.compareTo(left) < NumConstant.ZERO) {
+            right = new Date();
+        }
         //自定义起始时间
         String standardStartDateStr  = format.format(left).concat(" ").concat(start);
         //自定义截至时间
@@ -359,10 +375,14 @@ public class WorkDayServiceImpl implements WorkDayService {
                         costMin += delta_T;
                     }
                 }
-                if(NumConstant.TWO == list.size()) return costMin;
+                if(NumConstant.TWO == list.size()) {
-                for(int index = NumConstant.ONE ; index < list.size() - NumConstant.ONE ; index++)
+                    return costMin;
-                    if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType()))
+                }
+                for(int index = NumConstant.ONE ; index < list.size() - NumConstant.ONE ; index++) {
+                    if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType())) {
                         costMin += delta_T * NumConstant.SIXTY;
+                    }
+                }
 
                 return costMin;
             }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -378,7 +378,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             }
 
             String pidsAndAgencyIdPath = agencyInfo.getPids().concat(":").concat(superiorAgencyId);
-            if (pidsAndAgencyIdPath.startsWith(":")) pidsAndAgencyIdPath = pidsAndAgencyIdPath.replaceFirst(":", "");
+            if (pidsAndAgencyIdPath.startsWith(":")) {
+                pidsAndAgencyIdPath = pidsAndAgencyIdPath.replaceFirst(":", "");
+            }
 
             query.likeRight(VolunteerInfoEntity::getPids, pidsAndAgencyIdPath);
         });
@@ -391,7 +393,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             p.setUserId(vi.getUserId());
             return p;
         }).collect(Collectors.toList());
-        
+
         return list;
     }
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

@@ -159,4 +159,5 @@ public interface SystemMessageType {
      * 完成用户需求，需求人提交评价
      */
     String FINISH_USER_DEMAND="finish_user_demand";
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java

@@ -119,9 +119,15 @@ public class PointRuleEntity extends BaseEpmetEntity {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+            return true;
-		if (!super.equals(o)) return false;
+        }
+		if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+		if (!super.equals(o)) {
+            return false;
+        }
 		PointRuleEntity entity = (PointRuleEntity) o;
 		return Objects.equals(customerId, entity.customerId) &&
 				Objects.equals(ruleName, entity.ruleName) &&

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java

@@ -59,7 +59,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-07-27
@@ -177,7 +177,9 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl<PointAdjustme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void adjustPoint(PointAdjustmentFormDTO param) {
-        if(null == param.getPoint()) throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        if(null == param.getPoint()) {
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        }
         Date currentTime = new Date();
         Integer point = param.getPoint();
         if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_MINUS,param.getAdjustmentType()) || param.getAdjustmentType().toLowerCase().contains("m")){
@@ -247,4 +249,4 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl<PointAdjustme
         userPointTotalService.insertOrUpdate(total);
     }
 
-}
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java

@@ -63,8 +63,12 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
     @Override
     public ResiPointDetailResultDTO getMyPoint(CommonUserFormDTO param) {
         ResiPointDetailResultDTO result = baseDao.selectPointByCustomerUserId(param.getUserId(),param.getCustomerId());
-        if(null == result) return new ResiPointDetailResultDTO();
+        if(null == result) {
-        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
+            return new ResiPointDetailResultDTO();
+        }
+        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) {
+            return new ResiPointDetailResultDTO();
+        }
         return result;
     }
 
@@ -190,8 +194,12 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
     @Override
     public ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam) {
         ResiPointDetailResultDTO result = baseDao.selectPointByCustomerUserId(customerUserParam.getUserId(),customerUserParam.getCustomerId());
-        if(null == result) return new ResiPointDetailResultDTO();
+        if(null == result) {
-        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
+            return new ResiPointDetailResultDTO();
+        }
+        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) {
+            return new ResiPointDetailResultDTO();
+        }
         return result;
     }
 

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java

@@ -31,8 +31,12 @@ public class IssueCategoryTagResultDTO implements Serializable {
 	//equals计算时忽略isDisable属性
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+		if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 		IssueCategoryTagResultDTO that = (IssueCategoryTagResultDTO) o;
 		return Objects.equals(id, that.id) &&
 				Objects.equals(name, that.name);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -122,7 +122,9 @@ public class IssueProjectTagDictRedis {
                 Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
                 customizedTuples.forEach(tuple -> {
                     List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getScore());
-                    if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
+                    if((CollectionUtils.isEmpty(queue))) {
+                        queue = new LinkedList<>();
+                    }
                     queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
                     customizedHeatMap.put(tuple.getScore(),queue);
                 });
@@ -137,8 +139,9 @@ public class IssueProjectTagDictRedis {
         //默认、自定义标签，只要有一个是空就触发补偿
         //不信任缓存数据
         if(!CollectionUtils.isEmpty(result) && !CollectionUtils.isEmpty(result.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))
-                && !CollectionUtils.isEmpty(result.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME)))
+                && !CollectionUtils.isEmpty(result.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))) {
             return result;
+        }
 
 
 
@@ -183,11 +186,13 @@ public class IssueProjectTagDictRedis {
             IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
             boolean ifOtherOnly = null != otherCategory && (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()));
             Set<String> keys;
-            if (CollectionUtils.isEmpty(category) || ifOtherOnly)
+            if (CollectionUtils.isEmpty(category) || ifOtherOnly) {
                 keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null));
-            else keys = category.stream().map(key -> {
+            } else {
-                return GovIssueRedisKeys.getGovernmentTagKey(customerId, key);
+                keys = category.stream().map(key -> {
-            }).collect(Collectors.toSet());
+                    return GovIssueRedisKeys.getGovernmentTagKey(customerId, key);
+                }).collect(Collectors.toSet());
+            }
             //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿
             if (!CollectionUtils.isEmpty(keys)){
                 keys.remove(GovIssueRedisKeys.getGovernmentTagKey(customerId,ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME));
@@ -211,7 +216,9 @@ public class IssueProjectTagDictRedis {
                         tupleSet.forEach(tuple -> {
                             Double heatScore = tuple.getScore();
                             List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
-                            if (CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
+                            if (CollectionUtils.isEmpty(queue)) {
+                                queue = new LinkedList<>();
+                            }
                             queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
                             heatMap.put(heatScore, queue);
                         });
@@ -228,7 +235,9 @@ public class IssueProjectTagDictRedis {
                         Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
                         customizedTuples.forEach(tuple -> {
                             List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
-                            if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
+                            if((CollectionUtils.isEmpty(queue))) {
+                                queue = new LinkedList<>();
+                            }
                                 queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
                             customizedHeatMap.put((Double) tuple.getValue(),queue);
                         });
@@ -323,7 +332,9 @@ public class IssueProjectTagDictRedis {
                 String redisKey = GovIssueRedisKeys.getGovernmentTagKey(customerId, k);
                 v.forEach(tag -> {
                     List<IssueCategoryTagResultDTO> unit = scoreMap.get(tag.getIssueUseCount());
-                    if (CollectionUtils.isEmpty(unit)) unit = new LinkedList<>();
+                    if (CollectionUtils.isEmpty(unit)) {
+                        unit = new LinkedList<>();
+                    }
                     IssueCategoryTagResultDTO object = ConvertUtils.sourceToTarget(tag, IssueCategoryTagResultDTO.class);
                     object.setName(tag.getTagName());
                     unit.add(object);
@@ -423,7 +434,9 @@ public class IssueProjectTagDictRedis {
      * @date 2021.03.20 01:04
     */
     public void batchIncrScore(Map<String,Map<String,List<IssueCategoryTagResultDTO>>> param){
-        if(CollectionUtils.isEmpty(param)) return;
+        if(CollectionUtils.isEmpty(param)) {
+            return;
+        }
         redisTemplate.executePipelined((RedisCallback) connection -> {
             param.forEach((operation,map) -> {
                 if(!CollectionUtils.isEmpty(map)){
@@ -452,7 +465,9 @@ public class IssueProjectTagDictRedis {
      * @date 2021.03.22 16:20
     */
     public void updateTagAvailabilityBySecondCategoryIds(String customerId,List<String>secondCategoryIds,String availableFlag){
-        if(CollectionUtils.isEmpty(secondCategoryIds)) return;
+        if(CollectionUtils.isEmpty(secondCategoryIds)) {
+            return;
+        }
         secondCategoryIds.forEach(cid -> {
             String key = GovIssueRedisKeys.getGovernmentTagKey(customerId, cid);
 
@@ -463,7 +478,9 @@ public class IssueProjectTagDictRedis {
                 Map<Double, Set<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
                 tagTuples.forEach(tuple -> {
                     Set<IssueCategoryTagResultDTO> queue = heatMap.get(tuple.getValue());
-                    if((CollectionUtils.isEmpty(queue))) queue = new HashSet<>();
+                    if((CollectionUtils.isEmpty(queue))) {
+                        queue = new HashSet<>();
+                    }
                     IssueCategoryTagResultDTO ele = parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class);
                     ele.setIsDisable(availableFlag);
                     queue.add(ele);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java

@@ -88,7 +88,9 @@ public class IssueVoteDetailRedis {
     }
 
     public void deleteBatch(List<String> issueIds){
-        if(CollectionUtils.isEmpty(issueIds)) return ;
+        if(CollectionUtils.isEmpty(issueIds)) {
+            return ;
+        }
         Set<String> keys = issueIds.stream().map(id -> {
             return IssueConstant.REDIS_KEY + id;
         }).collect(Collectors.toSet());
@@ -288,4 +290,4 @@ public class IssueVoteDetailRedis {
     }
 
 
-}
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java

@@ -185,7 +185,9 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
                         value.put(redisKey,list);
                     }
                 });
-                if(!value.isEmpty()) redisParam.put(NumConstant.ZERO_STR,value);
+                if(!value.isEmpty()) {
+                    redisParam.put(NumConstant.ZERO_STR,value);
+                }
                 baseDao.updateTagUsage(param.getMinus(),param.getCustomerId(),NumConstant.ONE_NEG);
             }
         }
@@ -206,7 +208,9 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
                         value.put(redisKey,list);
                     }
                 });
-                if(!value.isEmpty()) redisParam.put(NumConstant.ONE_STR,value);
+                if(!value.isEmpty()) {
+                    redisParam.put(NumConstant.ONE_STR,value);
+                }
                 baseDao.updateTagUsage(param.getPlus(),param.getCustomerId(),NumConstant.ONE);
             }
         }
@@ -214,4 +218,4 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
         issueProjectTagDictRedis.batchIncrScore(redisParam);
     }
 
-}
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -285,7 +285,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         int issueAffectedRow = baseDao.insertOne(issueDTO);
 
         if(issueAffectedRow == NumConstant.ONE && (StringUtils.isNotBlank(issueDTO.getId()) || StringUtils.isNotBlank(issueDTO.getIssueId()))){
-          if(StringUtils.isNotBlank(issueDTO.getIssueId())) issueDTO.setId(issueDTO.getIssueId());
+          if(StringUtils.isNotBlank(issueDTO.getIssueId())) {
+              issueDTO.setId(issueDTO.getIssueId());
+          }
 
             //2.新增议题流程
             IssueProcessDTO issueProcessDTO = new IssueProcessDTO();
@@ -322,7 +324,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             voteInitCache.setShouldVoteCount(issueShiftedFromTopicFormDTO.getVotableCount());
             issueVoteDetailRedis.set(voteInitCache);
 
-            if(StringUtils.isNotBlank(issueShiftedFromTopicFormDTO.getIssueId())) issueDTO.setId(issueShiftedFromTopicFormDTO.getIssueId());
+            if(StringUtils.isNotBlank(issueShiftedFromTopicFormDTO.getIssueId())) {
+                issueDTO.setId(issueShiftedFromTopicFormDTO.getIssueId());
+            }
             return issueDTO.getId();
         }
         logger.warn(String.format(
@@ -393,9 +397,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                         applicationList.sort(Comparator.comparing(IssueApplicationDTO::getUpdatedTime, Collections.reverseOrder()));
                         logger.error("com.epmet.service.impl.IssueServiceImpl.topicShiftedToIssueV2，查出多条转移提提交记录，话题Id：{}", param.getTopicId());
                     }
-                    if(!isStaffAudition)
+                    if(!isStaffAudition) {
-                       if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus()))
+                        if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus())) {
-                        ifRepeat = true;
+                            ifRepeat = true;
+                        }
+                    }
                     applyIds.addAll(applicationList.stream().map(IssueApplicationDTO::getId).collect(Collectors.toList()));
                 }
                 if(!ifRepeat) {
@@ -442,14 +448,17 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     });
 
                 }
-                if(CollectionUtils.isNotEmpty(applyIds))
+                if(CollectionUtils.isNotEmpty(applyIds)) {
-                result.setIssueApplicationId(applyIds.iterator().next());
+                    result.setIssueApplicationId(applyIds.iterator().next());
+                }
 
 
         //只有当审核开关关闭 或 工作端人员审核通过时才生成议题
         if(!ifOpen || StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,defaultStatusUnderAuditing)){
             ValidatorUtils.validateEntity(param, IssueShiftedFromTopicFormDTO.IssueGenerationGroup.class);
-            if(isStaffAudition) param.setUserId(param.getIssueAuthorId());
+            if(isStaffAudition) {
+                param.setUserId(param.getIssueAuthorId());
+            }
             result.setIssueId(issueShiftedToTopic(param));
             if(StringUtils.equals(ModuleConstants.AUDITION_TYPE_AUTO_PASSED,defaultStatusUnderAuditing)){
                 applicationList.forEach(apply -> {
@@ -498,7 +507,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         Date unifiedDate = new Date();
 
         IssueApplicationDTO application = applicationService.get(param.getIssueApplicationId());
-        if(null == application) throw new RenException("没有相应的议题申请信息");
+        if(null == application) {
+            throw new RenException("没有相应的议题申请信息");
+        }
 
         IssueApplicationDTO app2update = new IssueApplicationDTO();
         //app2update.setId(param.getIssueApplicationId());
@@ -543,7 +554,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     app2update.setIssueId(issueResult.getIssueId());
 
                 }
-            }else throw new RenException(topicInfo.getInternalMsg());
+            }else {
+                throw new RenException(topicInfo.getInternalMsg());
+            }
 
 
         //发送站内信

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 议题分享链接访问记录表 
+ * 议题分享链接访问记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-12-18
@@ -108,7 +108,9 @@ public class IssueShareLinkVisitRecordServiceImpl extends BaseServiceImpl<IssueS
     @Override
     public String checkInviteRelationship(SharableIssueAndInviteeFormDTO param) {
         String inviterId = baseDao.selectInviterIdByLinkIdAndInvitee(param.getShareLinkId(),param.getInviteeId());
-        if(StringUtils.isNotBlank(inviterId)) baseDao.updateInviteRegister(param.getShareLinkId(),param.getInviteeId());
+        if(StringUtils.isNotBlank(inviterId)) {
+            baseDao.updateInviteRegister(param.getShareLinkId(),param.getInviteeId());
+        }
         return inviterId;
     }
 
@@ -123,4 +125,4 @@ public class IssueShareLinkVisitRecordServiceImpl extends BaseServiceImpl<IssueS
     public IssueShareLinkVisitRecordDTO getVisitRecord(String linkId, String invitee) {
         return baseDao.selectRecordByLinkIdAndInvitee(linkId, invitee);
     }
-}
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -477,7 +477,9 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Override
     public void syncVotingCacheToDbByIssueId(String issueId) {
         VoteRedisFormDTO vote = issueVoteDetailRedis.getVoteStatistical(issueId);
-        if(null == vote) throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
+        if(null == vote) {
+            throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
+        }
         IssueVoteStatisticalDTO toUpd = new IssueVoteStatisticalDTO();
         toUpd.setOppositionCount(vote.getOppositionAmount());
         toUpd.setSupportCount(vote.getSupportAmount());
@@ -525,7 +527,9 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Override
     public void syncVotingCacheToDbByParams(String issueId, String gridId, String statisticalId) {
         VoteRedisFormDTO vote = issueVoteDetailRedis.getVoteStatistical(issueId);
-        if(null == vote) throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
+        if(null == vote) {
+            throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
+        }
         IssueVoteStatisticalDTO toUpd = new IssueVoteStatisticalDTO();
         toUpd.setOppositionCount(vote.getOppositionAmount());
         toUpd.setSupportCount(vote.getSupportAmount());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -939,10 +939,12 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
 
     public <T> void mergeObject(T origin, T destination) {
-        if (origin == null || destination == null)
+        if (origin == null || destination == null) {
             return;
-        if (!origin.getClass().equals(destination.getClass()))
+        }
+        if (!origin.getClass().equals(destination.getClass())) {
             return;
+        }
 
         Field[] fields = origin.getClass().getDeclaredFields();
         for (int i = 0; i < fields.length; i++) {
@@ -962,8 +964,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
 
     public <T> void checkFieldAndSetDefault(T origin) {
-        if (origin == null)
+        if (origin == null) {
             return;
+        }
         Field[] fields = origin.getClass().getDeclaredFields();
         for (int i = 0; i < fields.length; i++) {
             try {
@@ -1203,4 +1206,4 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return baseDao.getAgencyMobile(gridId);
     }
 
-}
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java

@@ -128,7 +128,9 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, Proj
         List<ProjectCategoryTagResultDTO> orientHooks = baseDao.selectProjectTagList(param.getProjectId());
         //新增
         List<ProjectCategoryTagResultDTO> newHooks = param.getTagList();
-        if(!CollectionUtils.isEmpty(orientHooks)) baseDao.deleteProjectTags(param.getProjectId());
+        if(!CollectionUtils.isEmpty(orientHooks)) {
+            baseDao.deleteProjectTags(param.getProjectId());
+        }
         if(!CollectionUtils.isEmpty(newHooks)){
             baseDao.insertBatch(newHooks.stream().map(o->{
                 ProjectTagsEntity hook = ConvertUtils.sourceToTarget(param,ProjectTagsEntity.class);hook.setTagId(o.getId());hook.setTagName(o.getName());hook.setCreatedBy(param.getStaffId());return hook;
@@ -139,16 +141,24 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, Proj
         List<String> newIds = CollectionUtils.isEmpty(newHooks) ? null : newHooks.stream().map(ProjectCategoryTagResultDTO::getId).collect(Collectors.toList());
         TagDifferentSetFormDTO differentSet = ConvertUtils.sourceToTarget(param,TagDifferentSetFormDTO.class);
         differentSet.setUserId(param.getStaffId());
-        if(null == orientIds && null == newIds) return ;
+        if(null == orientIds && null == newIds) {
-        if(null != orientIds && null == newIds) differentSet.setMinus(orientIds);
+            return ;
-        if(null == orientIds && null != newIds) differentSet.setPlus(newIds);
+        }
+        if(null != orientIds && null == newIds) {
+            differentSet.setMinus(orientIds);
+        }
+        if(null == orientIds && null != newIds) {
+            differentSet.setPlus(newIds);
+        }
         if(null != orientIds && null != newIds){
             List<String> replaceNews = new LinkedList<>(newIds);
             differentSet.setPlus(newIds.removeAll(orientIds) ? newIds : null);
             differentSet.setMinus(orientIds.removeAll(replaceNews) ? orientIds : null);
         }
         Result result = issueClient.updateCitations(differentSet);
-        if(!result.success()) throw new RenException(result.getInternalMsg());
+        if(!result.success()) {
+            throw new RenException(result.getInternalMsg());
+        }
     }
 
-}
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -294,7 +294,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if(StringUtils.isBlank(formDTO.getEventContent()) && org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getVoiceList())) {
             //话题内容和语音不能同时为空
             log.error("事件内容和语音不能同时为空");
-            throw new RenException("事件内容和语音不能同时为空");
+            throw new RenException(EpmetErrorCode.RESI_EVENT_SUBMIT.getCode(), EpmetErrorCode.RESI_EVENT_SUBMIT.getMsg());
         }
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getVoiceList()) && StringUtils.isBlank(formDTO.getEventContent())) {
             formDTO.setEventContent("语音事件");

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -145,7 +145,7 @@
     </resultMap>
     <select id="selectEventDetail" resultMap="selectEventDetailMap">
         SELECT
-            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
             IFNULL(re.EVENT_CONTENT,'') AS eventContent,
             IFNULL(re.ADDRESS,'') AS eventAddress,
             (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java

@@ -66,7 +66,9 @@ public class CustomerParameterServiceImpl implements CustomerParameterService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateParamInfo(List<CrmParameterResultDTO> formDTOS) {
-        if (CollectionUtils.isEmpty(formDTOS))return;
+        if (CollectionUtils.isEmpty(formDTOS)) {
+            return;
+        }
         parameterDao.updateParamInfo(formDTOS);
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@@ -78,8 +78,8 @@ public class ResiGroupRedis {
     }
     /**
      * @Description 新增/更新群组缓存信息
-     * @Param 
+     * @Param
-     * @return 
+     * @return
      * @Author wangc
      * @Date 2020.04.13 09:58
      **/
@@ -275,7 +275,9 @@ public class ResiGroupRedis {
     */
     public String getFullName(String userId){
         String fieldValue = (String)redisUtils.hGet(RedisKeys.getResiUserKey(userId),"realName");
-        if(StringUtils.isNotBlank(fieldValue)) return fieldValue;
+        if(StringUtils.isNotBlank(fieldValue)) {
+            return fieldValue;
+        }
         List<String> userParam = new LinkedList<>(); userParam.add(userId);
         Result<List<UserBaseInfoResultDTO>> userCacheResult = epmetUserOpenFeignClient.queryUserBaseInfo(userParam);
         if(userCacheResult.success() && !CollectionUtils.isEmpty(userCacheResult.getData())){
@@ -283,4 +285,4 @@ public class ResiGroupRedis {
         }
         return null;
     }
-}
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -430,15 +430,21 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			groupCache.getGroupStatisticalInfo().setTotalMembers(
 					null == groupCache.getGroupStatisticalInfo().getTotalMembers() ? NumConstant.TWO : groupCache.getGroupStatisticalInfo().getTotalMembers() +NumConstant.ONE
 			);
-			if(StringUtils.equals(userRoleDTO.getPartymemberFlag(),NumConstant.ONE_STR)) groupCache.getGroupStatisticalInfo().setTotalPartyMembers(
+			if(StringUtils.equals(userRoleDTO.getPartymemberFlag(),NumConstant.ONE_STR)) {
-					null == groupCache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalPartyMembers()+NumConstant.ONE
+                groupCache.getGroupStatisticalInfo().setTotalPartyMembers(
-			);
+                        null == groupCache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalPartyMembers()+NumConstant.ONE
-			if(StringUtils.equals(userRoleDTO.getRegisteredResiFlag(),NumConstant.ONE_STR)) groupCache.getGroupStatisticalInfo().setTotalNormalMembers(
+                );
-					null == groupCache.getGroupStatisticalInfo().getTotalNormalMembers() ? NumConstant.TWO : groupCache.getGroupStatisticalInfo().getTotalNormalMembers()+NumConstant.ONE
+            }
-			);
+			if(StringUtils.equals(userRoleDTO.getRegisteredResiFlag(),NumConstant.ONE_STR)) {
-			if(StringUtils.equals(userRoleDTO.getWarmHeartedFlag(),NumConstant.ONE_STR)) groupCache.getGroupStatisticalInfo().setTotalEarnestMembers(
+                groupCache.getGroupStatisticalInfo().setTotalNormalMembers(
-					null == groupCache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalEarnestMembers()+NumConstant.ONE
+                        null == groupCache.getGroupStatisticalInfo().getTotalNormalMembers() ? NumConstant.TWO : groupCache.getGroupStatisticalInfo().getTotalNormalMembers()+NumConstant.ONE
-			);
+                );
+            }
+			if(StringUtils.equals(userRoleDTO.getWarmHeartedFlag(),NumConstant.ONE_STR)) {
+                groupCache.getGroupStatisticalInfo().setTotalEarnestMembers(
+                        null == groupCache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalEarnestMembers()+NumConstant.ONE
+                );
+            }
 			resiGroupRedis.set(groupCache);
 		}
 		//8、发送消息
@@ -569,15 +575,21 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			groupCache.getGroupStatisticalInfo().setTotalMembers(
 					null == groupCache.getGroupStatisticalInfo().getTotalMembers() ? NumConstant.TWO : groupCache.getGroupStatisticalInfo().getTotalMembers() +NumConstant.ONE
 			);
-			if(StringUtils.equals(userRoleDTO.getPartymemberFlag(),NumConstant.ONE_STR)) groupCache.getGroupStatisticalInfo().setTotalPartyMembers(
+			if(StringUtils.equals(userRoleDTO.getPartymemberFlag(),NumConstant.ONE_STR)) {
-					null == groupCache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalPartyMembers()+NumConstant.ONE
+                groupCache.getGroupStatisticalInfo().setTotalPartyMembers(
-			);
+                        null == groupCache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalPartyMembers()+NumConstant.ONE
-			if(StringUtils.equals(userRoleDTO.getRegisteredResiFlag(),NumConstant.ONE_STR)) groupCache.getGroupStatisticalInfo().setTotalNormalMembers(
+                );
-					null == groupCache.getGroupStatisticalInfo().getTotalNormalMembers() ? NumConstant.TWO : groupCache.getGroupStatisticalInfo().getTotalNormalMembers()+NumConstant.ONE
+            }
-			);
+			if(StringUtils.equals(userRoleDTO.getRegisteredResiFlag(),NumConstant.ONE_STR)) {
-			if(StringUtils.equals(userRoleDTO.getWarmHeartedFlag(),NumConstant.ONE_STR)) groupCache.getGroupStatisticalInfo().setTotalEarnestMembers(
+                groupCache.getGroupStatisticalInfo().setTotalNormalMembers(
-					null == groupCache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalEarnestMembers()+NumConstant.ONE
+                        null == groupCache.getGroupStatisticalInfo().getTotalNormalMembers() ? NumConstant.TWO : groupCache.getGroupStatisticalInfo().getTotalNormalMembers()+NumConstant.ONE
-			);
+                );
+            }
+			if(StringUtils.equals(userRoleDTO.getWarmHeartedFlag(),NumConstant.ONE_STR)) {
+                groupCache.getGroupStatisticalInfo().setTotalEarnestMembers(
+                        null == groupCache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE : groupCache.getGroupStatisticalInfo().getTotalEarnestMembers()+NumConstant.ONE
+                );
+            }
 			resiGroupRedis.set(groupCache);
 		}
 		//8、发送消息

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java

@@ -223,7 +223,9 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
         String group = null;
         if(StringUtils.equals("topic",param.getType())){
             TopicShareLinkRecordEntity shareLinkInfo = baseDao.selectById(param.getId());
-            if(null != shareLinkInfo && StringUtils.isNotBlank(shareLinkInfo.getGroupId())) group = shareLinkInfo.getGroupId();
+            if(null != shareLinkInfo && StringUtils.isNotBlank(shareLinkInfo.getGroupId())) {
+                group = shareLinkInfo.getGroupId();
+            }
         }
         if(StringUtils.isBlank(group)){
             Result<IssueShareLinkRecordDTO> issueShareLinkInfo = issueClient.shareLinkInfo(param.getId());
@@ -234,7 +236,9 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
                 }
             }
         }
-        if(StringUtils.isBlank(group)) throw new RenException("无效的分享链接");
+        if(StringUtils.isBlank(group)) {
+            throw new RenException("无效的分享链接");
+        }
         String userId = param.getUserId();
 
         GroupMemeberOperationDTO applyRecord = groupMemeberOperationDao.selectLatestRecord(group, userId);
@@ -249,8 +253,9 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
         }
         if(!relation.getInAnyGroup()) {
             ResiGroupEntity groupEntity = groupDao.selectById(group);
-            if(null == groupEntity || StringUtils.isBlank(groupEntity.getGridId()))
+            if(null == groupEntity || StringUtils.isBlank(groupEntity.getGridId())) {
                 throw new RenException("没有找到相应的组记录");
+            }
             List<String> groups = resiGroupMemberDao.getGroupIdByUserIdAndGridId(groupEntity.getGridId(), userId, NumConstant.ONE_STR);
             if(!CollectionUtils.isEmpty(groups)){
                 relation.setInAnyGroup(true);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java

@@ -97,7 +97,9 @@ public class TopicShareLinkVisitRecordServiceImpl extends BaseServiceImpl<TopicS
     @Override
     public String checkInviteRelationship(SharableTopicAndInviteeFormDTO param) {
         String inviterId = baseDao.selectByLinkIdAndInvitee(param.getShareLinkId(),param.getInviteeId());
-        if(StringUtils.isNotBlank(inviterId)) baseDao.updateInviteRegister(param.getShareLinkId(),param.getInviteeId());
+        if(StringUtils.isNotBlank(inviterId)) {
+            baseDao.updateInviteRegister(param.getShareLinkId(),param.getInviteeId());
+        }
         return inviterId;
     }
 
@@ -113,4 +115,4 @@ public class TopicShareLinkVisitRecordServiceImpl extends BaseServiceImpl<TopicS
     public TopicShareLinkVisitRecordEntity getByLinkIdAndInvitee(String linkId, String invitee) {
         return baseDao.selectRecordByLinkIdAndInvitee(linkId,invitee);
     }
-}
+}

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java

@@ -91,7 +91,9 @@ public class StrangerResiGuideController {
 	@PostMapping("sso/publiclocationgridlist")
 	Result<List<PublicCustomerGridForStrangerResultDTO>> locationGridList(@LoginUser TokenDto dto,@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
 		ValidatorUtils.validateEntity(customerGridListFormDTO);
-		if(null == dto || StringUtils.isEmpty(dto.getCustomerId())) throw new ValidateException("无法获取客户Id");
+		if(null == dto || StringUtils.isEmpty(dto.getCustomerId())) {
+            throw new ValidateException("无法获取客户Id");
+        }
 		return strangerAccessRecordService.listCustomerGridH5(customerGridListFormDTO,dto.getCustomerId());
 	}
 

epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java

@@ -43,16 +43,18 @@ public class Md5Util {
 
 	private static String byteArrayToHexString(byte[] b) {
 		StringBuffer resultSb = new StringBuffer();
-		for (int i = 0; i < b.length; i++)
+		for (int i = 0; i < b.length; i++) {
-			resultSb.append(byteToHexString(b[i]));
+            resultSb.append(byteToHexString(b[i]));
+        }
 
 		return resultSb.toString();
 	}
 
 	private static String byteToHexString(byte b) {
 		int n = b;
-		if (n < 0)
+		if (n < 0) {
-			n += 256;
+            n += 256;
+        }
 		int d1 = n / 16;
 		int d2 = n % 16;
 		return hexDigits[d1] + "" + hexDigits[d2];
@@ -62,12 +64,13 @@ public class Md5Util {
 		String resultString = null;
 		resultString = origin;
 		MessageDigest md = MessageDigest.getInstance("MD5");
-		if (charsetname == null || "".equals(charsetname))
+		if (charsetname == null || "".equals(charsetname)) {
-			resultString = byteArrayToHexString(md.digest(resultString
+            resultString = byteArrayToHexString(md.digest(resultString
-					.getBytes()));
+                    .getBytes()));
-		else
+        } else {
-			resultString = byteArrayToHexString(md.digest(resultString
+            resultString = byteArrayToHexString(md.digest(resultString
-					.getBytes(charsetname)));
+                    .getBytes(charsetname)));
+        }
 		return resultString;
 	}
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeUnitFormDTO.java

@@ -34,8 +34,12 @@ public class UserBadgeUnitFormDTO implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
+        if (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         UserBadgeUnitFormDTO that = (UserBadgeUnitFormDTO) o;
         return badgeId.equals(that.badgeId) &&
                 badgeIcon.equals(that.badgeIcon) &&

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -683,6 +683,14 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "/epmetuser/user/findicuser")
     Result<EpmetUserFamilyDTO> findIcUser(@RequestBody FindIcUserFormDTO formDTO);
 
+    /**
+     * desc:获取例行工作 数据 分页
+     * @param patrolQueryFormDTO
+     * @return
+     */
+    @PostMapping(value = "//epmetuser/patrolroutinework/selectList")
+    Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO);
+
     /**
      * 获取ic_resi_user
      * @param icResiUserId

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -508,6 +508,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findIcUser", formDTO);
     }
 
+    @Override
+    public Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(PatrolQueryFormDTO patrolQueryFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPatrolRoutineWorkList", patrolQueryFormDTO);
+    }
+
     @Override
     public Result<IcResiUserDTO> getIcResiUserDTO(String icResiUserId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserDTO", icResiUserId);

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java

@@ -110,10 +110,14 @@ public class UserBadgeRedis {
     public List<UserBadgeUnitFormDTO> obtainUserBadge2List(String userId,String customerId) {
         List<UserBadgeUnitFormDTO> cache =
                 redisUtils.lrange(RedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
-        if(!CollectionUtils.isEmpty(cache)) return cache;
+        if(!CollectionUtils.isEmpty(cache)) {
+            return cache;
+        }
         //补偿
         cache = badgeService.getUserSortedBadge(userId,customerId);
-        if(CollectionUtils.isEmpty(cache)) return cache;
+        if(CollectionUtils.isEmpty(cache)) {
+            return cache;
+        }
         final List<UserBadgeUnitFormDTO> sortedBadges = cache;
         redisTemplate.executePipelined((RedisCallback<List<UserBadgeUnitFormDTO>>) connection ->{
             sortedBadges.forEach(badge -> {
@@ -135,7 +139,9 @@ public class UserBadgeRedis {
      * @date 2020.11.10 15:00
     */
     public Map<String,List<UserBadgeUnitFormDTO>> batchObtainUserBadge(String customerId,List<String> userIds){
-        if(CollectionUtils.isEmpty(userIds)) return Collections.EMPTY_MAP;
+        if(CollectionUtils.isEmpty(userIds)) {
+            return Collections.EMPTY_MAP;
+        }
         Map<String,List<UserBadgeUnitFormDTO>> result = new HashMap<>();
         //存放缓存为空的
         List<String> cacheBlank = new LinkedList<>();
@@ -177,7 +183,9 @@ public class UserBadgeRedis {
      * @date 2020.11.05 13:37
      */
     public long pushOrRemoveUserBadge4List(String userId, String badgeId, String customerId) {
-        if(StringUtils.isNotBlank(userId)) return illumeOrExtinguishStronglyConsistent(userId,customerId);
+        if(StringUtils.isNotBlank(userId)) {
+            return illumeOrExtinguishStronglyConsistent(userId,customerId);
+        }
         List<UserBadgeUnitFormDTO> orient = redisUtils.lrange(RedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
         UserBadgeUnitFormDTO unit = null;
 
@@ -203,8 +211,11 @@ public class UserBadgeRedis {
             if (null == unit) {
                 Optional<UserBadgeListResultDTO> poolOpt =
                         badgePool.stream().filter(badge -> StringUtils.equals(badge.getBadgeId(), badgeId)).findFirst();
-                if (poolOpt.isPresent()) unit = ConvertUtils.sourceToTarget(poolOpt.get(), UserBadgeUnitFormDTO.class);
+                if (poolOpt.isPresent()) {
-                else return NumConstant.ZERO;
+                    unit = ConvertUtils.sourceToTarget(poolOpt.get(), UserBadgeUnitFormDTO.class);
+                } else {
+                    return NumConstant.ZERO;
+                }
             }
         redisUtils.leftPush(RedisKeys.getResiUserBadgeKey(customerId, userId), unit, -1);
             return NumConstant.ONE;
@@ -241,7 +252,9 @@ public class UserBadgeRedis {
         */
         public void batchClearUserBadgeCache(String customerId){
             Set<String> key = redisUtils.keys(RedisKeys.getResiUserBadgeKey(customerId, null));
-            if(CollectionUtils.isEmpty(key)) return;
+            if(CollectionUtils.isEmpty(key)) {
+                return;
+            }
             final Set<String> keys = key;
             redisTemplate.executePipelined((RedisCallback<String>) connection ->{
                     keys.forEach( ser -> {connection.del(redisTemplate.getKeySerializer().serialize(ser));});

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -79,7 +79,9 @@ public class UserBaseInfoRedis {
      * @date 2020.07.23 14:43
     **/
     public void set(UserBaseInfoResultDTO baseInfo){
-        if(StringUtils.isBlank(baseInfo.getUserId())) return;
+        if(StringUtils.isBlank(baseInfo.getUserId())) {
+            return;
+        }
         String key = RedisKeys.getResiUserKey(baseInfo.getUserId());
         //bean to map
         Map<String, Object> map = BeanUtil.beanToMap(baseInfo, false, true);
@@ -289,7 +291,9 @@ public class UserBaseInfoRedis {
      * @date 2020.07.30 14:07
     **/
     public void updateUserCache(UserBaseInfoEntity entity){
-        if(null == entity || StringUtils.isBlank(entity.getUserId())) return;
+        if(null == entity || StringUtils.isBlank(entity.getUserId())) {
+            return;
+        }
 
         UserBaseInfoResultDTO currentCache = ConvertUtils.sourceToTarget(entity,UserBaseInfoResultDTO.class);
 
@@ -314,7 +318,9 @@ public class UserBaseInfoRedis {
                     && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())) {
                 String gridFullName = gridResult.getData().getBelongsGridName();
                 currentCache.setRegisteredGridName(gridFullName);
-                if (StringUtils.isBlank(currentCache.getGender())) currentCache.setGender(NumConstant.ZERO_STR);
+                if (StringUtils.isBlank(currentCache.getGender())) {
+                    currentCache.setGender(NumConstant.ZERO_STR);
+                }
                 if (StringUtils.isNotBlank(currentCache.getNickname())) {
                     StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(currentCache.getSurname());
                     switch (currentCache.getGender()) {
@@ -370,10 +376,12 @@ public class UserBaseInfoRedis {
     }
 
     public <T> void mergeObject(T origin, T destination) {
-        if (origin == null || destination == null)
+        if (origin == null || destination == null) {
             return;
-        if (!origin.getClass().equals(destination.getClass()))
+        }
+        if (!origin.getClass().equals(destination.getClass())) {
             return;
+        }
 
         Field[] fields = origin.getClass().getDeclaredFields();
         for (int i = 0; i < fields.length; i++) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -350,7 +350,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         if(null == resiResult){
             UserBaseInfoResultDTO userInfo = userBaseInfoRedis.getUserInfo(tokenDto.getUserId(),certificationDetailFormDTO.getCustomerId());
             resiResult = ConvertUtils.sourceToTarget(userInfo,CertificationDetailResultDTO.class);
-            if(null != resiResult) resiResult.setIdcard(userInfo.getIdNum());
+            if(null != resiResult) {
+                resiResult.setIdcard(userInfo.getIdNum());
+            }
         }
         return resiResult;
     }
@@ -430,7 +432,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Override
     public Map<String, List<UserBadgeInfoResultDTO>> getBatchUserSortedBadge(String customerId, List<String> userIds) {
         List<UserBadgeInfoResultDTO> badges = userBadgeDao.selectBatchUserSortedBadge(customerId, userIds);
-        if (CollectionUtils.isEmpty(badges)) return Collections.EMPTY_MAP;
+        if (CollectionUtils.isEmpty(badges)) {
+            return Collections.EMPTY_MAP;
+        }
         return badges.stream().collect(Collectors.groupingBy(UserBadgeInfoResultDTO::getUserId));
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -366,7 +366,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         UserWechatDTO userWechatDTO = new UserWechatDTO();
         userWechatDTO.setUserId(param.getUserId());
         userWechatDTO.setNickname(StringUtils.isBlank(param.getNickname()) ? ModuleConstant.EMPTY_STR : param.getNickname());
-        if(StringUtils.isBlank(param.getGender())) param.setGender(NumConstant.ZERO_STR);
+        if(StringUtils.isBlank(param.getGender())) {
+            param.setGender(NumConstant.ZERO_STR);
+        }
         userWechatDTO.setSex(Integer.parseInt(param.getGender()));
         userWechatDTO.setHeadImgUrl(param.getAvatarUrl());
         userWechatDTO.setUpdatedTime(new Date());
@@ -407,7 +409,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
      **/
     @Override
     public void clearUserCache(List<String> ids) {
-        if(null == ids || ids.isEmpty()) return;
+        if(null == ids || ids.isEmpty()) {
+            return;
+        }
         userBaseInfoRedis.clearUserCache(ids);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -490,10 +490,11 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	@Override
 	public void submitInLink(AfterRegisterResidentInSharableLinkFormDTO param) {
 
-		if(StringUtils.equals(ModuleConstant.SHARABLE_LINK_FROM_ISSUE,param.getLinkType()))
+		if(StringUtils.equals(ModuleConstant.SHARABLE_LINK_FROM_ISSUE,param.getLinkType())) {
-			 govIssueClient.checkInviteRelationship(ConvertUtils.sourceToTarget(param,SharableIssueAndInviteeFormDTO.class));
+            govIssueClient.checkInviteRelationship(ConvertUtils.sourceToTarget(param,SharableIssueAndInviteeFormDTO.class));
-		else
+        } else {
-			 resiGroupClient.checkInviteRelationship(ConvertUtils.sourceToTarget(param, SharableTopicAndInviteeFormDTO.class));
+            resiGroupClient.checkInviteRelationship(ConvertUtils.sourceToTarget(param, SharableTopicAndInviteeFormDTO.class));
+        }
 	}
 
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -204,7 +204,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 if(gridResult.success() && null != gridResult.getData() && null != gridResult.getData().getGridName()){
                     result.setRegisterGridName(gridResult.getData().getGridName());
                 }else {
-                    if (StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg());
+                    if (StringUtils.isNotBlank(gridResult.getMsg())) {
+                        log.warn(gridResult.getMsg());
+                    }
                 }
             }