Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/NeighborHoodAndManagementDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/2/13 8:51 上午
+ * @DESC
+ */
+@Data
+public class NeighborHoodAndManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = -7500263771019585308L;
+
+    private String gridId;
+
+    /**
+     * 小区ID
+     */
+    private String id;
+
+    private String gridName;
+
+    /**
+     * 小区名字
+     */
+    private String neighborHoodName;
+    private String neighborHoodId;
+
+    /**
+     * 物业ID
+     */
+    private String propertyId;
+
+    /**
+     * 物业名字
+     */
+    private String propertyName;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java

@@ -31,6 +31,7 @@ import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.BuildingTreeLevelDTO;
 import com.epmet.dto.form.IcBulidingFormDTO;
 import com.epmet.dto.form.IcBulidingUnitFormDTO;
+import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
@@ -199,6 +200,27 @@ public class BuildingController {
         return new Result().ok(str);
     }
 
+    /**
+     * @Description  楼宇导入
+     * @param tokenDTO
+     * @param file
+     * @param orgId
+     * @param orgType
+     * @author zxc
+     * @date 2022/2/13 10:18 上午
+     */
+    @PostMapping("buildingimport")
+    public Result buildingImportExcel(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file,
+                                      @RequestParam("orgId")String orgId,
+                                      @RequestParam("orgType")String orgType) throws IOException{
+        ImportInfoFormDTO formDTO = new ImportInfoFormDTO();
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
+        formDTO.setOrgType(orgType);
+        formDTO.setOrgId(orgId);
+        formDTO.setUserId(tokenDTO.getUserId());
+        return new Result().ok(buildingService.buildingImportExcel(formDTO,file));
+    }
+
     /**
      * 查看楼宇单元列表
      * @param tokenDTO

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

@@ -20,6 +20,10 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcPropertyManagementEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 物业表
@@ -31,4 +35,20 @@ import org.apache.ibatis.annotations.Mapper;
 public interface IcPropertyManagementDao extends BaseDao<IcPropertyManagementEntity> {
 
     IcPropertyManagementEntity selectByName(String name);
+
+    /**
+     * @Description  根据物业名查询已存在的物业名
+     * @param names
+     * @author zxc
+     * @date 2022/2/13 9:21 上午
+     */
+    List<String> selectExistNames(@Param("names")List<String> names);
+
+    /**
+     * @Description  根据名字查ID
+     * @param names
+     * @author zxc
+     * @date 2022/2/13 9:59 上午
+     */
+    List<IcPropertyManagementEntity> selectIdByName(@Param("names")List<String> names);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java

@@ -101,4 +101,7 @@ public class IcNeighborHoodEntity extends BaseEpmetEntity {
 
 	@TableField(exist = false)
 	private String gridName;
+
+	@TableField(exist = false)
+	private String propertyName;
 }

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

@@ -17,15 +17,19 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.BuildingTreeLevelDTO;
 import com.epmet.dto.form.IcBulidingFormDTO;
+import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.excel.IcBuildingExcel;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -62,4 +66,14 @@ public interface BuildingService {
     List<BuildingResultDTO> buildingListByIds(List<String> buildingIdList);
 
     BuildingResultPagedDTO buildinglistbyidsPage(List<String> buildingIdList, Integer pageNo, Integer pageSize);
+
+    /**
+     * @Description  楼宇导入
+     * @param formDTO
+     * @param file
+     * @author zxc
+     * @date 2022/2/13 10:18 上午
+     */
+    Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException;
+
 }

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

@@ -13,11 +13,13 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.*;
 import com.epmet.dto.BuildingTreeLevelDTO;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.form.IcBulidingFormDTO;
+import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
@@ -36,9 +38,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -366,6 +370,23 @@ public class BuildingServiceImpl implements BuildingService {
         return result;
     }
 
+    /**
+     * @Description 楼宇导入
+     *    根据左侧树选中的层级，可导入对应数据：
+     * 1. 选中社区可导入该社区下所有小区信息、楼宇信息、房屋信息（没有匹配的小区、楼宇均新增，网格没有对应的不新增）；
+     * 2. 选中网格可导入该网格下所有小区信息、楼宇信息、房屋信息（没有匹配的小区、楼宇均新增）；
+     * 3. 选中小区可导入该小区下所有楼宇信息、房屋信息（没有匹配的楼宇均新增）；
+     * 4. 选中楼宇可导入该楼宇下所有房屋信息。
+     * @param formDTO
+     * @param file
+     * @author zxc
+     * @date 2022/2/13 10:15 上午
+     */
+    @Override
+    public Result buildingImportExcel(ImportInfoFormDTO formDTO, MultipartFile file) throws IOException {
+        return null;
+    }
+
     private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {
 
 //        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();

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

@@ -37,13 +37,19 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcNeighborHoodDao;
+import com.epmet.dao.IcPropertyManagementDao;
 import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.dto.NeighborHoodAndManagementDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.result.InfoByNamesResultDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
+import com.epmet.entity.IcNeighborHoodPropertyEntity;
+import com.epmet.entity.IcPropertyManagementEntity;
 import com.epmet.excel.IcBuildingExcel;
 import com.epmet.excel.IcNeighborHoodExcel;
+import com.epmet.service.IcNeighborHoodPropertyService;
 import com.epmet.service.IcNeighborHoodService;
+import com.epmet.service.IcPropertyManagementService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -70,6 +76,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
 
     @Autowired
     private CustomerGridDao customerGridDao;
+    @Autowired
+    private IcPropertyManagementDao propertyManagementDao;
+    @Autowired
+    private IcPropertyManagementService propertyManagementService;
+    @Autowired
+    private IcNeighborHoodPropertyService neighborHoodPropertyService;
 
     @Override
     public PageData<IcNeighborHoodDTO> page(Map<String, Object> params) {
@@ -217,7 +229,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             return new Result().error(9999,"excel表格内没有数据");
         }
         List<Integer> nums = new ArrayList<>();
-        List<String> gridNames = result.stream().map(m -> m.getGridName()).collect(Collectors.toList());
+        List<String> gridNames = result.stream().map(m -> m.getGridName()).distinct().collect(Collectors.toList());
         // 1. 查询数据网格是否存在
         List<InfoByNamesResultDTO> gridInfos = customerGridDao.selectGridInfoByNames(gridNames, formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(gridInfos)){
@@ -241,7 +253,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         // 只获取能查询到的网格
         List<IcNeighborHoodExcel> neighborHoods = groupStatus.get(true);
         // 2. 查询组织选中组织下存在的小区
-        List<String> existNames = baseDao.selectNeighborhoodNameByNames(neighborHoods.stream().map(m -> m.getNeighborHoodName()).collect(Collectors.toList()), formDTO.getCustomerId());
+        List<String> existNames = baseDao.selectNeighborhoodNameByNames(neighborHoods.stream().map(m -> m.getNeighborHoodName()).distinct().collect(Collectors.toList()), formDTO.getCustomerId());
         // 为了显示多少行插入成功，未成功
         result.forEach(r -> {
             for (String s : existNames) {
@@ -324,8 +336,31 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                 }
             }
         });
+        // 物业表插入
+        List<String> propertyNames = finalNeedInsert.stream().map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
+        List<String> disposePropertyNames = finalNeedInsert.stream().map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
+        List<String> existPropertyNames = propertyManagementDao.selectExistNames(propertyNames);
+        disposePropertyNames.removeAll(existPropertyNames);
+        List<IcPropertyManagementEntity> propertyManagementEntities = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(disposePropertyNames)){
+            disposePropertyNames.forEach(name -> {
+                IcPropertyManagementEntity e = new IcPropertyManagementEntity();
+                e.setName(name);
+                propertyManagementEntities.add(e);
+            });
+        }
+        importInsert(entities,propertyManagementEntities);
+        // 小区物业关系表插入
+        List<NeighborHoodAndManagementDTO> neighborHoodAndManagementDTOS = ConvertUtils.sourceToTarget(entities, NeighborHoodAndManagementDTO.class);
+        List<IcPropertyManagementEntity> propertyManagementInfos = propertyManagementDao.selectIdByName(propertyNames);
+        neighborHoodAndManagementDTOS.forEach(n -> propertyManagementInfos.stream().filter(p -> p.getName().equals(n.getPropertyName()))
+                .forEach(p -> {
+                    n.setPropertyId(p.getId());
+                    n.setNeighborHoodId(n.getId());
+                }));
+        List<IcNeighborHoodPropertyEntity> icNeighborHoodPropertyEntities = ConvertUtils.sourceToTarget(neighborHoodAndManagementDTOS, IcNeighborHoodPropertyEntity.class);
+        neighborHoodPropertyInsert(icNeighborHoodPropertyEntities);
 
-        importInsert(entities);
         for (int i = NumConstant.ZERO; i < result.size(); i++) {
             if (result.get(i).getStatus() == false || result.get(i).getExistNameStatus() == true || result.get(i).getAgencyNameStatus() == false || result.get(i).getReStatus() == true){
                 nums.add(i + NumConstant.ONE);
@@ -338,12 +373,37 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         return new Result().ok(str);
     }
 
+    /**
+     * @Description  小区插入，物业插入
+     * @param entities
+     * @param propertyManagementEntities
+     * @author zxc
+     * @date 2022/2/13 10:09 上午
+     */
     @Transactional(rollbackFor = Exception.class)
-    public void importInsert(List<IcNeighborHoodEntity> entities){
+    public void importInsert(List<IcNeighborHoodEntity> entities,List<IcPropertyManagementEntity> propertyManagementEntities){
         List<List<IcNeighborHoodEntity>> partition = ListUtils.partition(entities, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {
             insertBatch(p);
         });
+        List<List<IcPropertyManagementEntity>> partition1 = ListUtils.partition(propertyManagementEntities, NumConstant.ONE_HUNDRED);
+        partition1.forEach(p -> {
+            propertyManagementService.insertBatch(p);
+        });
+    }
+
+    /**
+     * @Description 小区物业关系表插入
+     * @param entities
+     * @author zxc
+     * @date 2022/2/13 10:09 上午
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void neighborHoodPropertyInsert(List<IcNeighborHoodPropertyEntity> entities){
+        List<List<IcNeighborHoodPropertyEntity>> partition = ListUtils.partition(entities, NumConstant.ONE_HUNDRED);
+        partition.forEach(p -> {
+            neighborHoodPropertyService.insertBatch(p);
+        });
     }
 
 }

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

@@ -23,4 +23,29 @@
             m.DEL_FLAG = '0'
           AND m.`NAME` = #{name}
     </select>
+
+    <!-- 根据物业名查询已存在的物业名 -->
+    <select id="selectExistNames" resultType="java.lang.String">
+        SELECT `NAME` FROM ic_property_management
+        WHERE
+            DEL_FLAG = '0'
+          AND `NAME` IN (
+              <foreach collection="names" item="n" separator=",">
+                  #{n}
+              </foreach>
+            )
+    </select>
+
+    <!-- 根据名字查ID -->
+    <select id="selectIdByName" resultType="com.epmet.entity.IcPropertyManagementEntity">
+        SELECT ID,`NAME` FROM ic_property_management
+        WHERE
+        DEL_FLAG = '0'
+        AND `NAME` IN (
+        <foreach collection="names" item="n" separator=",">
+            #{n}
+        </foreach>
+        )
+    </select>
+
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -100,6 +100,7 @@ public class IcPartymemberStyleController {
                 excel.setGridName(item.getGridName());
                 excel.setName(item.getName());
                 excel.setMainDeed(item.getMainDeed());
+                //导出时新增分类名称
                 excel.setCategoryName(item.getCategoryName());
                 return excel;
             }).collect(Collectors.toList());

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartymemberStyleImportExcel.java

@@ -21,8 +21,10 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.epmet.commons.tools.utils.ExcelVerifyInfo;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
- * 党员风采
+ * 党员风采导入
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
@@ -31,17 +33,21 @@ import lombok.Data;
 public class IcPartymemberStyleImportExcel extends ExcelVerifyInfo {
 
     @Excel(name = "所属网格")
+    @NotBlank(message = "此列不能为空")
     private String gridName;
 
     @Excel(name = "党员姓名")
+    @NotBlank(message = "此列不能为空")
     private String name;
 
     @Excel(name = "主要事迹")
+    @NotBlank(message = "此列不能为空")
     private String mainDeed;
 
     @Excel(name = "照片")
     private String imageUrl;
 
     @Excel(name="所属分类")
+    @NotBlank(message = "此列不能为空")
     private String categoryName;
 }

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

@@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.partymember.form.UpdateStyleCategoryFormDT
 import com.epmet.resi.partymember.dto.partymember.result.StyleCategoryDictResDTO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 党员风采分类字典表
@@ -51,4 +52,6 @@ public interface IcPartymemberStyleCategoryDictService extends BaseService<IcPar
     List<StyleCategoryDictResDTO> selectList(StyleSelectListFormDTO formDTO);
 
     IcPartymemberStyleCategoryDictEntity get(String categoryId);
+
+    Map<String, IcPartymemberStyleCategoryDictEntity> getCategoryDictMap(String customerId);
 }

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

@@ -18,10 +18,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 党员风采分类字典表
@@ -168,4 +168,16 @@ public class IcPartymemberStyleCategoryDictServiceImpl extends BaseServiceImpl<I
         return baseDao.selectById(categoryId);
     }
 
+    @Override
+    public Map<String, IcPartymemberStyleCategoryDictEntity> getCategoryDictMap(String customerId) {
+        LambdaQueryWrapper<IcPartymemberStyleCategoryDictEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(IcPartymemberStyleCategoryDictEntity::getCustomerId, customerId);
+        List<IcPartymemberStyleCategoryDictEntity> list=baseDao.selectList(queryWrapper);
+        Map<String, IcPartymemberStyleCategoryDictEntity> map=new HashMap<>();
+        if(!CollectionUtils.isEmpty(list)){
+            map=list.stream().collect(Collectors.toMap(IcPartymemberStyleCategoryDictEntity::getCategoryName, m -> m, (k1, k2) -> k1));
+        }
+        return map;
+    }
+
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.modules.partymember.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -109,6 +110,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                     return;
                 }
                 item.setGridName(gridInfo.getGridName());
+                //导出时新增分类名称
                 IcPartymemberStyleCategoryDictEntity dict = icPartymemberStyleCategoryDictService.get(item.getCategoryId());
                 item.setCategoryName(null == dict ? StrConstant.EPMETY_STR : dict.getCategoryName());
             }
@@ -228,7 +230,9 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     @Transactional(rollbackFor = Exception.class)
     public Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException {
         ExcelImportResult<IcPartymemberStyleImportExcel> importResult = ExcelPoiUtils.importExcelMore(file, 0, 1, IcPartymemberStyleImportExcel.class);
+
         List<IcPartymemberStyleImportExcel> failList = importResult.getFailList();
+        log.info("excel中的数据校验失败："+JSON.toJSONString(failList,true));
         //存放错误数据行号
         List<Integer> numList = new ArrayList<>();
         if (!org.springframework.util.CollectionUtils.isEmpty(failList)) {
@@ -249,8 +253,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
             throw new EpmetException(gridOptionResult.getCode(), gridOptionResult.getMsg());
         }
         Map<String, String> gridMap = gridOptionResult.getData().stream().collect(Collectors.toMap(CustomerGridDTO::getGridName, CustomerGridDTO::getId));
+        //获取党员风采所有分类:key:分类名称；
+        Map<String,IcPartymemberStyleCategoryDictEntity> categoryDictMap=icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId());
         //1.数据校验 只允许导入当前组织下的网格的数据
-        //网格名称不一样的数据舍弃
+        //网格名称不一样的数据舍弃或者分类名称不存在也舍弃
         Iterator<IcPartymemberStyleImportExcel> iterator = result.iterator();
         while (iterator.hasNext()) {
             IcPartymemberStyleImportExcel obj = iterator.next();
@@ -258,6 +264,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                 numList.add(obj.getRowNum());
                 log.warn(String.format("不是当前组织下可导入的数据,网格名称->%s,行号->%s", obj.getGridName(), obj.getRowNum()));
                 iterator.remove();
+                continue;
+            }
+            if (null == categoryDictMap.get(obj.getCategoryName().trim())) {
+                numList.add(obj.getRowNum());
+                log.warn(String.format("分类名称【%s】不存在，不可导入,行号->%s", obj.getCategoryName(), obj.getRowNum()));
+                iterator.remove();
             }
         }
         if (CollectionUtils.isEmpty(result)) {
@@ -274,7 +286,9 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
             entity.setGridId(gridMap.get(item.getGridName()));
             entity.setName(item.getName());
             entity.setMainDeed(item.getMainDeed());
-
+            IcPartymemberStyleCategoryDictEntity dictEntity=categoryDictMap.get(item.getCategoryName());
+            entity.setCategoryId(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getId());
+            entity.setCategoryCode(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getCategoryCode());
             AtomicInteger i = new AtomicInteger();
             if (StringUtils.isNotBlank(item.getImageUrl())) {
                 Arrays.asList(item.getImageUrl().split(StrConstant.COMMA)).forEach(url -> {