Merge remote-tracking branch 'origin/房屋tree_yzm'

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -245,11 +245,11 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
+                <datasource.druid..url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
+                </datasource.druid..url>
+                <datasource.druid..username>root</datasource.druid..username>
+                <datasource.druid..password>root</datasource.druid..password>
 
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -390,12 +390,6 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
-
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
@@ -534,12 +528,6 @@
                 <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>epmet</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>elink@833066</datasource.druid.evaluationIndex1.password>
-
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
@@ -679,12 +667,6 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
-
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -166,11 +166,6 @@ dynamic:
       url: @datasource.druid.partymember.url@
       username: @datasource.druid.partymember.username@
       password: @datasource.druid.partymember.password@
-    evaluationIndexRead:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: @datasource.druid.evaluationIndex1.url@
-      username: @datasource.druid.evaluationIndex1.username@
-      password: @datasource.druid.evaluationIndex1.password@
 feign:
   hystrix:
     enabled: true

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

@@ -497,7 +497,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 //爱心互助的志愿者
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(serverId));
                 if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) {
-                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
                 }
                 serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
                 mobile = userInfoRes.getData().get(NumConstant.ZERO).getMobile();
@@ -506,7 +506,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 //居民信息的志愿者 ic_resi_user
                 Result<IcResiUserDTO> icUserInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(serverId);
                 if (!icUserInfoRes.success() || null==icUserInfoRes.getData()) {
-                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
                 }
                 serviceName=icUserInfoRes.getData().getName();
                 mobile = icUserInfoRes.getData().getMobile();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -280,12 +281,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
      * @param enterpriseId
      * @return
      */
+    @NoRepeatSubmit
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(String enterpriseId, String customerId, String userId) {
         //如果是编辑判断下权限要删除的记录的agencyId要与当前登录用户的agencyId一致
         IcEnterpriseEntity origin = baseDao.selectById(enterpriseId);
-
+        if(null==origin){
+            // 已经不存在了，返回！
+            return;
+        }
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
         if (!staffInfo.getAgencyId().equals(origin.getAgencyId())) {
             AgencyInfoCache orginAgencyInfo = CustomerOrgRedis.getAgencyInfo(origin.getAgencyId());