From 2444b6f87ae636bfe056aa7153099512ef3563c4 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 17 Aug 2022 10:49:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91=E6=A0=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/impl/DataStatsServiceImpl.java | 9 +++++++-- .../service/govorg/GovOrgService.java | 2 +- .../service/govorg/impl/GovOrgServiceImpl.java | 18 +++++++++++++++--- .../mapper/govorg/CustomerGridDao.xml | 1 + 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index fd2a4e5f85..86fb3b0f56 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2011,10 +2011,15 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //2.查询组织信息，判断查询下级组织还是网格数据 - ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + //2022.8.17 屏蔽查询组织、网格逻辑，直接以org库的组织网格为准 + ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), formDTO.isExport()); if (null == agencyGrid) { return new CustomerDataManageResultDTO(); } + /*ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + if (null == agencyGrid) { + return new CustomerDataManageResultDTO(); + }*/ //组织或网格Id集合 List idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList()); formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode()); @@ -2329,7 +2334,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //2.查询组织信息，判断要查询下级是组织还是网格数据 - ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId()); + ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), false); if (null == agencyGrid) { return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 6a55f59e53..8c92a4004e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -290,6 +290,6 @@ public interface GovOrgService { List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); - ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId); + ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 96099374f8..a07ebf0a7c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1473,7 +1473,7 @@ public class GovOrgServiceImpl implements GovOrgService { } @Override - public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) { + public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid) { ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO(); List agencyGridList = new ArrayList<>(); //1.查询组织信息 @@ -1485,10 +1485,22 @@ public class GovOrgServiceImpl implements GovOrgService { //2.根据组织级别判断查询直属组织或网格列表 List agencyList = new ArrayList<>(); List gridList = new ArrayList<>(); + //组织级别为街道的查询下级所有网格 + if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) { + gridList = customerGridDao.getSubGridList(customerId, agencyId); + List allGridList = new ArrayList<>(); + gridList.forEach(gr -> { + ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); + org.setOrgId(gr.getGridId()); + org.setOrgName(gr.getGridName()); + allGridList.add(org); + }); + resultDTO.setAllGridList(allGridList); + } if (!"community".equals(dto.getLevel())) { //2-1.直属下级组织列表 agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId); - agencyList.forEach(gr->{ + agencyList.forEach(gr -> { ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); org.setOrgId(gr.getAgencyId()); org.setOrgName(gr.getAgencyName()); @@ -1497,7 +1509,7 @@ public class GovOrgServiceImpl implements GovOrgService { } else { //2-2.直属下级网格列表 gridList = customerGridDao.getSubGridList(customerId, agencyId); - gridList.forEach(gr->{ + gridList.forEach(gr -> { ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); org.setOrgId(gr.getGridId()); org.setOrgName(gr.getGridName()); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 2457f87733..cb90d827d3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -194,6 +194,7 @@ del_flag = '0' AND customer_id = #{customerId} AND pid = #{agencyId} + ORDER BY pid, grid_name From d216530497a4cfe3dbd849b855fde1fe84cfe816 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 17 Aug 2022 14:44:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91=E6=A0=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/govorg/CustomerGridDao.java | 1 + .../service/govorg/impl/GovOrgServiceImpl.java | 2 +- .../resources/mapper/govorg/CustomerGridDao.xml | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java index 10721a9f7a..9b8ba8580b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java @@ -86,4 +86,5 @@ public interface CustomerGridDao extends BaseDao { CustomerGridDTO getGridInfo(@Param("gridId") String gridId); List getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); + List getAllSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index a07ebf0a7c..d2ee934888 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1487,7 +1487,7 @@ public class GovOrgServiceImpl implements GovOrgService { List gridList = new ArrayList<>(); //组织级别为街道的查询下级所有网格 if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) { - gridList = customerGridDao.getSubGridList(customerId, agencyId); + gridList = customerGridDao.getAllSubGridList(customerId, agencyId); List allGridList = new ArrayList<>(); gridList.forEach(gr -> { ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index cb90d827d3..13f296b87b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -197,4 +197,20 @@ ORDER BY pid, grid_name + + From e9bbe6eeec3611f0f27ae3151a43c4ed3460060c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 10:39:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=92=8C?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetHeartOpenFeignClient.java | 9 ++++ .../EpmetHeartOpenFeignClientFallback.java | 7 ++- .../controller/IcUserDemandRecController.java | 19 ++++++-- .../epmet/service/IcUserDemandRecService.java | 11 ++++- .../impl/IcUserDemandRecServiceImpl.java | 13 ++++++ .../com/epmet/enums/ProjectOriginEnum.java | 46 +++++++++++++++++++ .../com/epmet/service/ProjectService.java | 11 ++++- .../service/impl/IcEventServiceImpl.java | 20 +++++++- .../service/impl/ProjectServiceImpl.java | 9 ++++ 9 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java 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 e3b04df7bb..59e3476245 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 @@ -171,4 +171,13 @@ public interface EpmetHeartOpenFeignClient { @PostMapping("/heart/icpartyunit/editpartyorcommunity") Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO); + /** + * desc:根据来源id 删除需求 只删主表 + * @param originId + * @param origin + * @return + */ + @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}") + Result deleteUserDemandByOriginId(String originId, String origin); + } 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 558cd43f2b..247495bdf5 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 @@ -13,7 +13,6 @@ import com.epmet.dto.form.IcDemandFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.demand.DemandRecId; import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; -import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; @@ -21,7 +20,6 @@ import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.CheckStaffInfoResultDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; -import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.feign.EpmetHeartOpenFeignClient; @@ -172,4 +170,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli public Result editPartyOrCommunity(CheckStaffInfoResultDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "editPartyOrCommunity", formDTO); } + + @Override + public Result deleteUserDemandByOriginId(String originId, String origin) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "deleteUserDemandByOriginId", originId,origin); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 25db823b01..7db80a3dbd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -47,10 +47,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; 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.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -399,5 +396,17 @@ public class IcUserDemandRecController implements ResultDataResolver { return new Result(); } + /** + * desc:根据来源id 删除需求 只删主表 + * @param originId + * @param origin + * @return + */ + @PostMapping("deleteByOriginId/{originId}/{origin}") + public Result deleteByOriginId(@PathVariable String originId, @PathVariable String origin) { + Integer effectRow = icUserDemandRecService.deleteByOriginId(originId,origin); + return new Result().ok(effectRow); + } + -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index 68a295422a..ce4b03c9b7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -265,4 +265,13 @@ public interface IcUserDemandRecService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcUserDemandRecEntity::getOriginId,originId) + .eq(IcUserDemandRecEntity::getOrigin,origin); + return baseDao.delete(wrapper); + } + /** * 完成并评价 * diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java new file mode 100644 index 0000000000..5388c889a9 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/enums/ProjectOriginEnum.java @@ -0,0 +1,46 @@ +package com.epmet.enums; + +/** + * 项目来源枚举 + * @author liujianjun + */ +public enum ProjectOriginEnum { + /** + * 项目来源 + */ + ISSUE("issue", "议题上报"), + AGENCY("agency", "直接立项"), + WORK_EVENT("work_event", "巡查上报"), + IC_EVENT("ic_event", "居民上报"), + RESI_EVENT("resi_event", "旧的居民上报（已废弃）"); + + private String code; + private String name; + + ProjectOriginEnum(String code, String name) { + this.code = code; + this.name = name; + } + + /** + * 根据sourceType查询对应的枚举对象 + * @param code + * @return + */ + public static ProjectOriginEnum getEnumByCode(String code) { + for (ProjectOriginEnum e : ProjectOriginEnum.values()) { + if (e.getCode().equals(code)) { + return e; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index c57ac318a6..7dba649107 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -397,4 +397,13 @@ public interface ProjectService extends BaseService { List staffPendingProject(ProjectListFromDTO fromDTO); PageData orgProjectList(OrgProjectListFormDTO formDTO); -} \ No newline at end of file + + /** + * desc:根据来源id和类型 删除项目 （只删了主表） + * @param originId + * @param origin + * @return + */ + Integer deleteByOriginId(String originId, String origin); + +} 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 f11fd1044d..fea81dc3b6 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 @@ -29,6 +29,7 @@ import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.enums.EcEventProcessStatusEnum; +import com.epmet.enums.ProjectOriginEnum; import com.epmet.feign.*; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.service.*; @@ -407,8 +408,23 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); + log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id); + } + baseDao.deleteById(id); + } } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 0267a6f59b..9c77a99edd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -3562,5 +3563,13 @@ public class ProjectServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + @Override + public Integer deleteByOriginId(String originId, String origin) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectEntity::getOriginId, originId) + .eq(ProjectEntity::getOrigin,origin); + return baseDao.delete(wrapper); + } + } From 535de4e6d65891d9361853a366ada149482c3c69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 10:50:18 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=92=8C?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java | 2 +- .../java/com/epmet/controller/IcUserDemandRecController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 59e3476245..27d88957b5 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 @@ -178,6 +178,6 @@ public interface EpmetHeartOpenFeignClient { * @return */ @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}") - Result deleteUserDemandByOriginId(String originId, String origin); + Result deleteUserDemandByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 7db80a3dbd..99894e3165 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -403,7 +403,7 @@ public class IcUserDemandRecController implements ResultDataResolver { * @return */ @PostMapping("deleteByOriginId/{originId}/{origin}") - public Result deleteByOriginId(@PathVariable String originId, @PathVariable String origin) { + public Result deleteByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin) { Integer effectRow = icUserDemandRecService.deleteByOriginId(originId,origin); return new Result().ok(effectRow); } From 54ffc7598a92fec0793f885e7fbe17e9d5932f69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:27:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 fea81dc3b6..5ac629487d 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 @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; @@ -19,6 +20,7 @@ import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.constant.*; import com.epmet.dao.IcEventDao; @@ -95,6 +97,8 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id); } - baseDao.deleteById(id); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()).set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId()); + baseDao.delete(wrapper); } } From 23a1cac51b7fa384fdeda60039ea530ed2925d06 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:33:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcEventServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 5ac629487d..9042b2aa74 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 @@ -428,8 +428,10 @@ public class IcEventServiceImpl extends BaseServiceImpl wrapper = new LambdaUpdateWrapper(); - wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()).set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId()); - baseDao.delete(wrapper); + wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()) + .set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId()) + .set(IcEventEntity::getDelFlag,NumConstant.ONE_STR); + baseDao.update(null,wrapper); } } From ddc7285cbef043bae32cb26a11f84da0ce1f052e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:43:53 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcUserDemandRecServiceImpl.java | 16 +++++++++++----- .../epmet/service/impl/ProjectServiceImpl.java | 11 +++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index e4477dcf27..9ecec05fa1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -18,8 +18,8 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -39,6 +39,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -114,6 +115,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcUserDemandRecEntity::getOriginId,originId) - .eq(IcUserDemandRecEntity::getOrigin,origin); - return baseDao.delete(wrapper); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IcUserDemandRecEntity::getOriginId, originId) + .eq(IcUserDemandRecEntity::getOrigin,origin) + .set(IcUserDemandRecEntity::getUpdatedTime,new Date()) + .set(IcUserDemandRecEntity::getCreatedBy,loginUserUtil.getLoginUserId()) + .set(IcUserDemandRecEntity::getDelFlag,NumConstant.ONE_STR); + return baseDao.update(null, wrapper); } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 9c77a99edd..9e679c824b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -19,8 +19,8 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; @@ -3565,10 +3565,13 @@ public class ProjectServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); wrapper.eq(ProjectEntity::getOriginId, originId) - .eq(ProjectEntity::getOrigin,origin); - return baseDao.delete(wrapper); + .eq(ProjectEntity::getOrigin,origin) + .set(ProjectEntity::getUpdatedTime,new Date()) + .set(ProjectEntity::getCreatedBy,loginUserUtil.getLoginUserId()) + .set(ProjectEntity::getDelFlag,NumConstant.ONE_STR); + return baseDao.update(null, wrapper); } From 4ebe75943d006bab5b7e64f4bec62bbad5ad78a3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 19 Aug 2022 12:54:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9042b2aa74..6f4d7afe6e 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 @@ -425,7 +425,7 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); - log.info("delete userDemand effectRow:{},eventId:{}", effectRow, id); + log.info("delete userDemand result:{},eventId:{}", effectRow, id); } LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date())