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

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

@@ -743,44 +743,6 @@ public class DateUtils {
         return minusMonthId;
     }
 
-    /**
-     * @Description 根据传入的时间维度判断格式，日、周、月、季、年
-     * @param dimension
-     * @return
-     * @author wangc
-     * @date 2020.09.24 10:11
-    **/
-    public static String identifyTimeDimension(String dimension){
-        //yyyyMMdd    DATE_PATTERN_YYYYMMDD
-        //yyyyMM      DATE_PATTERN_YYYYMM
-        //yyyy        DATE_PATTERN_YYYY
-        //yyyyWcc
-        //yyyyQc
-        if(dimension.length() == NumConstant.EIGHT){
-
-           SimpleDateFormat df = new SimpleDateFormat(DATE_PATTERN_YYYYMMDD);
-           try{ df.parse(dimension); }catch (ParseException e){ return null; }
-           return "date";
-
-        }else if(dimension.length() == NumConstant.FOUR){
-            SimpleDateFormat df = new SimpleDateFormat(DATE_PATTERN_YYYY);
-            try{df.parse(dimension);}catch (ParseException e){return null;}
-            return "year";
-        }else if(dimension.length() == NumConstant.SEVEN){
-            if(dimension.contains("W")){
-                return "week";
-            }else return null;
-        }else if(dimension.length() == NumConstant.SIX){
-            if(dimension.contains("Q")){
-                return "quarter";
-            }else{
-                SimpleDateFormat df = new SimpleDateFormat(DATE_PATTERN_YYYYMM);
-                try{df.parse(dimension);}catch (ParseException e){return null;}
-                return "month";
-            }
-        }else return null;
-    }
-
     /**
      * 指定月份的开始时间
      * @param date

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

@@ -62,8 +62,6 @@ public class IpUtils {
 			if (StringUtils.isEmpty(ip) || IP_UNKNOWN.equalsIgnoreCase(ip)) {
 				ip = request.getRemoteAddr();
 			}
-
-			logger.info("getIpAddr origin ip:{}",ip);
 			//对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
 			if (ip != null) { //"***.***.***.***".length() = 15
 				if (ip.indexOf(StrConstant.COMMA) > 0) {
@@ -74,6 +72,7 @@ public class IpUtils {
 		} catch (Exception e) {
 			logger.error("IpUtils getIpAddr ERROR ", e);
 		}
+
 		return ip;
 	}
 

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

@@ -2,6 +2,7 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.distributedlock.LockConstants;
 import com.epmet.commons.tools.enums.EnvEnum;
@@ -229,6 +230,15 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                             log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                         }
                     }
+                    try {
+                        //基层治理 - 热心市民 screen_party_user_rank_data
+                        ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+                        param.setCustomerId(customerId);
+                        param.setDateId(dateId);
+                        screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
+                    } catch (Exception e) {
+                        log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + customerId+ StrConstant.HYPHEN +dateId, e);
+                    }
                 } finally {
                     latch.countDown();
                     log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
@@ -426,7 +436,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         } catch (Exception e) {
             log.error("党建引领抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
-        try {
+        //已经挪到天抽取的抽取里了
+       /* try {
             //基层治理 - 热心市民 screen_party_user_rank_data
             ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
             param.setCustomerId(customerId);
@@ -434,7 +445,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
         } catch (Exception e) {
             log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + JSON.toJSONString(formDTO), e);
-        }
+        }*/
         try {
             // 项目(事件)数量分析按网格_按月统计
             screenProjectQuantityGridMonthlyService.extractionProjectGridMonthly(customerId, monthId);

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

@@ -88,6 +88,10 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
      **/
     @Override
     public void userScoreDataHub(ScreenCentralZoneDataFormDTO param) {
+        if (StringUtils.isNotBlank(param.getDateId()) && param.getDateId().length()!= NumConstant.EIGHT){
+            log.error("userScoreDataHub param dateId must be dateId(eg:20211212)");
+            return;
+        }
         //1.查询出客户下的网格注册用户
         List<ScreenPartyUserRankDataEntity> registeredUsers = userService.getRegisteredUserList(param.getCustomerId());
 
@@ -100,19 +104,15 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         Map<String, Integer> pointMap = userPointService.getUserPointMap(param.getCustomerId());
         //4.查询出客户下党员的分值
         String dateId = param.getDateId();
-        if (StringUtils.isEmpty(dateId)) {
-            //如果没有传月份，则使用当前时间的上一个月
+        final String finalDateId = dateId;
+        String currentMonthId = DateUtils.getBeforeNMonth(0);
+        if (StringUtils.isEmpty(dateId) || dateId.contains(currentMonthId)) {
+            //如果没有传月份 或者传的为日期为当前月则，则使用当前时间的上一个月
             dateId = DateUtils.getBeforeNMonth(NumConstant.ONE);
         } else {
-            String dateType = DateUtils.identifyTimeDimension(dateId);
-            if (StringUtils.isEmpty(dateType) || !StringUtils.equalsAny(dateType, "date", "month")) {
-                dateId = DateUtils.getBeforeNMonth(NumConstant.ONE);
-            } else if (StringUtils.equals(dateType, "date")) {
-                dateId = dateId.substring(NumConstant.ZERO, dateId.length() - NumConstant.TWO);
-            }
+            dateId = dateId.substring(NumConstant.ZERO, dateId.length() - NumConstant.TWO);
         }
-        final String finalDateId = dateId;
-        // 查询党员积分
+        // 查询党员指标得分 按月查
         Map<String, BigDecimal> scoreMap = cpcIndexCalculateService.getCpcScore(param.getCustomerId(), dateId);
 
         //剔除垃圾数据

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

@@ -337,7 +337,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         List<ImportCommunitySelfOrganization> list = testExcelImportResult.getList();
         if (CollectionUtils.isNotEmpty(list)){
             String customerId = tokenDto.getCustomerId();
-            List<String> existsNames = baseDao.selectOrgByOrgName(list.stream().map(m -> m.getOrganizationName()).collect(Collectors.toList()), customerId);
+            List<String> existsNames = baseDao.selectOrgByOrgName(list.stream().map(ImportCommunitySelfOrganization::getOrganizationName).collect(Collectors.toList()), customerId);
             Map<String, List<ImportCommunitySelfOrganization>> groupByName = list.stream().collect(Collectors.groupingBy(ImportCommunitySelfOrganization::getOrganizationName));
             groupByName.forEach((k,v) -> {
                 if (v.size() > NumConstant.ONE){
@@ -399,4 +399,4 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         }
     }
 
-}
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -623,7 +623,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         String bindResult = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_OPEN_GET + authorizerAccessToken, JSON.toJSONString(bindInfoForm)).getData();
         Map<String, Object> bindInfo = JSON.parseObject(bindResult, Map.class);
         boolean bindStatus = bindInfo.containsKey(ModuleConstant.OPEN_APP_ID);
-        if (bindStatus != true) {
+        if (!bindStatus) {
             Integer authCount = customerMpDao.selectAuthCount(customerId);
             String openPlatformId = null;
             if (authCount > 0) {
@@ -658,6 +658,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                         throw new RenException(INVALID_APP_ID);
                     case ModuleConstant.EIGHTY_NINE_THOUSAND:
                         throw new RenException(ACCOUNT_HAS_BOUND_OPEN);
+                    default:
+
                 }
             } else if (authCount > NumConstant.ZERO) {
                 log.info("该客户已创建过开放平台账号，直接绑定");
@@ -685,6 +687,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                         throw new RenException(NOT_ALLOWED_OPERATE);
                     case ModuleConstant.EIGHTY_NINE_THOUSAND_AND_FOUR:
                         throw new RenException(TO_LIMIT);
+                    default:
                 }
             }
             //插入 binding_account
@@ -706,7 +709,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
     public Date countExpirationTime(String expiresIn) {
         expiresIn = expiresIn + "000";
         Date date = new Date();
-        long l = date.getTime() + Long.valueOf(expiresIn);
+        long l = date.getTime() + Long.parseLong(expiresIn);
         date.setTime(l);
         return date;
     }
@@ -727,7 +730,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
      * @author zxc
      */
     public Date sToDate(String t) {
-        Long aLong = Long.valueOf(t + "000");
+        long aLong = Long.parseLong(t + "000");
         Date date = new Date();
         date.setTime(aLong);
         return date;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -40,7 +40,11 @@
             cm.ID AS matterId,
             cm.START_TIME AS startTime,
             cm.END_TIME AS endTime,
-            cm.APPOINTMENT_TYPE AS appointmentType
+            cm.APPOINTMENT_TYPE AS appointmentType,
+            case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
+                 ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime
         FROM ic_party_service_center sc
         LEFT JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = sc.ID AND cm.DEL_FLAG = 0)
         WHERE sc.DEL_FLAG = 0