Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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-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-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/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/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/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/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/oper-customize/oper-customize-server/pom.xml

@@ -83,6 +83,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-heart-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormListItemDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcFormListItemEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 列表展示项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-14
+ */
+@Mapper
+public interface IcFormListItemDao extends BaseDao<IcFormListItemEntity> {
+	
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java

@@ -135,4 +135,14 @@ public class IcFormItemEntity extends BaseEpmetEntity {
      */
 	private Integer columnNum;
 
+	/**
+	 * 是否为固定列 1动态，0固定
+	 */
+	private Integer dynamic;
+
+	/**
+	 * 是否为多选 1可以多选，0单选
+	 */
+	private Integer multiSelect;
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormListItemEntity.java

@@ -0,0 +1,46 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 列表展示项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_form_list_item")
+public class IcFormListItemEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * ic_form_item.id
+     */
+	private String formItemId;
+
+    /**
+     * ic_form.form_code，举例：resi_base_info
+     */
+	private String formCode;
+
+    /**
+     * 表头宽度
+     */
+	private Integer width;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java

@@ -24,16 +24,19 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 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.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.*;
 import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
 import com.epmet.dto.result.FormGroupDTO;
 import com.epmet.dto.result.FormItemResult;
 import com.epmet.entity.*;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.redis.CustomerFootBarRedis;
 import com.epmet.service.IcFormService;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +46,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
@@ -72,6 +76,10 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
     private IcResiCategoryStatsConfigDao icResiCategoryStatsConfigDao;
     @Autowired
     private IcResiCategoryWarnConfigDao icResiCategoryWarnConfigDao;
+    @Resource
+    private IcFormListItemDao icFormListItemDao;
+    @Resource
+    private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
 
     /**
      * 获取居民信息表单
@@ -131,7 +139,9 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
     @Override
     public String initCustomerFormByCode(String customerId, String areaCode, String formCode) {
         CustomerFormResultDTO formResultDTO = baseDao.selectByCode(customerId, formCode);
+        //客户已经存在了表单的数据
         if (formResultDTO != null) {
+
             return "该客户已经存在了表单的数据";
         }
         String defaultCustomerId = "default";
@@ -164,7 +174,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         if (CollectionUtils.isEmpty(itemList)) {
             return "默认配置错误";
         }
-        //设置item
+        //设置ic_form_item
         itemList.forEach(item -> {
             item.setId(newPrefixed + item.getId());
             item.setCustomerId(customerId);
@@ -192,6 +202,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemDao.insert(item);
         });
 
+        //设置ic_form_item_options
         LambdaQueryWrapper<IcFormItemOptionsEntity> wrapperOptions = new LambdaQueryWrapper<>();
         wrapperOptions.eq(IcFormItemOptionsEntity::getCustomerId, defaultCustomerId);
         wrapperOptions.eq(IcFormItemOptionsEntity::getFormCode, formCode);
@@ -209,6 +220,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemOptionsDao.insert(item);
         });
 
+        //设置ic_form_item_group
         LambdaQueryWrapper<IcFormItemGroupEntity> wrapperGroup = new LambdaQueryWrapper<>();
         wrapperGroup.eq(IcFormItemGroupEntity::getCustomerId, defaultCustomerId);
         wrapperGroup.eq(IcFormItemGroupEntity::getFormCode, formCode);
@@ -225,6 +237,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemGroupDao.insert(item);
         });
 
+        //设置ic_form_query_builder
         LambdaQueryWrapper<IcFormQueryBuilderEntity> wrapperQuery = new LambdaQueryWrapper<>();
         wrapperQuery.eq(IcFormQueryBuilderEntity::getCustomerId, defaultCustomerId);
         wrapperQuery.eq(IcFormQueryBuilderEntity::getFormCode, formCode);
@@ -241,6 +254,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormQueryBuilderDao.insert(item);
         });
 
+        //设置ic_resi_category_stats_config
         LambdaQueryWrapper<IcResiCategoryStatsConfigEntity> wrapperStats = new LambdaQueryWrapper<>();
         wrapperStats.eq(IcResiCategoryStatsConfigEntity::getCustomerId, defaultCustomerId);
         List<IcResiCategoryStatsConfigEntity> statsConfigList = icResiCategoryStatsConfigDao.selectList(wrapperStats);
@@ -255,6 +269,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icResiCategoryStatsConfigDao.insert(item);
         });
 
+        //设置ic_resi_category_warn_config
         LambdaQueryWrapper<IcResiCategoryWarnConfigEntity> wrapperWarn = new LambdaQueryWrapper<>();
         wrapperWarn.eq(IcResiCategoryWarnConfigEntity::getCustomerId, defaultCustomerId);
         List<IcResiCategoryWarnConfigEntity> warnConfigList = icResiCategoryWarnConfigDao.selectList(wrapperWarn);
@@ -269,6 +284,31 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icResiCategoryWarnConfigDao.insert(item);
         });
 
+        //设置ic_form_list_item
+        LambdaQueryWrapper<IcFormListItemEntity> listItemWapper = new LambdaQueryWrapper<>();
+        listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId);
+        listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode);
+        List<IcFormListItemEntity> listItemList = icFormListItemDao.selectList(listItemWapper);
+        if (CollectionUtils.isEmpty(listItemList)) {
+            return "默认配置错误";
+        }
+        listItemList.forEach(item -> {
+            item.setId(newPrefixed + item.getId());
+            item.setCustomerId(customerId);
+            item.setFormItemId(newPrefixed + item.getFormItemId());
+            item.setCreatedBy("init_user");
+            item.setCreatedTime(new Date());
+            item.setUpdatedBy("init_user");
+            item.setUpdatedTime(new Date());
+            log.debug("stats:"+ JSON.toJSONString(item));
+            icFormListItemDao.insert(item);
+        });
+
+        //设置ic_service_item_dict和ic_resi_demand_dict
+        Result result = epmetHeartOpenFeignClient.customerInit(customerId);
+        if (!result.success()) {
+            throw new EpmetException(result.getCode(), result.getMsg());
+        }
         return "初始化成功!客户ID:" + customerId + " formCode:" + formCode;
     }
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormListItemDao.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcFormListItemDao">
+
+    <resultMap type="com.epmet.entity.IcFormListItemEntity" id="icFormListItemMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="formItemId" column="FORM_ITEM_ID"/>
+        <result property="formCode" column="FORM_CODE"/>
+        <result property="width" column="WIDTH"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java

@@ -28,6 +28,7 @@ import com.epmet.dto.result.NatListCommonExcelResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcNatService;
+import com.epmet.utils.ImportTaskUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -221,12 +222,8 @@ public class IcNatController implements ResultDataResolver {
         }
 
         // 2.生成导入任务记录
-        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
-        importTaskForm.setOperatorId(userId);
-        importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_NAT);
-        importTaskForm.setOriginFileName(originalFilename);
-
-        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
+        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(
+                ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_NAT),
                 ServiceConstant.EPMET_COMMON_SERVICE,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                 "excel导入核酸检测信息错误",

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@@ -25,6 +25,7 @@ import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcVaccineService;
+import com.epmet.utils.ImportTaskUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -138,12 +139,8 @@ public class IcVaccineController  implements ResultDataResolver {
         }
 
         // 2.生成导入任务记录
-        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
-        importTaskForm.setOperatorId(userId);
-        importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_VACCINE);
-        importTaskForm.setOriginFileName(originalFilename);
-
-        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
+        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(
+                ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE),
                 ServiceConstant.EPMET_COMMON_SERVICE,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                 "excel导入疫苗接种信息错误",

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

@@ -40,6 +40,7 @@ import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcNatService;
 import com.epmet.service.IcNoticeService;
 import com.epmet.service.UserService;
+import com.epmet.utils.ImportTaskUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -48,6 +49,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.http.entity.ContentType;
+import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -328,7 +330,6 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
 
             EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
 
-            Path errorDescFile = null;
             String errorDesFileUrl = null;
 
             List<IcNatImportExcelData.RowRemarkMessage> errorRows = listener.getErrorRows();
@@ -340,16 +341,19 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             errorRows.addAll(otherRows);
 
             // 生成并上传描述文件
+            OutputStream os = null;
+            FileItem fileItem = null;
             if (errorRows.size() > 0) {
                 try {
                     // 文件生成
                     Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
-                    String fileName = UUID.randomUUID().toString().concat(".xlsx");
-                    errorDescFile = errorDescDir.resolve(fileName);
+                    String timeMillis = String.valueOf(System.currentTimeMillis());
+                    String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx");
 
-                    FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
-                    FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
-                    OutputStream os = fileItem.getOutputStream();
+                    fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile())
+                            .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
+
+                    os = fileItem.getOutputStream();
 
                     EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
                     // 文件上传oss
@@ -357,38 +361,33 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                     if (errorDesFileUploadResult.success()) {
                         errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
                     }
-
                 } finally {
-                    if (Files.exists(errorDescFile)) {
-                        Files.delete(errorDescFile);
+                    IOUtils.closeQuietly(os);
+                    try {
+                        fileItem.delete();
+                    } catch (Exception e){
+                        log.error("【核酸检测导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
                     }
                 }
             }
 
-            ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
-            importFinishTaskForm.setTaskId(importTaskId);
-            importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
-            importFinishTaskForm.setOperatorId(userId);
-            importFinishTaskForm.setResultDesc("");
-            importFinishTaskForm.setResultDescFilePath(errorDesFileUrl);
+            // 完成导入
+            Result result = ImportTaskUtils.finishImportTask(importTaskId,
+                    failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,
+                    errorDesFileUrl,
+                    "");
 
-            Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
-                log.error("【核酸检测导入】finishImportTask失败");
+                log.error("【核酸检测导入】导入记录状态修改为'finished_success'失败");
             }
         } catch (Exception e) {
             String errorMsg = ExceptionUtils.getErrorStackTrace(e);
             log.error("【核酸检测导入】出错:{}", errorMsg);
 
-            ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
-            importFinishTaskForm.setTaskId(importTaskId);
-            importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
-            importFinishTaskForm.setOperatorId(userId);
-            importFinishTaskForm.setResultDesc("导入失败");
+            Result result = ImportTaskUtils.finishImportTask(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "导入失败");
 
-            Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
-                log.error("【核酸检测导入】导入记录状态修改为'完成'失败");
+                log.error("【核酸检测导入】导入记录状态修改为'finished_fail'失败");
             }
         } finally {
             // 删除临时文件

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.FileUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
@@ -1244,8 +1245,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         // 文件名
         String resultDescFileName = UUID.randomUUID().toString().concat(".xls");
 
-        FileItemFactory factory = new DiskFileItemFactory(16, null);
-        FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
+        FileItem fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, FileUtils.getAndCreateDirUnderEpmetFilesDir("temp").toFile())
+                .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, resultDescFileName);
         OutputStream os = fileItem.getOutputStream();
         Result<UploadImgResultDTO> uploadResult = null;
         try {

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

@@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         OwnerRelationResultDTO result = new OwnerRelationResultDTO();
         //获取用户信息
         IcResiUserEntity user = baseDao.selectById(userId);
-
-        //获取用户所在家庭的户主
-        Result<IcHouseDTO> houseResult =  govOrgOpenFeignClient.get(user.getHomeId());
-        if (!houseResult.success()) {
-            throw new RenException(houseResult.getCode(),houseResult.getMsg());
-        }
-        result.setOwnerName(houseResult.getData().getOwnerName());
-
+        result.setOwnerName("");
         //获取用户所在家庭里所有人员信息
         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
@@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             if (userId.equals(item.getId())) {
                 bean.setIsSelf(NumConstant.ONE_STR);
             }
+            //如果与房主的关系是本人，则这个人就是房主
+            if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
+                result.setOwnerName(item.getName());
+            }
             return bean;
         }).collect(Collectors.toList());
         result.setUserList(userList);

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

@@ -37,6 +37,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcVaccineService;
 import com.epmet.service.UserService;
+import com.epmet.utils.ImportTaskUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.http.entity.ContentType;
+import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -177,7 +179,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
 
             EasyExcel.read(filePath.toFile(), IcVaccineImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
 
-            Path errorDescFile = null;
             String errorDesFileUrl = null;
 
             List<IcVaccineImportExcelData.RowRemarkMessage> errorRows = listener.getErrorRows();
@@ -189,16 +190,17 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
             errorRows.addAll(otherRows);
 
             // 生成并上传描述文件
+            OutputStream os = null;
+            FileItem fileItem = null;
             if (errorRows.size() > 0) {
                 try {
                     // 文件生成
                     Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_vaccine", "import", "error_des");
                     String fileName = UUID.randomUUID().toString().concat(".xlsx");
-                    errorDescFile = errorDescDir.resolve(fileName);
 
-                    FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
-                    FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
-                    OutputStream os = fileItem.getOutputStream();
+                    fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile())
+                            .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
+                    os = fileItem.getOutputStream();
 
                     EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
                     // 文件上传oss
@@ -208,20 +210,23 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
                     }
 
                 } finally {
-                    if (Files.exists(errorDescFile)) {
-                        Files.delete(errorDescFile);
+                    IOUtils.closeQuietly(os);
+                    if (!fileItem.isInMemory()) {
+                        try {
+                            fileItem.delete();
+                        } catch (Exception e){
+                            log.error("【疫苗接种导入】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
+                        }
                     }
                 }
             }
 
-            ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
-            importFinishTaskForm.setTaskId(importTaskId);
-            importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
-            importFinishTaskForm.setOperatorId(userId);
-            importFinishTaskForm.setResultDesc("");
-            importFinishTaskForm.setResultDescFilePath(errorDesFileUrl);
+            Result result = ImportTaskUtils.finishImportTask(
+                    importTaskId,
+                    failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,
+                    errorDesFileUrl,
+                    "");
 
-            Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
                 log.error("【疫苗接种导入】finishImportTask失败");
             }

pom.xml

@@ -97,11 +97,6 @@
 	</dependencyManagement>
 
 	<repositories>
-		<!--<repository>
-			<id>mvnrepo</id>
-			<name>jianjun gitee</name>
-			<url>https://gitee.com/jianjun4833/mvnrepo/blob/master/</url>
-		</repository>-->
 		<repository>
 			<id>public</id>
 			<name>aliyun nexus</name>
@@ -110,6 +105,11 @@
 				<enabled>true</enabled>
 			</releases>
 		</repository>
+		<repository>
+			<id>epmet</id>
+			<name>maven-releases</name>
+			<url>https://nexus.elinkservice.cn/repository/maven-releases/</url>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -124,5 +124,11 @@
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
+	<distributionManagement>
+		<repository>
+			<id>epmet</id>
+			<url>https://nexus.elinkservice.cn/repository/maven-releases/</url>
+		</repository>
+	</distributionManagement>
 
 </project>