From 382dc4bc5a75cebabeee9187d57587bf52f0930c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Sep 2021 15:55:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=90=8D?= =?UTF-8?q?=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/MineResultDTO.java | 6 ++++++ .../com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java | 2 ++ .../com/epmet/service/impl/RegisterRelationServiceImpl.java | 1 + 3 files changed, 9 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java index 01b1630ebc..2e3adc0e89 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java @@ -63,4 +63,10 @@ public class MineResultDTO implements Serializable { * 根组织名 */ private String rootAgencyName; + //工作人员添加入口Id(agencyId;deptId;gridId) + private String orgId = ""; + //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】 + private String orgName = ""; + //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) + private String orgType = ""; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java index 64f790c115..3561cb4060 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java @@ -59,6 +59,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{ */ private String userStreetTrueName; + //真实姓名 + private String realName; //工作人员添加入口Id(agencyId;deptId;gridId) private String orgId = ""; //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index efafe3a963..2d1a9df160 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -158,6 +158,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl Date: Fri, 17 Sep 2021 16:44:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/form/SubOrgFormDTO.java | 4 + .../dto/govorg/result/OrgTreeResultDTO.java | 21 +++ .../controller/GovOrgController.java | 14 ++ .../dao/govorg/CustomerAgencyDao.java | 11 +- .../service/govorg/GovOrgService.java | 10 ++ .../govorg/impl/GovOrgServiceImpl.java | 18 +++ .../mapper/govorg/CustomerAgencyDao.xml | 121 ++++++++++++++++++ 7 files changed, 195 insertions(+), 4 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java index effc43d25c..dca75903ab 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java @@ -15,6 +15,10 @@ public class SubOrgFormDTO implements Serializable { private static final long serialVersionUID = -3651225675593357002L; @NotBlank(message = "组织ID不能为空") private String agencyId; + /** + * 所属端 居民端resi，工作端gov + */ + private String client; /** * 是否包括我（1 是，0 否） */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java new file mode 100644 index 0000000000..b9b6c724cd --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/9/16 16:50 + */ +@Data +public class OrgTreeResultDTO implements Serializable { + private static final long serialVersionUID = -4304356050545598564L; + private String orgId; + private String orgName; + private String orgType; + private String orgPids; + private List subOrgList; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 561dff2acc..824fab2fae 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -165,4 +165,18 @@ public class GovOrgController { return new Result().ok(govOrgService.getSubOrg(formDTO)); } + /** + * @Description 当前组织级下级组织树 + * @Param tokenDto + * @Param formDTO + * @Return {@link Result< OrgTreeResultDTO>} + * @Author zhaoqifeng + * @Date 2021/9/17 14:02 + */ + @PostMapping("agencytree") + public Result getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(govOrgService.getAgencyTree(tokenDto, formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 544f7387dd..673d317fe6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -18,10 +18,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO; -import com.epmet.dataaggre.dto.govorg.result.StaffAgencyGridListResultDTO; -import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; -import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO; +import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -74,4 +71,10 @@ public interface CustomerAgencyDao extends BaseDao { * @return */ StaffOrgRelationResultDTO getStaffFromOrgType(@Param("staffId") String staffId); + + OrgTreeResultDTO getOrgTree(@Param("agencyId") String agencyId); + List getSubOrgList(@Param("pid") String pid); + + OrgTreeResultDTO getResiOrgTree(@Param("agencyId") String agencyId); + List getResiSubOrgList(@Param("pid") String pid); } 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 a641be3095..2e2b7c6e88 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 @@ -135,4 +135,14 @@ public interface GovOrgService { * @return */ StaffOrgRelationResultDTO getStaffFromOrgType(String staffId); + + /** + * @Description 当前组织级下级组织树 + * @Param tokenDto + * @Param formDTO + * @Return {@link OrgTreeResultDTO} + * @Author zhaoqifeng + * @Date 2021/9/17 14:03 + */ + OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO); } 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 b7b23299ab..45ee6810fe 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 @@ -491,4 +491,22 @@ public class GovOrgServiceImpl implements GovOrgService { return customerAgencyDao.getStaffFromOrgType(staffId); } + /** + * @param tokenDto + * @param formDTO + * @Description 当前组织级下级组织树 + * @Param tokenDto + * @Param formDTO + * @Return {@link OrgTreeResultDTO} + * @Author zhaoqifeng + * @Date 2021/9/17 14:03 + */ + @Override + public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) { + if ("resi".equals(formDTO.getClient())) { + return customerAgencyDao.getResiOrgTree(formDTO.getAgencyId()); + } + return customerAgencyDao.getOrgTree(formDTO.getAgencyId()); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 2573d8b674..d47b736984 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -142,4 +142,125 @@ SELECT STAFF_ID,ORG_ID,ORG_TYPE FROM staff_org_relation WHERE del_flag = '0' AND staff_id = #{staffId} + + + + + + + + + + + + + + + + + + + + + + + + From c0e242eb43e5d734c199cbccc9ccecbd376dd0aa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Sep 2021 16:44:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epmettduck/form/TDuckListFormDTO.java | 37 +++++++ .../epmettduck/result/TDuckListResultDTO.java | 96 +++++++++++++++++++ .../controller/EpmetTDuckController.java | 12 +++ .../dao/epmettduck/PrUserProjectDao.java | 18 ++++ .../dao/epmettduck/PrVistRecordDao.java | 7 +- .../epmettduck/PrUserProjectService.java | 4 + .../impl/PrUserProjectServiceImpl.java | 36 +++++++ .../mapper/epmettduck/PrUserProjectDao.xml | 22 +++++ .../mapper/epmettduck/PrVistRecordDao.xml | 6 ++ 9 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java new file mode 100644 index 0000000000..481ff42126 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dataaggre.dto.epmettduck.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/9/17 10:47 上午 + * @DESC + */ +@Data +public class TDuckListFormDTO implements Serializable { + + private static final long serialVersionUID = 3624352114576287768L; + + public interface TDuckListForm{} + + /** + * 1：未发布，2：收集中，3：已结束 + */ + @NotNull(message = "问卷调查状态不能为空",groups = TDuckListForm.class) + private Integer status; + + @NotNull(message = "pageNo不能为空",groups = TDuckListForm.class) + private Integer pageNo; + + @NotNull(message = "pageSize不能为空",groups = TDuckListForm.class) + private Integer pageSize; + + @NotBlank(message = "orgIds不能为空",groups = TDuckListForm.class) + private String orgIds; + + private String userId; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java new file mode 100644 index 0000000000..267df6a5f2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java @@ -0,0 +1,96 @@ +package com.epmet.dataaggre.dto.epmettduck.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/9/17 10:47 上午 + * @DESC + */ +@Data +public class TDuckListResultDTO implements Serializable { + + private static final long serialVersionUID = 3624352114576287768L; + + /** + * 客户id + */ + private String customerId; + + /** + * 项目code + */ + private String key; + + /** + * 来源Id + */ + private String sourceId; + + /** + * 来源类型 + */ + private Integer sourceType; + + /** + * 项目名称 + */ + private String name; + + /** + * 项目描述 + */ + private String describe; + + /** + * 用户ID + */ + private String userId; + + /** + * 项目类型 + */ + private Integer type; + + /** + * 状态 + */ + private Integer status; + + /** + * 适用于哪个端 resi：居民端用户；gov：工作端用户；运营端用户：oper + */ + private String client; + + private String createdTime; + + /** + * 是否填写问卷，true：是，false：否 + */ + private Boolean fillStatus; + + /** + * 回收状态 0:未回收；1已回收 + */ + private Integer recycled; + + public TDuckListResultDTO() { + this.customerId = ""; + this.key = ""; + this.sourceId = ""; + this.sourceType = NumConstant.ONE; + this.name = ""; + this.describe = ""; + this.userId = ""; + this.type = NumConstant.ONE; + this.status = NumConstant.ONE; + this.client = ""; + this.createdTime = ""; + this.fillStatus = false; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java index afe5b4ea8c..84fc0c68d2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java @@ -2,9 +2,14 @@ package com.epmet.dataaggre.controller; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO; +import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; +import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO; +import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -75,4 +80,11 @@ public class EpmetTDuckController { } + @PostMapping("list") + public Result> queryProjectList(@RequestBody TDuckListFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO,TDuckListFormDTO.TDuckListForm.class); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(prUserProjectService.queryProjectList(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java index ef2cdad012..1adda97179 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java @@ -3,9 +3,11 @@ package com.epmet.dataaggre.dao.epmettduck; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO; import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; +import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -46,4 +48,20 @@ public interface PrUserProjectDao extends BaseDao { * @date 2021/9/16 6:18 下午 */ List selectResults(String projectKey); + + /** + * @Description 查询范围内的问卷调查 + * @Param orgId + * @author zxc + * @date 2021/9/17 2:16 下午 + */ + List selectProjectKey(@Param("orgIds")String orgIds); + + /** + * @Description 根据keys查询project + * @Param keys + * @author zxc + * @date 2021/9/17 3:41 下午 + */ + List queryProjectList(@Param("keys")List keys, @Param("status")Integer status); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java index 716daf1608..279884c678 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java @@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.epmettduck; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 用户访问问卷记录表 @@ -12,5 +15,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PrVistRecordDao extends BaseDao { - + + List selectVisitRecordByUserId(@Param("userId")String userId); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java index d341cddfd1..4000d3bdc0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java @@ -20,8 +20,10 @@ package com.epmet.dataaggre.service.epmettduck; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; +import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO; import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; +import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import java.util.List; @@ -105,6 +107,8 @@ public interface PrUserProjectService extends BaseService { */ ProjectProfileResultDTO queryProjectProfile(String projectKey); + List queryProjectList(TDuckListFormDTO formDTO); + /** * 分析报告 * diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 0739d25834..78cd44a5b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -19,9 +19,11 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +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.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -29,16 +31,24 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao; +import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao; +import com.epmet.dataaggre.dto.epmettduck.InputMapDTO; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; +import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum; import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO; import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; +import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO; import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct; +import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -59,6 +69,9 @@ import java.util.stream.Stream; @Service public class PrUserProjectServiceImpl extends BaseServiceImpl implements PrUserProjectService { + @Autowired + private PrVistRecordDao visitRecordDao; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -124,6 +137,29 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl queryProjectList(TDuckListFormDTO formDTO) { + List projectKeys = baseDao.selectProjectKey(formDTO.getOrgIds()); + if (CollectionUtils.isEmpty(projectKeys)){ + return new ArrayList<>(); + } + PageInfo projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus())); + List result = projectPageInfo.getList(); + List records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId()); + if (!CollectionUtils.isEmpty(records)){ + for (String r : records) { + for (TDuckListResultDTO t : result) { + if (r.equals(t.getKey())){ + t.setFillStatus(true); + continue; + } + } + } + } + return result; + } + /** * 分析报告 * diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index 9453b32ffa..45948a5dcf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -47,4 +47,26 @@ and m.project_key=#{projectKey} order by m.serial_number asc + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml index 8ea675b0e9..77f2f5c68a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml @@ -3,4 +3,10 @@ + + \ No newline at end of file