Merge branch 'dev_ic_mp' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -59,7 +59,8 @@ public class CustomerOrgRedis {
             throw new RenException("查询网格信息失败...");
         }
         if (null == gridInfoResult.getData()){
-            throw new RenException("没有此网格信息...");
+            //throw new RenException("没有此网格信息...");
+            return null;
         }
         Map<String, Object> map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true);
         customerOrgRedis.redisUtils.hMSet(key, map);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -15,7 +16,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean;
@@ -30,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,7 +40,6 @@ import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -302,11 +300,11 @@ public class GovOrgController {
 
             PageData<GridMemberDataAnalysisResultDTO> page;
 
-            int pageNo = 0;
+            int pageNo = NumConstant.ONE;
-            int pageSize = 1000;
+            int pageSize = NumConstant.ONE_THOUSAND;
 
             do {
-                page = aggreGridService.getGridMemberDataAnalysis4PcWork(orgId, orgType, pageNo, pageSize, startTime, endTime, false);
+                page = aggreGridService.getGridMemberDataAnalysis4PcWork(orgId, orgType, pageNo++, pageSize, startTime, endTime, false);
                 List<GridMemberDataAnalysisResultDTO> pageList = page.getList();
 
                 List<GridMemberDataAnalysisExcelExportBean> exportBeans = ConvertUtils.sourceToTarget(pageList, GridMemberDataAnalysisExcelExportBean.class);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2172,6 +2172,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         //    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "【pcwork查询网格员数据统计列表】传入时间条件有误");
         //}
 
+        PageHelper.startPage(pageNo, pageSize, needCount);
         return factGridMemberStatisticsDailyDao.listGridMemberDataStatsIncr(pids, gridId, startDateID,  endDateID);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -342,7 +342,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
             //re.setTotalTime(re.getTimeNum() < 1 ? BigDecimal.ZERO + "h" : new BigDecimal(numberFormat.format((float) re.getTimeNum() / (float) 3600)) + "h");
             //re.setTotalTime(re.getTimeNum() / 60 + "分钟");
-            list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
+            //list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
         });
 
         return resultList;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

@@ -19,11 +19,14 @@ import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.rmi.runtime.Log;
 
 import java.util.*;
 
+@Slf4j
 @Service
 public class AggreGridServiceImpl implements AggreGridService {
 
@@ -101,6 +104,10 @@ public class AggreGridServiceImpl implements AggreGridService {
         for (GridMemberDataAnalysisResultDTO data : datas) {
             // 填充gridName
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(data.getGridId());
+            if (gridInfo == null) {
+                log.warn("未找到网格信息:{}", data.getGridId());
+                continue;
+            }
             Optional.ofNullable(gridInfo).ifPresent((d) -> data.setOrgName(d.getGridName()));
 
             // 生成结构化map

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

@@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import sun.jvm.hotspot.memory.ContiguousSpace;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -397,6 +398,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                     l.setGridName(agencyInfo.getOrganizationName());
                 }else {
                     GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getOrgId());
+                    if (gridInfo == null) {
+                        log.warn("未找到网格信息:{}", l.getOrgId());
+                        return;
+                    }
                     l.setGridName(gridInfo.getGridNamePath());
                 }
             });

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-stats.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx3000m -jar ./data-stats.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 1600M
+          memory: 3200M

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

@@ -126,7 +126,12 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 if (null != gridInfo) {
                     user.setGridName(gridInfo.getGridName());
                     user.setOrgId(gridInfo.getAgencyId());
-                    user.setOrgName(gridInfo.getOrgName());
+                    if(StringUtils.isNotBlank(gridInfo.getOrgName())){
+                        user.setOrgName(gridInfo.getOrgName());
+                    }else{
+                        GridInfoDTO gridInfoDTO = customerGridService.queryGridInfoDTO(user.getGridId());
+                        user.setOrgName(gridInfoDTO.getOrgName());
+                    }
                     //原始数据Pid使用英文:隔开，大屏数据要求按照英文,隔开
                     user.setAllParentIds(gridInfo.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA));
                 }else{

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -110,8 +110,7 @@
             LEFT JOIN customer_agency ca
             ON (cg.PID = CA.ID)
         WHERE
-            CG.CUSTOMER_ID =#{customerId}
+             cg.id = #{gridId}
-            and cg.id = #{gridId}
     </select>
 
     <select id="getCustomerStaffGridList" resultType="com.epmet.dto.org.CustomerStaffGridDTO">

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java

@@ -22,6 +22,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -73,11 +74,13 @@ public class AddSocietyOrgFormDTO implements Serializable {
     /**
      * 起始服务时间
      */
+    @NotNull(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceStartTime;
     /**
      * 终止服务时间
      */
+    @NotNull(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceEndTime;
     /**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -100,6 +100,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if(gridInfo == null) {
+                    log.warn("未找到网格信息:{}", item.getGridId());
+                    return;
+                }
                 item.setGridName(gridInfo.getGridName());
             }
         });
@@ -191,6 +195,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (gridInfo == null) {
+                    log.warn("未找到网格信息:{}", item.getGridId());
+                    return;
+                }
                 item.setGridName(gridInfo.getGridName());
             }
         });

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -218,12 +218,14 @@ public class CustomerStaffController {
         Result<CustomerStaffDTO> result = customerStaffService.addStaff(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
-        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        if (result.success()) {
-        mq.setCustomerId(fromDTO.getCustomerId());
+            OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
-        mq.setOrgId(result.getData().getUserId());
+            mq.setCustomerId(fromDTO.getCustomerId());
-        mq.setOrgType("staff");
+            mq.setOrgId(result.getData().getUserId());
-        mq.setType("staff_create");
+            mq.setOrgType("staff");
-        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+            mq.setType("staff_create");
+            SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;
@@ -240,12 +242,14 @@ public class CustomerStaffController {
         Result result = customerStaffService.editStaff(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
-        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        if (result.success()) {
-        mq.setCustomerId(fromDTO.getCustomerId());
+            OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
-        mq.setOrgId(fromDTO.getStaffId());
+            mq.setCustomerId(fromDTO.getCustomerId());
-        mq.setOrgType("staff");
+            mq.setOrgId(fromDTO.getStaffId());
-        mq.setType("staff_change");
+            mq.setOrgType("staff");
-        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+            mq.setType("staff_change");
+            SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;