Merge remote-tracking branch 'origin/lingshan_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java

@@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
 public interface LingshanPartyCenterHouseLianhuDao extends BaseDao<LingshanPartyCenterHouseLianhuEntity> {
 
     int deleteByPartyCenterHouseId(String partyCenterHouseId);
+
+    LingshanPartyCenterHouseLianhuEntity selectByHouseId(String houseId);
 }

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

@@ -612,6 +612,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
      * @param partyCenterHouseId
      * @param lianHuHouseList
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void bingLianHu(String partyCenterHouseId, List<PartyCenterHouseBindLianHuDetailDTO> lianHuHouseList) {
         IcHouseEntity partyCenterHouse=baseDao.selectById(partyCenterHouseId);
@@ -637,6 +638,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
             }
             if(CollectionUtils.isNotEmpty(list)){
                 for(IcHouseEntity houseEntity:list){
+                    LingshanPartyCenterHouseLianhuEntity existedEntiy=partyCenterHouseLianhuDao.selectByHouseId(houseEntity.getId());
+                    if (null == existedEntiy) {
                         LingshanPartyCenterHouseLianhuEntity entity = new LingshanPartyCenterHouseLianhuEntity();
                         entity.setPartyCenterHouseId(partyCenterHouseId);
                         // 目前只能绑定同一个网格下的房屋
@@ -652,6 +655,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
                         partyCenterHouseLianhuDao.insert(entity);
                     }
                 }
+            }
         });
     }
 

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

@@ -26,4 +26,12 @@
     <delete id="deleteByPartyCenterHouseId" parameterType="java.lang.String">
         delete from lingshan_party_center_house_lianhu where PARTY_CENTER_HOUSE_ID=#{partyCenterHouseId}
     </delete>
+
+    <select id="selectByHouseId" parameterType="java.lang.String" resultType="com.epmet.entity.LingshanPartyCenterHouseLianhuEntity">
+        select
+            *
+        from lingshan_party_center_house_lianhu
+        where DEL_FLAG='0'
+          and HOUSE_ID = #{houseId}
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java

@@ -21,7 +21,8 @@ public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{
     public void consume(Map<String, String> resiInfoMap) {
         System.out.println(resiInfoMap);
         String customerId=resiInfoMap.get("CUSTOMER_ID");
-        String userId=resiInfoMap.get("ID");
+        // String userId=resiInfoMap.get("ID");
+        String userId=resiInfoMap.get("IC_RESI_USER");
         //推送MQ事件
         IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
         mqMsg.setCustomerId(customerId);

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

@@ -13,7 +13,6 @@ import com.epmet.bean.ResiImportChangedData;
 import com.epmet.bean.ResiImportResiCategoryChangedCache;
 import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -41,7 +40,6 @@ import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.IcResiUserOrgMsgFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO;
 import com.epmet.entity.*;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.handler.IcResiImportDynamicExcelListener;
@@ -63,7 +61,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
@@ -589,8 +586,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     categoryData = null;
                 }
 
-                // 居民信息导入后置处理器回调
-                resiImportPostProcessors.forEach(p -> p.consume(columnAndValues));
 
             } catch (Exception e) {
                 String errorMsg;
@@ -770,6 +765,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 // 将成功的居民的身份证号添加到列表中
                 successIdCards.add(row.get(ID_CARD_COLUMN_NO));
+
+                // 居民信息-党员信息导入后置处理器回调
+                LinkedHashMap<String, String> finalColumnAndValues = columnAndValues;
+                resiImportPostProcessors.forEach(p -> {
+                    p.consume(finalColumnAndValues);
+                });
             } catch (Exception e) {
                 String errorMsg;
                 if (e instanceof RenException || e instanceof EpmetException) {