From 0b0d96ad79042e25c9c56a4d9fe0f6a87b7bc13e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 11 Apr 2022 16:44:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AF=B9=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_resi_info_cid_for_easy_excel.xlsx | Bin 25245 -> 25318 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx index 5d92c7beb50ca7c80a9c831333c9637806a825c3..708221ffea64374b65e979e94d1fe6965cf20175 100644 GIT binary patch delta 7528 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 Date: Mon, 11 Apr 2022 16:49:57 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 1f0a127b5f..367a6f895e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -397,7 +397,7 @@ public class IcResiUserController implements ResultDataResolver { } /** - * desc:根据客户id 下载模版文件 如果不存在则返回null + * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null * * @param customerId * @return From e347298448c90f33ea5a611f80f651872be5de3e Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 14 Apr 2022 11:19:59 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96item=E6=97=B6?= =?UTF-8?q?=20=E7=BC=BA=E5=B0=91=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/entity/IcFormItemEntity.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java index c5c509ea25..9727a6276d 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java @@ -41,7 +41,7 @@ public class IcFormItemEntity extends BaseEpmetEntity { private String customerId; /** - * + * */ private String areaCode; @@ -135,4 +135,14 @@ public class IcFormItemEntity extends BaseEpmetEntity { */ private Integer columnNum; + /** + * 是否为固定列 1动态，0固定 + */ + private Integer dynamic; + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; + } From 8d951e4a9b27c8b4d89435ee48bf828d041850be Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 14 Apr 2022 15:07:31 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E5=AD=97=E7=A4=BE=E5=8C=BA=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetHeartOpenFeignClient.java | 11 +++++ .../EpmetHeartOpenFeignClientFallback.java | 14 ++++++ .../IcServiceItemDictController.java | 23 ++++++++-- .../service/IcResiDemandDictService.java | 10 +++- .../service/IcServiceItemDictService.java | 9 ++++ .../impl/IcResiDemandDictServiceImpl.java | 29 ++++++++++++ .../impl/IcServiceItemDictServiceImpl.java | 30 ++++++++++++ .../oper-customize-server/pom.xml | 6 +++ .../java/com/epmet/dao/IcFormListItemDao.java | 16 +++++++ .../epmet/entity/IcFormListItemEntity.java | 46 +++++++++++++++++++ .../epmet/service/impl/IcFormServiceImpl.java | 42 ++++++++++++++++- .../resources/mapper/IcFormListItemDao.xml | 22 +++++++++ 12 files changed, 252 insertions(+), 6 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormListItemDao.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormListItemEntity.java create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormListItemDao.xml diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index 25cf270549..5c71e7bcf1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/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); } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index 06bdc642c9..28e1fc50b8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/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); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java index 12b617b6bc..7608069b76 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java +++ b/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>().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(); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java index ce861497cf..4510a34341 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java +++ b/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 queryLatestOrder(String userId, String customerId); + + /** + * 客户初始化 + * @Param customerId + * @Return + * @Author zhaoqifeng + * @Date 2022/4/14 14:31 + */ + void customerInit(String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java index 4e704aff54..af01c8a4c3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java @@ -70,4 +70,13 @@ public interface IcServiceItemDictService extends BaseService queryDictListForSelect(ServiceItemSelectFormDTO formDTO); + + /** + * 客户初始化 + * @Param customerId + * @Return + * @Author zhaoqifeng + * @Date 2022/4/14 14:31 + */ + void customerInit(String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java index c6d0e0946f..5081bfd574 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java +++ b/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(); } + /** + * 客户初始化 + * + * @param customerId + * @Param customerId + * @Return + * @Author zhaoqifeng + * @Date 2022/4/14 14:31 + */ + @Override + public void customerInit(String customerId) { + String defaultCustomerId = "default"; + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiDemandDictEntity::getCustomerId, defaultCustomerId); + List 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); + }); + } + } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java index 76e431aa44..3fbda7cd37 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java +++ b/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 wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcServiceItemDictEntity::getCustomerId, defaultCustomerId); + List 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); + }); + } + } + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index baa7055c83..71b33b7510 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -83,6 +83,12 @@ 2.0.0 compile + + com.epmet + epmet-heart-client + 2.0.0 + compile + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormListItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormListItemDao.java new file mode 100644 index 0000000000..673ff3b2f3 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormListItemEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormListItemEntity.java new file mode 100644 index 0000000000..b5426d37de --- /dev/null +++ b/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; + +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java index 3d453ea38c..3e88b05f7b 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java +++ b/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 private IcResiCategoryStatsConfigDao icResiCategoryStatsConfigDao; @Autowired private IcResiCategoryWarnConfigDao icResiCategoryWarnConfigDao; + @Resource + private IcFormListItemDao icFormListItemDao; + @Resource + private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient; /** * 获取居民信息表单 @@ -131,7 +139,9 @@ public class IcFormServiceImpl extends BaseServiceImpl @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 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 icFormItemDao.insert(item); }); + //设置ic_form_item_options LambdaQueryWrapper wrapperOptions = new LambdaQueryWrapper<>(); wrapperOptions.eq(IcFormItemOptionsEntity::getCustomerId, defaultCustomerId); wrapperOptions.eq(IcFormItemOptionsEntity::getFormCode, formCode); @@ -209,6 +220,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormItemOptionsDao.insert(item); }); + //设置ic_form_item_group LambdaQueryWrapper wrapperGroup = new LambdaQueryWrapper<>(); wrapperGroup.eq(IcFormItemGroupEntity::getCustomerId, defaultCustomerId); wrapperGroup.eq(IcFormItemGroupEntity::getFormCode, formCode); @@ -225,6 +237,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormItemGroupDao.insert(item); }); + //设置ic_form_query_builder LambdaQueryWrapper wrapperQuery = new LambdaQueryWrapper<>(); wrapperQuery.eq(IcFormQueryBuilderEntity::getCustomerId, defaultCustomerId); wrapperQuery.eq(IcFormQueryBuilderEntity::getFormCode, formCode); @@ -241,6 +254,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icFormQueryBuilderDao.insert(item); }); + //设置ic_resi_category_stats_config LambdaQueryWrapper wrapperStats = new LambdaQueryWrapper<>(); wrapperStats.eq(IcResiCategoryStatsConfigEntity::getCustomerId, defaultCustomerId); List statsConfigList = icResiCategoryStatsConfigDao.selectList(wrapperStats); @@ -255,6 +269,7 @@ public class IcFormServiceImpl extends BaseServiceImpl icResiCategoryStatsConfigDao.insert(item); }); + //设置ic_resi_category_warn_config LambdaQueryWrapper wrapperWarn = new LambdaQueryWrapper<>(); wrapperWarn.eq(IcResiCategoryWarnConfigEntity::getCustomerId, defaultCustomerId); List warnConfigList = icResiCategoryWarnConfigDao.selectList(wrapperWarn); @@ -269,6 +284,31 @@ public class IcFormServiceImpl extends BaseServiceImpl icResiCategoryWarnConfigDao.insert(item); }); + //设置ic_form_list_item + LambdaQueryWrapper listItemWapper = new LambdaQueryWrapper<>(); + listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId); + listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode); + List 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; } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormListItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormListItemDao.xml new file mode 100644 index 0000000000..d31304f648 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormListItemDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ed1e76873225a932fef66dbd2b1b3607cba25f98 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 Apr 2022 10:09:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?bug#2803,=E4=BF=AE=E6=94=B9=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E5=90=8D=E5=90=8E=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8C=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/redis/common/CustomerIcHouseRedis.java | 4 ++++ .../main/java/com/epmet/redis/IcHouseRedis.java | 5 +++++ .../epmet/service/impl/BuildingServiceImpl.java | 15 ++++++++++++--- .../src/main/resources/mapper/IcHouseDao.xml | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java index ec0a79f1db..6f2e4959e0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java +++ b/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); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java index 01792daf8c..63ff8d25e5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java @@ -90,6 +90,11 @@ public class IcHouseRedis { return houseInfo; } + public void delHouseInfo(String houseId,String customerId){ + String key = RedisKeys.getHouseInfoCacheKey(houseId,customerId); + redisUtils.delete(key); + } + /** * @Description 存放房屋临时缓存 * @param customerId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 04670fde28..6e4ee6a7a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -36,7 +36,10 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.model.BuildingInfoModel; import com.epmet.model.ImportBuildingInfoListener; import com.epmet.redis.IcHouseRedis; -import com.epmet.service.*; +import com.epmet.service.BuildingService; +import com.epmet.service.IcBuildingService; +import com.epmet.service.IcBuildingUnitService; +import com.epmet.service.IcNeighborHoodService; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -69,8 +72,6 @@ public class BuildingServiceImpl implements BuildingService { @Resource private IcHouseDao icHouseDao; - @Autowired - private IcHouseService icHouseService; @Resource private CustomerAgencyDao customerAgencyDao; @@ -552,6 +553,14 @@ public class BuildingServiceImpl implements BuildingService { throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),"楼宇单元下存在房屋，无法更新"); } + //删除楼栋下所有的房屋缓存 + List houseList = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId())); + if (!CollectionUtils.isEmpty(houseList)) { + houseList.forEach(house -> { + //删除房屋的缓存 + icHouseRedis.delHouseInfo(house.getId(), customerId); + }); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index f3698b35ed..327605cef6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -149,7 +149,7 @@ --> - SELECT ID, PID, From d719d15f633bbf326a2fc963685ea66c64762a97 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Apr 2022 11:07:06 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AimportTask?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=BA=94=E7=9A=84=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BBImportTaskUtils=EF=BC=8C=E7=94=A8=E8=B5=B7=E6=9D=A5?= =?UTF-8?q?=E6=9B=B4=E6=B8=85=E7=88=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/utils/ImportTaskUtils.java | 51 +++++++++++++++++++ .../com/epmet/controller/IcNatController.java | 9 ++-- .../epmet/service/impl/IcNatServiceImpl.java | 24 ++++----- 3 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java new file mode 100644 index 0000000000..80bf086374 --- /dev/null +++ b/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 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); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index 17502c65e0..e65121e55d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/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导入核酸检测信息错误", diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 5307df5cb1..2723d47b37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/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; @@ -365,30 +366,23 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } } - 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 { // 删除临时文件 From dc261c2f9fd0338c7bb1c299209ca802f47a122a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 19 Apr 2022 13:58:45 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=B8=8E=E6=88=BF=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E6=98=AF=E6=9C=AC=E4=BA=BA=E7=9A=84=EF=BC=8C=E4=B8=BA?= =?UTF-8?q?=E6=88=BF=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 7e376b57ec..1f27a2999d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl houseResult = govOrgOpenFeignClient.get(user.getHomeId()); - if (!houseResult.success()) { - throw new RenException(houseResult.getCode(),houseResult.getMsg()); - } - result.setOwnerName(houseResult.getData().getOwnerName()); - + result.setOwnerName(""); //获取用户所在家庭里所有人员信息 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); @@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 19 Apr 2022 17:19:33 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=94=B9=E9=80=A0=E3=80=90=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=AF=BC=E5=85=A5=E3=80=91=E3=80=90?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E3=80=91?= =?UTF-8?q?=E3=80=90=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=91=E7=9A=84importTask=E4=BC=A0=E8=BE=93=EF=BC=8C?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BA=86=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=BB=A3=E7=A0=81=E3=80=82=E8=B0=83=E6=95=B4?= =?UTF-8?q?FileItem=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcVaccineController.java | 9 ++---- .../epmet/service/impl/IcNatServiceImpl.java | 23 ++++++++------ .../impl/IcResiUserImportServiceImpl.java | 5 +-- .../service/impl/IcVaccineServiceImpl.java | 31 ++++++++++--------- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index 297c30ae15..166cdecf32 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/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导入疫苗接种信息错误", diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 2723d47b37..95a22ff271 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -49,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; @@ -329,7 +330,6 @@ public class IcNatServiceImpl extends BaseServiceImpl imp EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); - Path errorDescFile = null; String errorDesFileUrl = null; List errorRows = listener.getErrorRows(); @@ -341,16 +341,19 @@ public class IcNatServiceImpl extends BaseServiceImpl 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 @@ -358,10 +361,12 @@ public class IcNatServiceImpl extends BaseServiceImpl imp if (errorDesFileUploadResult.success()) { errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); } - } finally { - if (Files.exists(errorDescFile)) { - Files.delete(errorDescFile); + IOUtils.closeQuietly(os); + try { + fileItem.delete(); + } finally { + log.error("【核酸检测导入】删除临时描述文件失败"); } } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index ee23c3f7d1..c680ea94b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/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 uploadResult = null; try { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index ec33974bf8..350c361ac4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/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 errorRows = listener.getErrorRows(); @@ -189,16 +190,17 @@ public class IcVaccineServiceImpl extends BaseServiceImpl 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,21 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Tue, 19 Apr 2022 17:31:49 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=A3=80=E6=B5=8Bsql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenProjectDataDao.xml | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml index 51f9a0fcb6..f132877210 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml @@ -394,61 +394,61 @@ From 639af5c1f55f2bb0170a9e35b9898031128ebb01 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Apr 2022 17:46:44 +0800 Subject: [PATCH 11/11] - --- .../java/com/epmet/service/impl/IcNatServiceImpl.java | 4 ++-- .../com/epmet/service/impl/IcVaccineServiceImpl.java | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 95a22ff271..5649e202fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -365,8 +365,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp IOUtils.closeQuietly(os); try { fileItem.delete(); - } finally { - log.error("【核酸检测导入】删除临时描述文件失败"); + } catch (Exception e){ + log.error("【核酸检测导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); } } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 350c361ac4..389e23ba04 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -211,10 +211,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl