diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java index ba554957d5..b22f9734c6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.form.IcCityManagementListFormDTO; import com.epmet.dto.result.IcCityManagementListResultDTO; import com.epmet.entity.IcCityManagementEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +22,6 @@ public interface IcCityManagementDao extends BaseDao { void del(IcCityManagementEntity entity); + void importInsert(@Param("entityList") List entityList); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java index 03c1c90c62..5f75264465 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java @@ -20,4 +20,6 @@ public interface IcDangerousChemicalsDao extends BaseDao selectDangerousChemicalsList(IcDangerousChemicalsListFormDTO formDTO); void del(IcDangerousChemicalsEntity entity); + + void importInsert(List entityList); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java index e1a168ae30..3f29ecba64 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; import com.epmet.entity.IcPublicServiceEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,4 +21,6 @@ public interface IcPublicServiceDao extends BaseDao { List selectPublicServiceList(IcPublicServiceListFormDTO formDTO); void del(IcPublicServiceEntity entity); + + void importInsert(@Param("entityList") List entityList); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java index 1ac3c972f0..cbd187c7bf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.form.IcSuperiorResourceListFormDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.entity.IcSuperiorResourceEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,4 +21,6 @@ public interface IcSuperiorResourceDao extends BaseDao List selectSuperiorResourceList(IcSuperiorResourceListFormDTO formDTO); void del(IcSuperiorResourceEntity entity); + + void importInsert(@Param("entityList") List entityList); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 9ce5752963..5d08ce792c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -68,14 +68,14 @@ public class IcCityManagementExcelImportListener implements ReadListener { d.setCategory(dictMap.get(d.getCategory())); }); - IcCityManagementServiceImpl.insertBatch(datas); + IcCityManagementServiceImpl.importInsert(datas); } finally { datas.clear(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java index 55bb737fe2..084dc0b60a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java @@ -68,14 +68,14 @@ public class IcPublicServiceExcelImportListener implements ReadListener { d.setCategory(dictMap.get(d.getCategory())); }); - IcPublicServiceServiceImpl.insertBatch(datas); + IcPublicServiceServiceImpl.importInsert(datas); } finally { datas.clear(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java index cfc40119b2..6f0e8b63fe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java @@ -69,14 +69,14 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener { d.setCategory(dictMap.get(d.getCategory())); }); - icSuperiorResourceServiceImpl.insertBatch(datas); + icSuperiorResourceServiceImpl.importInsert(datas); } finally { datas.clear(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java index e164649b63..0511f8f6fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java @@ -46,13 +46,15 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener errorRows = new ArrayList<>(); private List otherRows = new ArrayList<>(); private List insertList = new ArrayList<>(); private Map existMap = null; - public DangerousChemicalsImportListener(AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService, EpmetAdminOpenFeignClient adminOpenFeignClient, IcDangerousChemicalsDao icDangerousChemicalsDao){ + public DangerousChemicalsImportListener(String currentUserId, AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService, EpmetAdminOpenFeignClient adminOpenFeignClient, IcDangerousChemicalsDao icDangerousChemicalsDao){ + this.currentUserId = currentUserId; this.agencyInfo = agencyInfo; this.icDangerousChemicalsService = icDangerousChemicalsService; this.coverageService = coverageService; @@ -65,19 +67,21 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener entityList); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index 526ef118cc..0562ff6f1e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java @@ -293,5 +293,9 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl entityList){ + baseDao.importInsert(entityList); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 0d58aaaf7c..a9da5c7e22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; +import com.epmet.entity.IcSuperiorResourceEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; @@ -235,7 +236,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); @@ -305,4 +306,9 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl entityList){ + baseDao.importInsert(entityList); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 27ae3c76bb..b822245662 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -19,7 +19,6 @@ import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPublicServiceDao; -import com.epmet.dao.IcSuperiorResourceDao; import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO; @@ -294,4 +293,8 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl entityList){ + baseDao.importInsert(entityList); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java index 9cafac0016..e524738d93 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java @@ -293,5 +293,9 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl entityList){ + baseDao.importInsert(entityList); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml index 5d7e5dfdbc..22a66aeb56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml @@ -2,6 +2,64 @@ + + INSERT INTO ic_city_management + ( + id, + customer_id, + agency_id, + agency_id_path, + source_type, + name, + category, + area_covered, + capacity, + address, + longitude, + latitude, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) + VALUES + + ( + REPLACE(UUID(), '-', ''), + #{i.customerId}, + #{i.agencyId}, + #{i.agencyIdPath}, + #{i.sourceType}, + #{i.name}, + #{i.category}, + #{i.areaCovered}, + #{i.capacity}, + #{i.address}, + #{i.longitude}, + #{i.latitude}, + 0, + 0, + #{i.createdBy}, + now(), + #{i.updatedBy}, + now() + ) + + ON DUPLICATE KEY + UPDATE + source_type = values(source_type), + name = values(name), + category = values(category), + area_covered = values(area_covered), + capacity = values(capacity), + address = values(address), + longitude = null, + latitude = null, + updated_by = values(updated_by), + updated_time = NOW() + SELECT diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 91ea0d7cce..6909d9ea5c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -2,6 +2,64 @@ + + INSERT INTO ic_public_service + ( + id, + customer_id, + agency_id, + agency_id_path, + source_type, + name, + category, + area_covered, + capacity, + address, + longitude, + latitude, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) + VALUES + + ( + REPLACE(UUID(), '-', ''), + #{i.customerId}, + #{i.agencyId}, + #{i.agencyIdPath}, + #{i.sourceType}, + #{i.name}, + #{i.category}, + #{i.areaCovered}, + #{i.capacity}, + #{i.address}, + #{i.longitude}, + #{i.latitude}, + 0, + 0, + #{i.createdBy}, + now(), + #{i.updatedBy}, + now() + ) + + ON DUPLICATE KEY + UPDATE + source_type = values(source_type), + name = values(name), + category = values(category), + area_covered = values(area_covered), + capacity = values(capacity), + address = values(address), + longitude = null, + latitude = null, + updated_by = values(updated_by), + updated_time = NOW() + SELECT diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 951d2196fc..5105ca27bf 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -501,4 +501,17 @@ public class IcEventController { return new Result(); } + /** + * 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询 + * 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口 + * @author sun + */ + @PostMapping("icevent-pageuserreported") + public Result> pageUserReported(@RequestBody PageUserReportEventFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class); + return new Result>().ok(icEventService.icEventPageUserReported(formDTO)); + } + + + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 8240dee3c6..41379f7fc8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.IcEventDTO; import com.epmet.dto.form.IcEventCategoryAnalysisFormDTO; import com.epmet.dto.form.IcEventListFormDTO; import com.epmet.dto.form.MyReportIcEvFormDTO; +import com.epmet.dto.form.PageUserReportEventFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcEventEntity; import org.apache.ibatis.annotations.MapKey; @@ -139,4 +140,7 @@ public interface IcEventDao extends BaseDao { Integer getResiReportEventCount(@Param("reportorIdCard") String reportorIdCard); List getByEventIds(@Param("icEventIdList") List icEventIdList); -} \ No newline at end of file + + List selectUserReported(PageUserReportEventFormDTO formDTO); + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index eb26fc1fa5..40a9f2e55d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -222,4 +222,7 @@ public interface IcEventService extends BaseService { void govRedDot(String icEventId); void difficultPointEvent(IcEventListFormDTO formDTO); -} \ No newline at end of file + + PageData icEventPageUserReported(PageUserReportEventFormDTO formDTO); + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index f8de2e8936..7dfdc190be 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -95,6 +95,7 @@ public class IcEventServiceImpl extends BaseServiceImpl icEventPageUserReported(PageUserReportEventFormDTO formDTO) { + if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); + } + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index eb336fe63e..439794c875 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -937,8 +937,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl projectData=new ArrayList<>(); for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){ //当前项目分类一致，排除当前项目，相同分类编码 - List projectList=projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), - categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList()); + List projectList = projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(), + categoryDictDTO.getCategoryCode(), formDTO.getProjectId(), formDTO.getEpmetUserIdList()); if(!CollectionUtils.isEmpty(projectList)){ ProjectDataDTO projectDataDTO=new ProjectDataDTO(); projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index bb3165fb8b..af09210b52 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -393,4 +393,23 @@ AND (`status` = 'closed_case' OR difficult_point = '1') - \ No newline at end of file + + + + +