Merge remote-tracking branch 'remotes/origin/dev' into shibei_master

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

@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./data-aggregator.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx760m -jar ./data-aggregator.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 600M
+          memory: 800M

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java

@@ -355,6 +355,7 @@ public interface DataStatsDao {
                                                                          @Param("configIds") List<String> configIds);
 
     List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(@Param("gridPids") String gridPids,
+                                                                           @Param("orgId")String orgId,
                                                                            @Param("dateId") String dateId,
                                                                            @Param("configIds") List<String> configIds);
 }

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

@@ -283,5 +283,5 @@ public interface DataStatsService {
 
     List<FactIcuserCategoryAnalysisDailyDTO> queryGridIcUserCategoryData(String orgId, String dateId, List<String> configIds);
 
-    List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String dateId, List<String> configIds);
+    List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List<String> configIds);
 }

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

@@ -2181,10 +2181,10 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
     }
 
     @Override
-    public List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String dateId, List<String> configIds) {
+    public List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List<String> configIds) {
-        if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){
+        if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(orgId)){
             return new ArrayList<>();
         }
-        return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,dateId,configIds);
+        return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds);
     }
 }

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

@@ -33,9 +33,6 @@ import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
 import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity;
 import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
-import com.epmet.dataaggre.service.datastats.DataStatsService;
-import com.epmet.dataaggre.entity.epmetuser.*;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
@@ -789,15 +786,20 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                     });
                 }
             }else if(OrgInfoConstant.AGENCY.equals(formDTO.getOrgType())){
-                CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId());
+                /*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId());
                 String gridPids="";
                 if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){
                     // 当前组织是根组织
                     gridPids=formDTO.getOrgId();
                 }else {
+                    if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){
+                        //市北的是英文冒号隔开的
+                        gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId());
+                    }else{
                         gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId());
                     }
-                List<FactIcuserCategoryAnalysisDailyDTO> list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds);
+                }*/
+                List<FactIcuserCategoryAnalysisDailyDTO> list = dataStatsService.queryAgencyIcUserCategoryData(null, formDTO.getOrgId(), formDTO.getDateId(), configIds);
                 if(CollectionUtils.isNotEmpty(list)){
                     Map<String, FactIcuserCategoryAnalysisDailyDTO> configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1));
                     resList.forEach(resDto->{

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -1134,7 +1134,10 @@
         WHERE
             m.DATE_ID = #{dateId}
             AND m.DEL_FLAG = '0'
+            <if test="gridPids != null and gridPids != '' ">
                 AND m.PIDS LIKE concat(#{gridPids},'%')
+            </if>
+            AND m.pids like concat('%',#{orgId},'%')
             AND M.ORG_TYPE='grid'
             <if test='null!=configIds and configIds.size()>0'>
                 <foreach collection="configIds" item="configId" open="AND (" close=")" separator=" OR ">

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

@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-report.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-report.jar"
     restart: "unless-stopped"
     deploy:
       resources:

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

@@ -208,14 +208,16 @@ public class BuildingServiceImpl implements BuildingService {
             buildingTreeLevelDTO.setChildren(new ArrayList<>());
             //当前楼栋共有多少户，有多少户有人住
             buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR);
-            // 总单元数
+           /* // 总单元数
             Integer totalUnitNum = null == item.getTotalUnitNum() ? NumConstant.ZERO : item.getTotalUnitNum();
             // 总楼层总数
             Integer totalFloorNum = null == item.getTotalFloorNum() ? NumConstant.ZERO : item.getTotalFloorNum();
             // *总户数
             Integer totalHouseNum = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum();
             //总户数=以上三个数相乘
-            Integer total=totalUnitNum*totalFloorNum*totalHouseNum;
+            Integer total=totalUnitNum*totalFloorNum*totalHouseNum;*/
+            //02.11 之前录入的户数概念改为总户数，无需计算直接用就可以了
+            Integer total = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum();
             //已经添加了多少户
             LambdaQueryWrapper<IcHouseEntity> icHouseEntityWrapper = new QueryWrapper<IcHouseEntity>().lambda()
                     .in(IcHouseEntity::getBuildingId, item.getId());

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

@@ -130,7 +130,10 @@
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
         <where>
             <if test="pids != null and pids != ''">
-                AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%')
+                case c.AGENCY_PIDS
+                    when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
+                    else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%')
+                end
             </if>
             <if test="buildingId != null and buildingId.trim() != ''">
                 AND a.BUILDING_ID = #{buildingId}

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

@@ -1211,7 +1211,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             Map<String, String> newCategories = transferedData.getNewData().getCategories();
             Map<String, String> oldCategories = transferedData.getOldData().getCategories();
 
-            oldCategories.put(columnName, "0");
+            String oldValue = resiInfoMap.get(columnName);
+            if (StringUtils.isBlank(oldValue)) {
+                oldValue = "0";
+            }
+
+            oldCategories.put(columnName, oldValue);
             newCategories.put(columnName, "1");
             return;
         }
@@ -1371,8 +1376,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      */
     public void saveTransferedResiRecord(Map<String, ResiImportChangedData> transferedResis) {
         Date now = new Date();
-        for (Map.Entry<String, ResiImportChangedData> resi : transferedResis.entrySet()) {
         String customerId = loginUserUtil.getLoginUserCustomerId();
+        CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId());
+
+        for (Map.Entry<String, ResiImportChangedData> resi : transferedResis.entrySet()) {
 
             String resiId = resi.getKey();
             ResiImportCategoryData oldData = resi.getValue().getOldData();
@@ -1478,8 +1485,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 }
             }
 
-            CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId());
-
             IcResiUserEntity resiInfo = icResiUserDao.selectById(resiId);
 
             // 保存 transferRecord