diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java index e4dde4f2fa..3c0b35ff4d 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java +++ b/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; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java index 12720182f5..055d174c2e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java +++ b/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); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index c20f195c9e..47079e14a8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/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,"回复内容不能为空"), diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index 1de1fce475..32cba063c5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -193,7 +193,9 @@ public class RedisUtils { public List lrange(String key,long start,long end,Class clazz){ List 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 hincrby(String key,String field,Long delta){ Map 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 Set zReverseRange(String key, long start, long end, Class clazz) { Set 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(); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java index eeac282cd8..048745cfb6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java +++ b/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)) { diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java index b53ed5e4ea..495565e33c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java +++ b/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()) - return false; + if (address == null || address.isLoopbackAddress()) { + return false; + } String name = address.getHostAddress(); return (name != null && !ANYHOST.equals(name) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Md5Util.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Md5Util.java index 9f4426d728..0d22d230a0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Md5Util.java +++ b/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++) - resultSb.append(byteToHexString(b[i])); + for (int i = 0; i < b.length; i++) { + resultSb.append(byteToHexString(b[i])); + } return resultSb.toString(); } private static String byteToHexString(byte b) { int n = b; - if (n < 0) - n += 256; + if (n < 0) { + 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)) - resultString = byteArrayToHexString(md.digest(resultString - .getBytes())); - else - resultString = byteArrayToHexString(md.digest(resultString - .getBytes(charsetname))); + if (charsetname == null || "".equals(charsetname)) { + resultString = byteArrayToHexString(md.digest(resultString + .getBytes())); + } else { + resultString = byteArrayToHexString(md.digest(resultString + .getBytes(charsetname))); + } } catch (Exception e) { log.error("MD5Encode is error,msg={0}", e); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java index 18978f6e23..f0bce3bf50 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java +++ b/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; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index 3173e1269e..cc99586d88 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/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 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); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 209e776ee7..24e0ab52a4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/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))) { //控制当前循环重复进行 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java index a5ce203e96..5fcb834b5f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java +++ b/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 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 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); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 55e0d3c7c0..69248da197 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/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; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/ParseIndexExcelResult.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/ParseIndexExcelResult.java index 17b4fa0634..0c21d759ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/ParseIndexExcelResult.java +++ b/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 (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } ParseIndexExcelResult that = (ParseIndexExcelResult) o; return indexCode.equals(that.indexCode) && indexName.equals(that.indexName) && diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java index 209588d464..c834b74437 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java +++ b/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 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(); + } } //记录全量中的垃圾数 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index 3c860e4d37..94926108ff 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/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 customers = dimCustomerService.getAllCustomerId(); - if(CollectionUtils.isEmpty(customers)) return ; + if(CollectionUtils.isEmpty(customers)) { + return ; + } customers.forEach(local -> { // projectProcessService.getProjectPeriod(true, local,null); }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java index 3fd804ec7a..d1e449b4a0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java +++ b/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 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 finalMonthIds = monthIds; customerIds.forEach(customerId -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java index f263b332fc..f8f1d50d8b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java +++ b/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 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 getAllDifficultyByCustomerId(String customerId) { return baseDao.selectAllDifficultyByCustomerId(customerId); } -} \ No newline at end of file +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java index 6844c930e9..9f1861df0f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java +++ b/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 list,String dateId,String customerId) { - if(CollectionUtils.isEmpty(list)) return; + if(CollectionUtils.isEmpty(list)) { + return; + } List 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 list) { - if(CollectionUtils.isEmpty(list)) return; + if(CollectionUtils.isEmpty(list)) { + return; + } List 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 buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged, String projectId) { List 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 points = target.getPoints(); if(!CollectionUtils.isEmpty(points)){ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 990480fa2c..5b4d087830 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/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> getProjectCategory(List projectIds) { - if(CollectionUtils.isEmpty(projectIds)) return null; + if(CollectionUtils.isEmpty(projectIds)) { + return null; + } List categories = baseDao.selectProjectCategory(projectIds); - if(CollectionUtils.isEmpty(categories)) return null; + if(CollectionUtils.isEmpty(categories)) { + return null; + } Map> map = new HashMap<>(); Map> projectMap = categories.stream().collect(Collectors.groupingBy(ProjectCategoryDTO::getProjectId)); projectMap.forEach((k,v) -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java index 07c82cb9ce..13a15d27f4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimTopicStatusServiceImpl.java +++ b/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 getWrapper(Map 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 wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,4 +103,4 @@ public class DimTopicStatusServiceImpl extends BaseServiceImpl(); + if(null == result) { + result = new LinkedList<>(); + } } // 网格级别 List gridUserResult = diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/TopicStatisticalServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/TopicStatisticalServiceImpl.java index e70e4f7afe..d5c63b599c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/topic/impl/TopicStatisticalServiceImpl.java +++ b/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"); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 4aa8d924a6..cae99da457 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/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> getTopicImgs(List list) { - if(CollectionUtils.isEmpty(list)) return Collections.EMPTY_MAP; + if(CollectionUtils.isEmpty(list)) { + return Collections.EMPTY_MAP; + } List 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 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 getTopicContent(List list) { - if(CollectionUtils.isEmpty(list)) return Collections.EMPTY_MAP; + if(CollectionUtils.isEmpty(list)) { + return Collections.EMPTY_MAP; + } List contents = topicDao.selectTopicContent(list); - if(CollectionUtils.isEmpty(contents)) return Collections.EMPTY_MAP; + if(CollectionUtils.isEmpty(contents)) { + return Collections.EMPTY_MAP; + } Map topicContentMap = contents.stream().collect(Collectors.toMap(TopicContentResultDTO :: getTopicId,TopicContentResultDTO::getContent)); //key -> topicId | value -> projectId Map 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 buildNewScreenProjectImgData(List list) { List 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 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java index 01906d5bae..5abf6a910e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java @@ -168,7 +168,9 @@ public abstract class ScoreCalculator { */ 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; diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java index 80241a5a2e..98e2f839c8 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java +++ b/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 workMinutes(WorkMinuteFormDTO param) { List params = param.getTimeList(); - if(CollectionUtils.isEmpty(params)) return null; + if(CollectionUtils.isEmpty(params)) { + return null; + } Map 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 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; - for(int index = NumConstant.ZERO ; index < list.size() ; index++) - if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType())) + if(NumConstant.TWO == list.size()) { + return costMin; + } + 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 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; - for(int index = NumConstant.ONE ; index < list.size() - NumConstant.ONE ; index++) - if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType())) + if(NumConstant.TWO == list.size()) { + return costMin; + } + 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; - for(int index = NumConstant.ONE ; index < list.size() - NumConstant.ONE ; index++) - if(StringUtils.equals(ProjectConstant.DAY_TYPE_WORK,list.get(index).getType())) + if(NumConstant.TWO == list.size()) { + return costMin; + } + 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; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 9c6048baa5..ef5e10e697 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/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> customizedHeatMap = new HashMap<>(); customizedTuples.forEach(tuple -> { List 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 keys; - if (CollectionUtils.isEmpty(category) || ifOtherOnly) + if (CollectionUtils.isEmpty(category) || ifOtherOnly) { keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null)); - else keys = category.stream().map(key -> { - return GovIssueRedisKeys.getGovernmentTagKey(customerId, key); - }).collect(Collectors.toSet()); + } else { + keys = category.stream().map(key -> { + 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 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> customizedHeatMap = new HashMap<>(); customizedTuples.forEach(tuple -> { List 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 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>> 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,ListsecondCategoryIds,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> heatMap = new HashMap<>(); tagTuples.forEach(tuple -> { Set 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); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java index 79068b4124..23e0c2bb02 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java +++ b/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 issueIds){ - if(CollectionUtils.isEmpty(issueIds)) return ; + if(CollectionUtils.isEmpty(issueIds)) { + return ; + } Set keys = issueIds.stream().map(id -> { return IssueConstant.REDIS_KEY + id; }).collect(Collectors.toSet()); @@ -288,4 +290,4 @@ public class IssueVoteDetailRedis { } -} \ No newline at end of file +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java index cf5af822da..cbc5d8822c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java +++ b/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 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 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 imp applicationList.sort(Comparator.comparing(IssueApplicationDTO::getUpdatedTime, Collections.reverseOrder())); logger.error("com.epmet.service.impl.IssueServiceImpl.topicShiftedToIssueV2，查出多条转移提提交记录，话题Id：{}", param.getTopicId()); } - if(!isStaffAudition) - if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus())) - ifRepeat = true; + if(!isStaffAudition) { + if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus())) { + ifRepeat = true; + } + } applyIds.addAll(applicationList.stream().map(IssueApplicationDTO::getId).collect(Collectors.toList())); } if(!ifRepeat) { @@ -442,14 +448,17 @@ public class IssueServiceImpl extends BaseServiceImpl imp }); } - if(CollectionUtils.isNotEmpty(applyIds)) - result.setIssueApplicationId(applyIds.iterator().next()); + if(CollectionUtils.isNotEmpty(applyIds)) { + 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 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 imp app2update.setIssueId(issueResult.getIssueId()); } - }else throw new RenException(topicInfo.getInternalMsg()); + }else { + throw new RenException(topicInfo.getInternalMsg()); + } //发送站内信 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java index cbefa389e9..be578eb2aa 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkVisitRecordServiceImpl.java +++ b/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 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 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 orientHooks = baseDao.selectProjectTagList(param.getProjectId()); //新增 List 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 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) differentSet.setMinus(orientIds); - if(null == orientIds && null != newIds) differentSet.setPlus(newIds); + if(null == orientIds && null == newIds) { + return ; + } + if(null != orientIds && null == newIds) { + differentSet.setMinus(orientIds); + } + if(null == orientIds && null != newIds) { + differentSet.setPlus(newIds); + } if(null != orientIds && null != newIds){ List 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()); + } } -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index f6a0d6438d..2c7d977980 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/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