Merge remote-tracking branch 'remotes/origin/dev' into 市北测试

epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java

@@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class AdminApplication {
 
     public static void main(String[] args) {

epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql

@@ -0,0 +1,17 @@
+
+
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000220', `dict_label` = '区域化党建单位--楼宇党建'
+WHERE (`id` = '1000000000000000200');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000221', `dict_label` = '区域化党建单位--两新组织'
+WHERE (`id` = '1000000000000000201');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000222', `dict_label` = '区域化党建单位--区域单位党建'
+WHERE (`id` = '1000000000000000202');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000223', `dict_label` = '区域化党建单位--机关直属部门'
+WHERE (`id` = '1000000000000000203');
+UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000224', `dict_label` = '区域化党建单位--其他'
+WHERE (`id` = '1000000000000000204');
+
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000225', '1000000000000000007', '社会组织--社会团体', '5', '0', '', '5', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000226', '1000000000000000007', '社会组织--民办非企业单位', '6', '0', '', '6', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000227', '1000000000000000007', '社会组织--基金会', '7', '0', '', '7', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000228', '1000000000000000007', '社会组织--其他', '8', '0', '', '8', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18');

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql

@@ -0,0 +1,6 @@
+update sys_dict_data set dict_label='联建单位'
+where dict_value='party_unit'
+and DEL_FLAG='0'
+and dict_type_id=(
+	select st.id from sys_dict_type st where st.dict_type='user_demand_service_type' and st.DEL_FLAG='0'
+);

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.14__up_del_sys_dict_data.sql

@@ -0,0 +1,10 @@
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='楼宇党建' WHERE (`id`='1000000000000000220');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='两新组织' WHERE (`id`='1000000000000000221');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='区域单位党建' WHERE (`id`='1000000000000000222');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='机关直属部门' WHERE (`id`='1000000000000000223');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='社会团体' WHERE (`id`='1000000000000000224');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='民办非企业单位' WHERE (`id`='1000000000000000225');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='基金会' WHERE (`id`='1000000000000000226');
+UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='其他' WHERE (`id`='1000000000000000227');
+
+DELETE FROM `epmet_admin`.`sys_dict_data` WHERE id = '1000000000000000228';

epmet-auth/src/main/java/com/epmet/AuthApplication.java

@@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan // 开启Servlet容器扫描，扫描@WebFilter等注解
+@ServletComponentScan(basePackages = "com.epmet") // 开启Servlet容器扫描，扫描@WebFilter等注解
 public class AuthApplication {
 
     public static void main(String[] args) {

epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java

@@ -14,9 +14,11 @@ import java.util.List;
 public class OptionResultDTO implements Serializable {
     private static final long serialVersionUID = 8618231166600518980L;
     private String label;
+    private String code;
     private String value;
     private String pValue;
     private String sysDictDataId;
     private List<OptionResultDTO> children;
     private Boolean usableFlag;
+    private String type;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java

@@ -7,11 +7,16 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
  */
 public enum PartyUnitTypeEnum {
     //房屋类型，1楼房，2平房，3别墅
-    LOUYU("0", "楼宇党建"),
-    ZUZHI("1", "两新组织"),
-    DANWEI("2", "区域单位党建"),
-    JIGUAN("3", "机关直属部门"),
-    QITA("4", "其他");
+    LOUYU("0", "区域化党建单位--楼宇党建"),
+    ZUZHI("1", "区域化党建单位--两新组织"),
+    DANWEI("2", "区域化党建单位--区域单位党建"),
+    JIGUAN("3", "区域化党建单位--机关直属部门"),
+    QITA("4", "区域化党建单位--其他"),
+    SHZZ_SHTT("5", "社会组织--社会团体"),
+    SHZZ_MBFQYDW("6", "社会组织--民办非企业单位"),
+    SHZZ_JJH("7", "社会组织--基金会"),
+    SHZZ_QT("8", "社会组织--其他");
+
     private String code;
     private String name;
 

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

@@ -10,6 +10,8 @@ package com.epmet.commons.tools.redis;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -774,4 +776,16 @@ public class RedisKeys {
 	public static String getNextAreaCodeKey(String areaCode) {
 		return rootPrefix.concat("areaCode:parentCode:").concat(areaCode);
 	}
+
+	/**
+	 * desc:获取分布式锁key
+	 * @param methodName
+	 * @return
+	 */
+	public static String getLockByMethodName(String methodName) {
+		if (StringUtils.isBlank(methodName)){
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误");
+		}
+		return rootPrefix.concat("lock:").concat(methodName);
+	}
 }

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

@@ -62,4 +62,8 @@ public class CustomerIcHouseRedis {
         return buildInfoResult.getData();
     }
 
+    public static void delBuildingInfo(String buildingId){
+        String key = RedisKeys.getBuildingInfoKey(buildingId);
+        customerIcHouseRedis.redisUtils.delete(key);
+    }
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -59,6 +60,11 @@ public class AgencyInfoCache implements Serializable {
      */
     private String areaCode;
 
+    /**
+     * 地区编码全路径：例如：37,3702,370203,370203005,370203005015
+     */
+    private List<String> areaCodePath;
+
     /**
      * 删除标识
      */
@@ -139,4 +145,26 @@ public class AgencyInfoCache implements Serializable {
      * 中心位置纬度
      */
     private String latitude;
+
+    /**
+     * 组织编码
+     */
+    private String code;
+
+    /**
+     * 负责人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+
+    //内部接口使用
+    /**
+     *  open:当前客户新增组织需要选择areaCode；closed:  无需选择区域编码
+     */
+    private String areaCodeSwitch;
 }

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

@@ -118,4 +118,20 @@ public class GridInfoCache implements Serializable {
      * 弃用标记
      */
     private Integer abandonFlag;
+
+    /**
+     * 网格编码
+     */
+    private String code;
+
+    /**
+     * 负责人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
 }

epmet-gateway/src/main/java/com/epmet/GatewayApplication.java

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.FilterType;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-//@ServletComponentScan
+//@ServletComponentScan(basePackages = "com.epmet")
 @ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RedissonConfig.class, ThreadDispatcherConfig.class, ServletExceptionHandler.class}))
 public class GatewayApplication {
 

epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -172,4 +173,9 @@ public class CustomerAgencyDTO implements Serializable {
      * 联系电话
      */
     private String mobile;
+
+    /**
+     * 地区编码全路径：例如：37,3702,370203,370203005,370203005015
+     */
+    private List<String> areaCodePath;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/DataAggregatorApplication.java

@@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication(scanBasePackages = {"com.epmet"}, exclude = {DataSourceAutoConfiguration.class})
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DataAggregatorApplication {
     public static void main(String[] args) {
         SpringApplication.run(DataAggregatorApplication.class, args);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

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

@@ -21,10 +21,10 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums;
 import com.epmet.dataaggre.service.AggreGridService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -242,8 +242,8 @@ public class GovOrgController {
      * @date 2021/11/5 2:54 下午
      */
     @PostMapping("agency")
-    public Result<CustomerAgencyEntity> getAgencyInfo(@RequestParam("agencyId")String agencyId){
-        return new Result<CustomerAgencyEntity>().ok(govOrgService.getAgencyInfo(agencyId));
+    public Result<CustomerAgencyDTO> getAgencyInfo(@RequestParam("agencyId")String agencyId){
+        return new Result<CustomerAgencyDTO>().ok(govOrgService.getAgencyInfo(agencyId));
     }
 
     /**
@@ -305,7 +305,7 @@ public class GovOrgController {
             CustomerGridDTO gridInfo = govOrgService.getGridInfo(orgId);
             Optional.ofNullable(gridInfo).ifPresent((g) -> orgName.set(g.getGridName()));
         } else if ("agency".equals(orgType)) {
-            CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(orgId);
+            CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(orgId);
             Optional.ofNullable(agencyInfo).ifPresent((a) -> orgName.set(a.getOrganizationName()));
         }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java

@@ -105,4 +105,5 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      */
     LinkedList<GridLivelyResultDTO> subAgencyListAndGridSumNum(@Param("agencyId") String agencyId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -8,7 +8,6 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -162,7 +161,7 @@ public interface GovOrgService {
      * @author zxc
      * @date 2021/11/5 2:54 下午
      */
-    CustomerAgencyEntity getAgencyInfo(String agencyId);
+    CustomerAgencyDTO getAgencyInfo(String agencyId);
 
     /**
      * @Description  查询网格信息

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

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.alibaba.fastjson.JSON;
 import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.DingDingRobotConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -23,6 +24,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@@ -250,41 +252,6 @@ public class GovOrgServiceImpl implements GovOrgService {
         return result;
     }
 
-    public static void main(String[] args) {
-        List<NextAreaCodeResultDTO> allList = new ArrayList<>();
-        NextAreaCodeResultDTO m1 = new NextAreaCodeResultDTO();
-        m1.setAreaCode("1");
-        m1.setAreaName("a");
-        allList.add(m1);
-
-        NextAreaCodeResultDTO m2 = new NextAreaCodeResultDTO();
-        m2.setAreaCode("2");
-        m2.setAreaName("b");
-        allList.add(m2);
-
-
-        NextAreaCodeResultDTO m3 = new NextAreaCodeResultDTO();
-        m3.setAreaCode("3");
-        m3.setAreaName("c");
-        allList.add(m3);
-
-        List<String> stringList = new ArrayList<>();
-        stringList.add("1");
-        stringList.add("2");
-
-        Iterator<NextAreaCodeResultDTO> iterator = allList.iterator();
-        while (iterator.hasNext()) {
-            NextAreaCodeResultDTO next = iterator.next();
-            for (String usedAreaCode : stringList) {
-                if (next.getAreaCode().equals(usedAreaCode)) {
-                    iterator.remove();
-                }
-            }
-
-        }
-        System.out.println(JSON.toJSONString(allList, true));
-    }
-
     /**
      * @param staffId
      * @Author sun
@@ -642,8 +609,46 @@ public class GovOrgServiceImpl implements GovOrgService {
      * @date 2021/11/5 2:54 下午
      */
     @Override
-    public CustomerAgencyEntity getAgencyInfo(String agencyId) {
-        return customerAgencyDao.selectById(agencyId);
+    public CustomerAgencyDTO getAgencyInfo(String agencyId) {
+        CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId);
+        CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class);
+        //设置行政地区编码全路径
+        if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) {
+            res.setAreaCodePath(queryAreaCodePath(res));
+        }
+        return res;
+    }
+
+    private List<String> queryAreaCodePath(CustomerAgencyDTO customerAgencyEntity) {
+        List<String> areaCodePath = new ArrayList<>();
+        switch (customerAgencyEntity.getLevel()) {
+            case Constant.COMMUNITY:
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR));
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.SIX));
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.STREET:
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR));
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.DISTRICT:
+                areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.CITY:
+                areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+            case Constant.PROVINCE:
+                areaCodePath.add(customerAgencyEntity.getAreaCode());
+                break;
+        }
+        return areaCodePath;
     }
 
     /**

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

@@ -8,10 +8,10 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.dto.epmetuser.result.StaffPatrolRecordDailyResultDTO;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.AggreGridService;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
@@ -22,7 +22,6 @@ 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.*;
 
@@ -173,7 +172,7 @@ public class AggreGridServiceImpl implements AggreGridService {
      * @return
      */
     private String getPidsByAgencyId(String agencyId) {
-        CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(agencyId);
+        CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(agencyId);
 
         if (agencyInfo == null) {
             String errorMsg = "【网格员数据统计查询pcwork】查询组织信息返回为null";

epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java

@@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableDiscoveryClient
 @EnableFeignClients
 @EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DataReportApplication {
     public static void main(String[] args) {
         SpringApplication.run(DataReportApplication.class, args);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -163,6 +163,7 @@
         WHERE
         u.del_flag = '0'
         AND PARTY_FLAG = 0
+        AND u.point_total > 0 <!-- 初心互助中公益达人，0分人员不显示在榜单上 -->
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
                 AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%')
@@ -207,6 +208,7 @@
             WHERE
             u.del_flag = '0'
             AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
+            and u.point_total > 0 <!-- 初心互助中党员先锋排行，0分人员不显示在榜单上 -->
             <if test="orgType != null and orgType !=''">
                 <if test="orgType == 'agency'">
                     AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%')

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

@@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableFeignClients
 @SpringBootApplication (exclude = {DataSourceAutoConfiguration.class})
 @EnableAsync
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DataStatsApplication {
 
     public static void main(String[] args) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -394,61 +394,61 @@
         </foreach>
     </select>
     <select id="getCheckResult" resultType="com.epmet.dto.screen.result.DataCheckDTO">
-        SELECT
-            CUSTOMER_ID,
+	    SELECT
+            a.CUSTOMER_ID,
             AGENCY_ID AS agencyId,
-            CASE
-                AGENCY_ID
-                WHEN '1258587398679126017' THEN
-                '榆山'
-                WHEN '1215437824174608386' THEN
-                '锦水'
-                WHEN '1234085031077498881' THEN
-                '孔村'
-                WHEN 'f8d4a6af53b3fc5991ab1434b6ad39b8' THEN
-                '东阿镇'
-                WHEN 'f279343a67653fc20d8333c6b2e4dbee' THEN
-                '孝直镇'
-                WHEN 'ea78a8e9252f567517c4a8d60250c714' THEN
-                '安城镇'
-                WHEN 'c259c3b1d27f960b9b379fb2886179ba' THEN
-                '洪范池镇'
-                WHEN 'd20a7488eedf5bcfd5231c3771bc0e3d' THEN
-                '玫瑰镇'
-                ELSE '未知'
-            END AS agencyName,
-            PROJECT_TOTAL AS reportCount,
+        CASE
+            AGENCY_ID
+            WHEN '1258587398679126017' THEN
+            '榆山'
+            WHEN '1215437824174608386' THEN
+            '锦水'
+            WHEN '1234085031077498881' THEN
+            '孔村'
+            WHEN 'f8d4a6af53b3fc5991ab1434b6ad39b8' THEN
+            '东阿镇'
+            WHEN 'f279343a67653fc20d8333c6b2e4dbee' THEN
+            '孝直镇'
+            WHEN 'ea78a8e9252f567517c4a8d60250c714' THEN
+            '安城镇'
+            WHEN 'c259c3b1d27f960b9b379fb2886179ba' THEN
+            '洪范池镇'
+            WHEN 'd20a7488eedf5bcfd5231c3771bc0e3d' THEN
+            '玫瑰镇' ELSE '未知'
+        END AS agencyName,
             DATE_ID,
+            PROJECT_TOTAL AS reportCount,
+            COUNT( b.PROJECT_ID ) AS count
+        FROM
             (
             SELECT
-                count(*) AS dataCount
+                *
             FROM
-                screen_project_data
+                epmet_data_statistical.fact_agency_project_daily
             WHERE
                 1 = 1
-                AND CUSTOMER_ID = a.CUSTOMER_ID
-                AND ALL_PARENT_IDS LIKE CONCAT( '%', a.AGENCY_ID, '%' )
                 AND DEL_FLAG = '0'
-                AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) &lt;= DATE_ID
-            GROUP BY
-                AGENCY_ID
-            ORDER BY
-                AGENCY_ID
-            ) AS count
-        FROM
-            epmet_data_statistical.fact_agency_project_daily a
-        WHERE
-            1 = 1
-            AND del_flag = '0'
-            AND customer_id IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )
-            AND AGENCY_ID IN ( '1234085031077498881', '1215437824174608386', '1258587398679126017', 'c259c3b1d27f960b9b379fb2886179ba', 'd20a7488eedf5bcfd5231c3771bc0e3d', 'ea78a8e9252f567517c4a8d60250c714', 'f279343a67653fc20d8333c6b2e4dbee', 'f8d4a6af53b3fc5991ab1434b6ad39b8' )
-            <if test='null != dateId and "" != dateId'>
-                AND DATE_ID = #{dateId}
-            </if>
-            <if test='null != startDate and "" != startDate and null != endDate and "" != endDate'>
-                AND DATE_ID BETWEEN #{startDate} AND #{endDate}
-            </if>
+                AND CUSTOMER_ID IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )
+                AND AGENCY_ID IN ( '1234085031077498881', '1215437824174608386', '1258587398679126017', 'c259c3b1d27f960b9b379fb2886179ba', 'd20a7488eedf5bcfd5231c3771bc0e3d', 'ea78a8e9252f567517c4a8d60250c714', 'f279343a67653fc20d8333c6b2e4dbee', 'f8d4a6af53b3fc5991ab1434b6ad39b8' )
+                <if test='null != dateId and "" != dateId'>
+                    AND DATE_ID = #{dateId}
+                </if>
+                <if test='null != startDate and "" != startDate and null != endDate and "" != endDate'>
+                    AND DATE_ID BETWEEN #{startDate} AND #{endDate}
+                </if>
+            ) a
+        LEFT JOIN (
+            SELECT
+                *
+            FROM
+                screen_project_data
+            WHERE
+                DEL_FLAG = '0'
+            AND CUSTOMER_ID IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )) b ON b.CUSTOMER_ID = a.CUSTOMER_ID
+            AND ALL_PARENT_IDS LIKE CONCAT( '%', a.AGENCY_ID, '%' )
+            AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) &lt;= DATE_ID
         GROUP BY
+            CUSTOMER_ID,
             AGENCY_ID,
             DATE_ID
         HAVING
@@ -456,7 +456,7 @@
             AND reportCount != count
         ORDER BY
             AGENCY_ID,
-	        DATE_ID DESC
+            DATE_ID DESC
     </select>
 
     <update id="updateHistoryData">

epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/ActivitiApplication.java

@@ -26,7 +26,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 })
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class ActivitiApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java

@@ -0,0 +1,51 @@
+package com.epmet.utils;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+
+/**
+ * 导入任务工具类，用于创建/完成导入工具
+ */
+public class ImportTaskUtils implements ResultDataResolver {
+
+    /**
+     * 创建导入任务，可能抛出8000异常，请考虑捕获异常
+     * @param originFileName 上传的文件的名称
+     * @param bizType 业务类型，见ImportTaskConstants常量
+     * @return Result
+     */
+    public static Result<ImportTaskCommonResultDTO> createImportTask(String originFileName, String bizType) {
+        ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
+        form.setOriginFileName(originFileName);
+        form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
+        form.setBizType(bizType);
+
+        return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form);
+    }
+
+    /**
+     * 结束导入任务
+     * @param taskId 任务ID
+     * @param processStatus 处理状态 见ImportTaskConstants
+     * @param resultDescFilePath 结果描述文件的路径
+     * @param resultDesc 结果简要描述文字
+     * @return Result
+     */
+    public static Result finishImportTask(String taskId, String processStatus, String resultDescFilePath, String resultDesc) {
+        ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
+        form.setTaskId(taskId);
+        form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
+        form.setProcessStatus(processStatus);
+        form.setResultDescFilePath(resultDescFilePath);
+        form.setResultDesc(resultDesc);
+
+        return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form);
+    }
+
+}

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

@@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class EpmetCommonServiceApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml

@@ -84,7 +84,6 @@
             area_code_child ac
         WHERE
             ac.DEL_FLAG = '0'
-            AND ac.USER_DEFINED = '0'
             <if test='null != pCode and "" != pCode'>
                 AND ac.p_code=#{pCode}
             </if>
@@ -101,7 +100,6 @@
             area_code_child ac
         WHERE
             ac.DEL_FLAG = '0'
-            AND ac.USER_DEFINED = '0'
             <if test='null != pCode and "" != pCode'>
                 AND ac.p_code=#{pCode}
             </if>

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/DemoApplication.java

@@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class DemoApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/EpmetExtApplication.java

@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class EpmetExtApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

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

@@ -133,4 +133,9 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 备注
+     */
+	private String remark;
+
 }

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

@@ -57,7 +57,8 @@ public class IcPartyActivityDTO implements Serializable {
      */
     @JsonIgnore
 	private String agencyId;
-
+    private String gridId;
+    private String gridName;
     /**
      * 组织的所有上级
      */
@@ -67,7 +68,6 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * act_info表ID
      */
-    @JsonIgnore
     private String actId;
 
     private String unitId;

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

@@ -43,7 +43,7 @@ public class LatestActInfoDTO implements Serializable {
      * 客户id
      */
 	private String customerId;
-
+    private String gridId;
     /**
      * 活动标题
      */

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

@@ -56,6 +56,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String organizationCreatedTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 经度
      */

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

@@ -46,4 +46,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable {
     private String customerId;
     private String agencyId;
     private Integer ranking;
+
+    private String remark;
 }

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

@@ -68,6 +68,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 社区自组织ID
      */

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

@@ -19,6 +19,7 @@ public class PartyActivityFormDTO implements Serializable {
     private static final long serialVersionUID = -2510068555703677L;
     @NotBlank(message = "组织Id不能为空" )
     private String agencyId;
+    private String gridId;
     private String unitId;
     private String title;
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

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

@@ -28,7 +28,7 @@ public class DraftActInfoFormDTO implements Serializable {
      * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的
      */
     private String actDraftId;
-
+    private String gridId;
 
     /**
      * 如果是重新发布活动，此列是有值的

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

@@ -36,7 +36,7 @@ public class PublishActInfoFormDTO implements Serializable {
      * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的
      */
     private String actDraftId;
-
+    private String gridId;
     /**
      * 客户id
      */

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

@@ -36,6 +36,8 @@ public class RePublishFormDTO implements Serializable {
      */
     private String actDraftId;
 
+    private String gridId;
+
     /**
      * 活动id
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -53,6 +53,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      */
     private String organizationCreatedTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 经度
      */
@@ -87,6 +92,7 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
         this.longitude = "";
         this.latitude = "";
         this.orgId = "";
+        this.remark = "";
         this.score = NumConstant.ZERO;
         this.organizationPersonnel = new ArrayList<>();
     }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

@@ -181,6 +181,9 @@ public class ResiActDetailResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
+
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java

@@ -101,6 +101,9 @@ public class ActPreviewResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
+
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java

@@ -153,6 +153,8 @@ public class CanceledActDetailResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java

@@ -142,6 +142,9 @@ public class FinishedActDetailResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
+
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java

@@ -137,6 +137,9 @@ public class InProgressActDetailResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
+
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java

@@ -21,6 +21,7 @@ public class LatestDraftActInfoResultDTO implements Serializable {
      * 活动草稿id
      */
     private String actDraftId;
+    private String gridId;
     /**
      * 客户id
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java

@@ -154,6 +154,9 @@ public class ReEditActInfoResultDTO implements Serializable {
      */
     private String actType;
 
+    private String gridId;
+    private String gridName;
+
     /**
      * 联建单位
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -12,6 +12,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -92,4 +93,14 @@ public interface EpmetHeartOpenFeignClient {
      */
     @PostMapping("/heart/resi/volunteer/modifyVolunteerGrid")
     Result modifyVolunteerGrid(@RequestBody VolunteerInfoDTO volunteerInfoDTO);
+
+    /**
+     * 客户初始化数据
+     * @Param customerId
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:50
+     */
+    @GetMapping("/heart/serviceitem/initCustomer/{customerId}")
+    Result customerInit(@PathVariable(value = "customerId") String customerId);
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -88,4 +88,18 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result modifyVolunteerGrid(VolunteerInfoDTO volunteerInfoDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "modifyVolunteerGrid", volunteerInfoDTO);
     }
+
+    /**
+     * 客户初始化数据
+     *
+     * @param customerId
+     * @Param customerId
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:50
+     */
+    @Override
+    public Result customerInit(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "customerInit", customerId);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java

@@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 @EnableAsync
 public class EpmetHeartApplication {
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java

@@ -12,13 +12,12 @@ import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
+import com.epmet.service.IcResiDemandDictService;
 import com.epmet.service.IcServiceItemDictService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -33,6 +32,8 @@ public class IcServiceItemDictController {
 
     @Autowired
     private IcServiceItemDictService icServiceItemDictService;
+    @Resource
+    private IcResiDemandDictService icResiDemandDictService;
 
 
     /**
@@ -85,4 +86,18 @@ public class IcServiceItemDictController {
         ValidatorUtils.validateEntity(formDTO,ServiceItemSelectFormDTO.AddUserInternalGroup.class);
         return new Result<List<OptionDTO>>().ok(icServiceItemDictService.queryDictListForSelect(formDTO));
     }
+
+    /**
+     * 客户初始化数据
+     * @Param customerId
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:50
+     */
+    @GetMapping("initCustomer/{customerId}")
+    public Result customerInit(@PathVariable(value = "customerId") String customerId) {
+        icServiceItemDictService.customerInit(customerId);
+        icResiDemandDictService.customerInit(customerId);
+        return new Result();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java

@@ -106,4 +106,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java

@@ -47,7 +47,7 @@ public class IcPartyActivityEntity extends BaseEpmetEntity {
      * 组织ID
      */
 	private String agencyId;
-
+	private String gridId;
     /**
      * 组织的所有上级
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java

@@ -43,7 +43,7 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
      * 客户id
      */
 	private String customerId;
-
+	private String gridId;
     /**
      * 活动标题
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java

@@ -31,6 +31,9 @@ public class ExportCommunitySelfOrganizationExcel {
     @Excel(name = "创建时间", width = 20, needMerge = true)
     private String organizationCreatedTime;
 
+    @Excel(name = "备注", width = 60, needMerge = true)
+    private String remark;
+
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> organizationPersonnel;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java

@@ -40,6 +40,9 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo {
     @Excel(name = "创建时间", needMerge = true)
     private String organizationCreatedTime;
 
+    @Excel(name = "备注", needMerge = true)
+    private String remark;
+
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> persons;
 

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

@@ -20,7 +20,6 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.DemandCategoryResDTO;
 import com.epmet.dto.result.demand.DemandPageResDTO;
@@ -147,4 +146,13 @@ public interface IcResiDemandDictService extends BaseService<IcResiDemandDictEnt
      * @return
      */
     List<DemandCategoryResDTO> queryLatestOrder(String userId, String customerId);
+
+    /**
+     * 客户初始化
+     * @Param customerId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:31
+     */
+    void customerInit(String customerId);
 }

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

@@ -70,4 +70,13 @@ public interface IcServiceItemDictService extends BaseService<IcServiceItemDictE
      * @return
      */
     List<OptionDTO> queryDictListForSelect(ServiceItemSelectFormDTO formDTO);
+
+    /**
+     * 客户初始化
+     * @Param customerId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:31
+     */
+    void customerInit(String customerId);
 }

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

@@ -25,6 +25,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -279,6 +281,14 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 detailResultDTO.setUnitIdList(unitIds);
                 detailResultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    detailResultDTO.setGridId(dto.getGridId());
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        detailResultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
             }
         }
         return new Result<ResiActDetailResultDTO>().ok(detailResultDTO);

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

@@ -28,7 +28,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -123,6 +125,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                 List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
             });
         }
 
@@ -150,6 +158,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                 List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
             });
         }
 
@@ -171,6 +185,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
         dto.setServiceMatterList(services);
         dto.setServiceMatterNameList(serviceNames);
+        if (StringUtils.isNotEmpty(dto.getGridId())) {
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+            if (null != gridInfo) {
+                dto.setGridName(gridInfo.getGridName());
+            }
+        }
 
         //获取单位
         //获取组织下联建单位
@@ -547,6 +567,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                 List<String> services = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA));
                 List<String> serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList());
                 dto.setServiceMatterName(StringUtils.join(serviceNames, StrConstant.SEMICOLON));
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        dto.setGridName(gridInfo.getGridName());
+                    }
+                }
+
             });
         }
         PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);

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

@@ -333,5 +333,34 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
         return new ArrayList<>();
     }
 
+    /**
+     * 客户初始化
+     *
+     * @param customerId
+     * @Param customerId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:31
+     */
+    @Override
+    public void customerInit(String customerId) {
+        String defaultCustomerId = "default";
+        LambdaQueryWrapper<IcResiDemandDictEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiDemandDictEntity::getCustomerId, defaultCustomerId);
+        List<IcResiDemandDictEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                String uuid = UUID.randomUUID().toString().replaceAll("-","");
+                item.setId(uuid);
+                item.setCustomerId(customerId);
+                item.setCreatedBy("init_user");
+                item.setCreatedTime(new Date());
+                item.setUpdatedBy("init_user");
+                item.setUpdatedTime(new Date());
+                baseDao.insert(item);
+            });
+        }
+    }
+
 
 }

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

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 服务事项分类字典表
@@ -171,5 +172,34 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
         return resultList;
     }
 
+    /**
+     * 客户初始化
+     *
+     * @param customerId
+     * @Param customerId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/4/14 14:31
+     */
+    @Override
+    public void customerInit(String customerId) {
+        String defaultCustomerId = "default";
+        LambdaQueryWrapper<IcServiceItemDictEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcServiceItemDictEntity::getCustomerId, defaultCustomerId);
+        List<IcServiceItemDictEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                String uuid = UUID.randomUUID().toString().replaceAll("-","");
+                item.setId(uuid);
+                item.setCustomerId(customerId);
+                item.setCreatedBy("init_user");
+                item.setCreatedTime(new Date());
+                item.setUpdatedBy("init_user");
+                item.setUpdatedTime(new Date());
+                baseDao.insert(item);
+            });
+        }
+    }
+
 
 }

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

@@ -2,6 +2,8 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ActConstant;
@@ -16,6 +18,7 @@ import com.epmet.dto.result.work.*;
 import com.epmet.entity.LatestActServiceRelationEntity;
 import com.epmet.entity.LatestActUnitRelationEntity;
 import com.epmet.service.*;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -131,29 +134,32 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
 
         //保存活动与服务关系
         latestActServiceRelationService.deleteByAct(actDraftId);
-        AtomicInteger i = new AtomicInteger(NumConstant.ONE);
-        List<LatestActServiceRelationEntity> serviceList = formDTO.getServiceMatterList().stream().map(service -> {
-            LatestActServiceRelationEntity entity = new LatestActServiceRelationEntity();
-            entity.setCustomerId(formDTO.getCustomerId());
-            entity.setActId(actDraftId);
-            entity.setServiceMatter(service);
-            entity.setSort(i.getAndIncrement());
-            return entity;
-        }).collect(Collectors.toList());
-        latestActServiceRelationService.insertBatch(serviceList);
-
+        if (CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())) {
+            AtomicInteger i = new AtomicInteger(NumConstant.ONE);
+            List<LatestActServiceRelationEntity> serviceList = formDTO.getServiceMatterList().stream().map(service -> {
+                LatestActServiceRelationEntity entity = new LatestActServiceRelationEntity();
+                entity.setCustomerId(formDTO.getCustomerId());
+                entity.setActId(actDraftId);
+                entity.setServiceMatter(service);
+                entity.setSort(i.getAndIncrement());
+                return entity;
+            }).collect(Collectors.toList());
+            latestActServiceRelationService.insertBatch(serviceList);
+        }
         //保存活动与单位关系
         latestActUnitRelationService.deleteByAct(actDraftId);
-        AtomicInteger j = new AtomicInteger(NumConstant.ONE);
-        List<LatestActUnitRelationEntity> unitList = formDTO.getUnitIdList().stream().map(unitId -> {
-            LatestActUnitRelationEntity entity = new LatestActUnitRelationEntity();
-            entity.setCustomerId(formDTO.getCustomerId());
-            entity.setActId(actDraftId);
-            entity.setUnitId(unitId);
-            entity.setSort(j.getAndIncrement());
-            return entity;
-        }).collect(Collectors.toList());
-        latestActUnitRelationService.insertBatch(unitList);
+        if (CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())) {
+            AtomicInteger j = new AtomicInteger(NumConstant.ONE);
+            List<LatestActUnitRelationEntity> unitList = formDTO.getUnitIdList().stream().map(unitId -> {
+                LatestActUnitRelationEntity entity = new LatestActUnitRelationEntity();
+                entity.setCustomerId(formDTO.getCustomerId());
+                entity.setActId(actDraftId);
+                entity.setUnitId(unitId);
+                entity.setSort(j.getAndIncrement());
+                return entity;
+            }).collect(Collectors.toList());
+            latestActUnitRelationService.insertBatch(unitList);
+        }
         return resultDTO;
     }
 
@@ -201,6 +207,13 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 actPreviewResultDTO.setUnitIdList(unitIds);
                 actPreviewResultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(actPreviewResultDTO.getGridId())) {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(actPreviewResultDTO.getGridId());
+                    if (null != gridInfo) {
+                        actPreviewResultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
             }
         }
         return actPreviewResultDTO;
@@ -337,7 +350,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
 
         latestActInfoDTO.setActType(formDTO.getActType());
         latestActInfoDTO.setTarget(formDTO.getTarget());
-
+        latestActInfoDTO.setGridId(formDTO.getGridId());
         return latestActInfoDTO;
     }
 

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

@@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -832,6 +834,14 @@ public class WorkActServiceImpl implements WorkActService {
                     List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                     canceledActDetailResultDTO.setUnitIdList(unitIds);
                     canceledActDetailResultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        canceledActDetailResultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            canceledActDetailResultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                 }
             }
         }
@@ -897,6 +907,14 @@ public class WorkActServiceImpl implements WorkActService {
                     List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                     resultDTO.setUnitIdList(unitIds);
                     resultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        resultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            resultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                 }
             }
         }
@@ -986,6 +1004,14 @@ public class WorkActServiceImpl implements WorkActService {
                     List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                     resultDTO.setUnitIdList(unitIds);
                     resultDTO.setUnitNameList(unitNames);
+
+                    if (StringUtils.isNotEmpty(dto.getGridId())) {
+                        resultDTO.setGridId(dto.getGridId());
+                        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                        if (null != gridInfo) {
+                            resultDTO.setGridName(gridInfo.getGridName());
+                        }
+                    }
                 }
             }
         }
@@ -1390,6 +1416,14 @@ public class WorkActServiceImpl implements WorkActService {
                 List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
                 resultDTO.setUnitIdList(unitIds);
                 resultDTO.setUnitNameList(unitNames);
+
+                if (StringUtils.isNotEmpty(dto.getGridId())) {
+                    resultDTO.setGridId(dto.getGridId());
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
+                    if (null != gridInfo) {
+                        resultDTO.setGridName(gridInfo.getGridName());
+                    }
+                }
             }
         }
 
@@ -1563,6 +1597,7 @@ public class WorkActServiceImpl implements WorkActService {
         }else{
             logger.warn("根据agencyId查询组织信息失败，agencyId={}",formDTO.getSponsorId());
         }
+        entity.setGridId(formDTO.getGridId());
         entity.setActId(actInfoEntity.getId());
         entity.setTitle(actInfoEntity.getTitle());
         entity.setTarget(actInfoEntity.getTarget());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql

@@ -0,0 +1 @@
+alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `epmet_heart`.`ic_party_activity`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`;
+ALTER TABLE `epmet_heart`.`latest_act_info`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -14,6 +14,7 @@
             LONGITUDE = #{longitude},
             LATITUDE = #{latitude},
             ORGANIZATION_CREATED_TIME = #{organizationCreatedTime},
+            REMARK = #{remark},
             UPDATED_TIME = NOW(),
             UPDATED_BY = #{updatedBy}
         WHERE DEL_FLAG = 0
@@ -52,7 +53,8 @@
             so.SERVICE_ITEM AS serviceItem,
             so.LONGITUDE AS longitude,
             so.LATITUDE AS latitude,
-            so.ID as orgId
+            so.ID as orgId,
+            so.remark
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
             AND so.ORG_ID = #{agencyId}
@@ -60,6 +62,9 @@
             <if test="null != organizationName and organizationName != '' ">
                 AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%')
             </if>
+            <if test="null != remark and remark != '' ">
+                AND so.REMARK LIKE CONCAT('%',#{remark},'%')
+            </if>
             <if test=" null != startTime and startTime != '' ">
                 AND so.ORGANIZATION_CREATED_TIME <![CDATA[ >= ]]> #{startTime}
             </if>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml

@@ -49,6 +49,8 @@
     <select id="selectActivityList" resultType="com.epmet.entity.IcPartyActivityEntity" parameterType = "com.epmet.dto.form.PartyActivityFormDTO">
         SELECT
             a.ID,
+            a.ACT_ID,
+            a.GRID_ID,
             b.unitId,
             c.serviceMatter,
             TITLE,
@@ -95,10 +97,14 @@
         WHERE
             a.DEL_FLAG = '0'
             AND a.AGENCY_ID = #{agencyId}
+            <if test='null != gridId and "" != gridId'>
+                AND a.GRID_ID = #{gridId}
+            </if>
             <if test='null != title and "" != title'>
                 AND TITLE LIKE concat('%', #{title}, '%')
             </if>
             AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+        ORDER BY ACTIVITY_TIME DESC
 
     </select>
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml

@@ -102,6 +102,7 @@
     <select id="previewActInfo" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.ActPreviewResultDTO">
         SELECT
             lai.id AS actDraftId,
+            lai.GRID_ID AS gridId,
             lai.title AS title,
             lai.ACT_QUOTA AS actQuota,
             lai.ACT_QUOTA_CATEGORY AS actQuotaCategory,

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/JobApplication.java

@@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class JobApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java

@@ -24,7 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 @EnableAsync
 public class MessageApplication {
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/OssApplication.java

@@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class OssApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java

@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 @EnableAsync
 public class EpmetPointApplication {
     public static void main(String[] args) {

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java

@@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class EpmetThirdApplication {
 
     public static void main(String[] args) {

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java

@@ -13,7 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 //@EnableConfigurationProperties(value = {DatabaseProperties.class})
 public class GovAccessApplication {
     public static void main(String[] args) {

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java

@@ -17,6 +17,7 @@
 
 package com.epmet.redis;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -25,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -46,7 +48,7 @@ public class GovCustomerMenuRedis {
      * @see com.epmet.enums.MenuTypeEnum
      */
     public void setCustomerMenuList(String customerId, Integer type, List<GovMenuDTO> govMenuDTOS) {
-        if (checkParam(customerId, type)) {
+        if (checkParam(customerId, type) && !CollectionUtils.isEmpty(govMenuDTOS) && StringUtils.isNotBlank(govMenuDTOS.get(NumConstant.ZERO).getName())) {
             String key = RedisKeys.getCustomerMenuList(customerId, type);
             redisUtils.set(key, govMenuDTOS, RedisUtils.DEFAULT_EXPIRE);
         }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/GovGridApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovGridApplication {
 
     public static void main(String[] args) {

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

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

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovIssueApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(GovIssueApplication.class, args);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -41,7 +41,7 @@
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
-    <select id="selectCategoryListByCustomer" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
+    <select id="selectCategoryListByCustomer" resultType="com.epmet.entity.IssueProjectCategoryDictEntity">
         SELECT
             ID,
             PID,

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/GovMineApplication.java

@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@ServletComponentScan
+@ServletComponentScan(basePackages = "com.epmet")
 public class GovMineApplication {
 
     public static void main(String[] args) {

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@@ -105,7 +105,7 @@ public class NacosServiceListListenerRegisterer {
                             public void onEvent(Event event) {
                                 if (event instanceof NamingEvent) {
                                     NamingEvent namingEvent = (NamingEvent) event;
-                                    log.info("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
+                                    log.debug("【Nacos服务列表刷新监听】收到事件:{}:[{}]", namingEvent.getServiceName(), namingEvent.getInstances());
                                     doRefreshServerList(service);
                                 }
                             }