From 8ef667e52c0f35c2657437d0778a24d804112734 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 11 May 2020 15:09:29 +0800 Subject: [PATCH 01/13] =?UTF-8?q?resi=5Ftopic=E8=AF=9D=E9=A2=98=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5(=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98=EF=BC=8C=E8=AE=AE=E9=A2=98ID)sql?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/db.sql | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql index 04a3e6e9bf..a966031574 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql @@ -4,4 +4,30 @@ ALTER TABLE resi_group_operation ADD ( READ_FLAG VARCHAR (8) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)', MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容' - ); \ No newline at end of file + ); + + +/* + Navicat Premium Data Transfer + + Source Server : 党群e事通开发库 + Source Server Type : MySQL + Source Server Version : 50728 + Source Host : 192.168.1.130:3306 + Source Schema : epmet_resi_group + + Target Server Type : MySQL + Target Server Version : 50728 + File Encoding : 65001 + + Date: 11/05/2020 14:00:00 +*/ +-- @Date 2020-05-11 14:00 +-- @Author wangc +-- @Description 数据库epmet_resi_group中的resi_topic(话题表)表新增两个字段，db语句： +ALTER TABLE RESI_TOPIC ADD ( + SHIFT_ISSUE tinyint(1) DEFAULT 0 NOT NULL COMMENT '是否转为议题，0:false，1:true', + ISSUE_ID VARCHAR (64) DEFAULT NULL COMMENT '议题ID，可为空' + ); + + From c99a01cad894708a0c612e4a9c0a0e55dc27d8fe Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 11 May 2020 15:30:56 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ProjectStaffDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/ProjectProcessEntity.java | 5 +++++ .../src/main/java/com/epmet/excel/ProjectStaffExcel.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java index 223fa90ad7..9072cfbb3d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java @@ -43,6 +43,11 @@ public class ProjectStaffDTO implements Serializable { */ private String projectId; + /** + * 项目处理进展ID + */ + private String processId; + /** * 客户ID */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java index de53a677c5..68f06bb6eb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java @@ -43,6 +43,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity { */ private String projectId; + /** + * 项目处理进展ID + */ + private String processId; + /** * 负负责人ID */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java index 1a920d4712..bfa228dd25 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java @@ -37,6 +37,9 @@ public class ProjectStaffExcel { @Excel(name = "项目ID") private String projectId; + @Excel(name = "项目处理进展ID") + private String processId; + @Excel(name = "客户ID") private String customerId; From 09972f3eafadf206ef09ef42cfee1b2433e66679 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 11 May 2020 15:31:38 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db.migration/epmet_gov_project.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql index e4f2d0ac8d..f6a22b3126 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql @@ -140,3 +140,5 @@ CREATE TABLE `project_staff` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目人员关联表' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; + +alter table project_staff add column PROCESS_ID varchar(64) NOT NULL COMMENT '处理进展ID'; \ No newline at end of file From 2c50aafcfeb75c66163662b2e8a5dd64dd7f2c19 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 11 May 2020 16:34:43 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0feign=E6=8E=A5=E5=8F=A3=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetUserFeignClient.java | 16 ++++++++++++++++ .../java/com/epmet/feign/GovOrgFeignClient.java | 17 +++++++++++++++++ .../fallback/EpmetUserFeignClientFallBack.java | 13 +++++++++++++ .../fallback/GovOrgFeignClientFallBack.java | 13 +++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java new file mode 100644 index 0000000000..cc2404269e --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -0,0 +1,16 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.EpmetUserFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @Description 调用epmet-user服务 + * @Author sun + */ +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) +public interface EpmetUserFeignClient { + + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..e4ae2ffc95 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,17 @@ +package com.epmet.feign; + + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; + + +/** + * @Description 调用gov-org-server + * @Author sun + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java new file mode 100644 index 0000000000..cfb62dcabf --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java @@ -0,0 +1,13 @@ +package com.epmet.feign.fallback; + +import com.epmet.feign.EpmetUserFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 调用epmet-user服务 + * @Author sun + */ +@Component +public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..6eccf9cb4a --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,13 @@ +package com.epmet.feign.fallback; + +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 调用gov-org-server + * @Author sun + */ +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + +} From af5a5ac4b5ef59572438bc42aa2488acf2d105a2 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 11 May 2020 18:43:22 +0800 Subject: [PATCH 05/13] =?UTF-8?q?resi=5Ftopic=E8=AF=9D=E9=A2=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResiTopicIncludeIssueDetailResultDTO.java | 68 ++++++++ .../ResiTopicIncludeIssueInfoResultDTO.java | 74 ++++++++ .../topic/result/ResiTopicInfoResultDTO.java | 5 - .../member/redis/ResiGroupMemberRedis.java | 2 +- .../topic/controller/ResiTopicController.java | 10 +- .../epmet/modules/topic/dao/ResiTopicDao.java | 14 +- .../modules/topic/entity/ResiTopicEntity.java | 12 +- .../topic/service/ResiTopicService.java | 8 +- .../service/impl/ResiTopicServiceImpl.java | 160 +++++++++++++----- .../resources/mapper/topic/ResiTopicDao.xml | 57 ++++++- .../main/java/com/epmet/excel/IssueExcel.java | 2 +- 11 files changed, 345 insertions(+), 67 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java new file mode 100644 index 0000000000..4ac316638c --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java @@ -0,0 +1,68 @@ +package com.epmet.resi.group.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 话题详情DTO(包含议题Id和是否转为议题Flag) + * @ClassName ResiTopicIncludeIssueDetailResultDTO + * @Auth wangc + * @Date 2020-05-11 17:31 + */ +@Data +public class ResiTopicIncludeIssueDetailResultDTO implements Serializable { + private static final long serialVersionUID = -6790536784979922200L; + + /** + * 话题Id + * */ + private String topicId; + + + /** + * 发布人名称 + * */ + private String releaseUserName; + + /** + * 发布人头像 + * */ + private String releaseUserHeadPhoto; + + /** + * 发布时间 yyyy-MM-dd HH:mm + * */ + private String releaseTime; + + /** + * 发布地址 + * */ + private String releaseAddress; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题状态 + * */ + private String topicStatus; + + /** + * 图片访问地址 + * */ + private List topicImgs; + + /** + * 是否被转为议题true,false + * */ + private Boolean shiftIssueFlag; + + /** + * 议题Id，当shiftIssueFlag为false时返回"" + * */ + private String issueId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java new file mode 100644 index 0000000000..55fe66f286 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java @@ -0,0 +1,74 @@ +package com.epmet.resi.group.dto.topic.result; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 话题信息返回DTO(包含议题Id和是否转为议题Flag) + * @ClassName ResiTopicIncludeIssueInfoResultDTO + * @Auth wangc + * @Date 2020-05-11 15:56 + */ +@Data +public class ResiTopicIncludeIssueInfoResultDTO implements Serializable { + private static final long serialVersionUID = -7029232911456325417L; + + /** + * 话题Id + * */ + private String topicId; + + /** + * 用户Id 话题发布人 + * */ + private String userId; + + /** + * 发布人名称 + * */ + private String releaseUserName; + + /** + * 发布人头像 + * */ + private String releaseUserHeadPhoto; + + /** + * 发布时间 yyyy-MM-dd HH:mm + * */ + @JSONField(format="yyyy-MM-dd HH:mm") + private Date releaseTime; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题状态 讨论中 已关闭 + * */ + private String status; + + /** + * 是否本人 me other + * */ + private String releaseUserFlag; + + /** + * 第一张图片 + * */ + private String firstPhoto; + + /** + * 是否被转为议题true,false + * */ + private Boolean shiftIssueFlag; + + /** + * 议题Id，当shiftIssueFlag为false时返回"" + * */ + private String issueId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java index 278a75e45e..613b506acf 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java @@ -53,11 +53,6 @@ public class ResiTopicInfoResultDTO implements Serializable{ * */ private String status; - /** - * 网格名称 - * */ - private String gridName; - /** * 是否本人 me other * */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java index d59e819155..2fc537cdb2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java @@ -96,7 +96,7 @@ public class ResiGroupMemberRedis { ResiGroupMemberInfoRedisDTO memberCache = (ResiGroupMemberInfoRedisDTO) redisUtils.get(RedisKeys.getResiGroupMemberInfoKey(groupId,userId)); //如果缓存中没有该成员数据 - if(null == memberCache && StringUtils.isNotBlank(memberCache.getUserId())){ + if(null == memberCache || StringUtils.isNotBlank(memberCache.getUserId())){ Map param = new HashMap<>(); param.put(TopicConstant.CUSTOMER_USER_ID,userId); param.put(TopicConstant.RESI_GROUP_ID,groupId); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index 4bc5da215b..f0f488efe5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -7,6 +7,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -54,7 +56,7 @@ public class ResiTopicController { * @Date 2020.04.01 23:48 **/ @PostMapping("gettopicdetail") - public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){ + public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){ ValidatorUtils.validateEntity(topicDetailFormDTO); return topicService.getTopicDetail(tokenDto,topicDetailFormDTO.getTopicId()); } @@ -68,7 +70,7 @@ public class ResiTopicController { * @Date 2020.04.01 10:36 **/ @PostMapping("getpasttopiclist") - public Result> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + public Result> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ topicPageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(topicPageFormDTO); return topicService.getPastTopicList(tokenDto,topicPageFormDTO); @@ -78,12 +80,12 @@ public class ResiTopicController { * @Description 查看组内最近十条话题 * @Param tokenDto * @Param ResiTopicDefaultPageFormDTO - * @return Result> + * @return Result> * @Author wangc * @Date 2020.04.02 00:01 **/ @PostMapping("getlatesttopics") - public Result> getLatestTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){ + public Result> getLatestTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){ ValidatorUtils.validateEntity(topicDefaultPageFormDTO); return topicService.getLatestTopics(tokenDto,topicDefaultPageFormDTO.getGroupId()); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index 7c602bc126..7399e0ca43 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -49,11 +50,11 @@ public interface ResiTopicDao extends BaseDao { /** * @Description 查询该组内最近十条话题信息 * @Param groupId - * @return List + * @return List * @Author wangc * @Date 2020.04.01 09:40 **/ - List getLatestTenTopics(@Param("groupId")String groupId,@Param("userId")String userId); + List getLatestTenTopics(@Param("groupId")String groupId,@Param("userId")String userId); /** * @Description 查看历史话题(分页,允许状态筛选) @@ -64,6 +65,15 @@ public interface ResiTopicDao extends BaseDao { **/ List getPastTopics(ResiTopicPageFormDTO topicPageFormDTO); + /** + * @Description 查看历史话题(分页,允许状态筛选) + * @param topicPageFormDTO + * @return List 每个实体类里包含shiftIssueFlag和issueId字段 + * @author wangc + * @date 2020.05.11 16:06 + **/ + List getTopicsIncludeIssueInfoByConditions(ResiTopicPageFormDTO topicPageFormDTO); + /** * @Description 修改话题 * @Param ResiTopicEntity.class diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java index c3f9bfc0b1..d16ba57c73 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java @@ -23,7 +23,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; + /** * 话题信息表 @@ -83,4 +83,14 @@ public class ResiTopicEntity extends BaseEpmetEntity { */ private String dimension; + /** + * 议题Id + */ + private String issueId; + + /** + * 是否转为议题标识 true：已转为议题 false：未转为议题 + * */ + private Boolean shiftIssue; + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index b15e4b6b44..2282d66cb9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -30,6 +30,8 @@ import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; @@ -122,7 +124,7 @@ public interface ResiTopicService extends BaseService { * @Author wangc * @Date 2020.04.01 08:59 **/ - Result> getLatestTopics(TokenDto tokenDto, String groupId); + Result> getLatestTopics(TokenDto tokenDto, String groupId); /** * @return Result> @@ -132,7 +134,7 @@ public interface ResiTopicService extends BaseService { * @Author wangc * @Date 2020.04.01 10:36 **/ - Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); + Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); /** * @return Result @@ -172,7 +174,7 @@ public interface ResiTopicService extends BaseService { * @Author wangc * @Date 2020.04.01 15:56 **/ - Result getTopicDetail(TokenDto tokenDto, String topicId); + Result getTopicDetail(TokenDto tokenDto, String topicId); /** * @return List diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 0733a02226..aa688b9d26 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -64,6 +64,8 @@ import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -274,36 +276,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getLatestTopics(TokenDto tokenDto, String groupId) { + public Result> getLatestTopics(TokenDto tokenDto, String groupId) { if (null == tokenDto) { logger.error(ModuleConstant.USER_NOT_NULL); throw new RenException(ModuleConstant.USER_NOT_NULL); } - if (StringUtils.isBlank(groupId)) { - return new Result>().error(); - } - //1.查询话题列表 - List lastestTenTopics = + List latestTenTopics = baseDao.getLatestTenTopics(groupId, tokenDto.getUserId()); + if(null != latestTenTopics && latestTenTopics.size() > 0) { - if(null != lastestTenTopics && lastestTenTopics.size() > 0) { - - //2.遍历存储用户信息 从数据库中查找 - /*List userIdList = new ArrayList<>(); - for (ResiTopicInfoResultDTO topic : lastestTenTopics) { - userIdList.add(topic.getUserId()); - } - UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); - formDTO.setUserIdList(userIdList); - Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); - setUserInfo(userResiInfoDTOListResult, lastestTenTopics); - */ //2.2从缓存中查找用户信息 - setCacheUserInfo(groupId,lastestTenTopics); + setCacheUserInfoWithIssue(groupId,latestTenTopics); } - return new Result>().ok(lastestTenTopics); + return new Result>().ok(latestTenTopics); } /** @@ -315,36 +302,22 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { + public Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { //1.查询历史话题列表 topicPageFormDTO.setUserId(topicPageFormDTO.getUserId()); topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize()); - List pastTopics = - baseDao.getPastTopics(topicPageFormDTO); - + List pastTopics = + baseDao.getTopicsIncludeIssueInfoByConditions(topicPageFormDTO); if (null != pastTopics && pastTopics.size() > 0) { - /* - //2.遍历用户信息 - List userIdList = new ArrayList<>(); - for (ResiTopicInfoResultDTO topic : pastTopics) { - userIdList.add(topic.getUserId()); + //2. 在缓存中拉取用户信息 + setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics); } - UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); - formDTO.setUserIdList(userIdList); - Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); - setUserInfo(userResiInfoDTOListResult, pastTopics); - - */ - - //2.2 在缓存中拉取用户信息 - setCacheUserInfo(topicPageFormDTO.getGroupId(), pastTopics); - } - return new Result>().ok(pastTopics); + return new Result>().ok(pastTopics); } /** @@ -505,19 +478,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicDetail(TokenDto tokenDto, String topicId) { + public Result getTopicDetail(TokenDto tokenDto, String topicId) { //1.获取话题基本信息 ResiTopicEntity topicDetail = baseDao.selectById(topicId); if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){ logger.error(ModuleConstant.NO_SUCH_TOPIC); throw new RenException(ModuleConstant.NO_SUCH_TOPIC); } - ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO(); + ResiTopicIncludeIssueDetailResultDTO resultDTO = + ConvertUtils.sourceToTarget(topicDetail,ResiTopicIncludeIssueDetailResultDTO.class); resultDTO.setTopicId(topicId); resultDTO.setReleaseTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(topicDetail.getCreatedTime())); resultDTO.setTopicContent(topicDetail.getTopicContent()); resultDTO.setReleaseAddress(topicDetail.getAddress()); resultDTO.setTopicStatus(topicDetail.getStatus()); + resultDTO.setShiftIssueFlag(topicDetail.getShiftIssue()); //2.查询话题附件 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); @@ -537,11 +512,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl().ok(resultDTO); + return new Result().ok(resultDTO); } /** @@ -703,7 +678,22 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO) { - return getPastTopicList(null,topicPageFormDTO); + //1.查询历史话题列表 + + topicPageFormDTO.setUserId(topicPageFormDTO.getUserId()); + + topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize()); + + List pastTopics = + baseDao.getPastTopics(topicPageFormDTO); + + if (null != pastTopics && pastTopics.size() > 0) { + + //2. 在缓存中拉取用户信息 + setCacheUserInfo(topicPageFormDTO.getGroupId(), pastTopics); + } + return new Result>().ok(pastTopics); + } /** @@ -720,7 +710,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicDetailGov(String topicId) { - return getTopicDetail(null,topicId); + Result result = getTopicDetail(null,topicId); + if(result.success() && null != result.getData() && StringUtils.isNotBlank(result.getData().getTopicId())){ + return new Result().ok(ConvertUtils.sourceToTarget(result.getData(),ResiTopicDetailResultDTO.class)); + } + logger.error(ModuleConstant.NO_SUCH_TOPIC); + throw new RenException(ModuleConstant.NO_SUCH_TOPIC); } /** @@ -794,6 +789,77 @@ public class ResiTopicServiceImpl extends BaseServiceImpl + * @return void + * @Author wangc + * @Date 2020.04.14 10:32 + **/ + private void setCacheUserInfoWithIssue(String groupId ,List topics) { + + //1.初始化存储缺失缓存信息的组员Id的容器，默认去重 + Set usersNotInCache = new HashSet<>(); + + //2.读取用户缓存信息 + ResiGroupMemberInfoRedisResultDTO memberRedis = resiGroupMemberRedis.getKeys(groupId); + if (null != memberRedis && null != memberRedis.getMemberKeys() && null != memberRedis.getMemberMap()) { + String keyPrefix = RedisKeys.getResiGroupMemberInfoKey(groupId, ""); + for (ResiTopicIncludeIssueInfoResultDTO topic : topics) { + //缓存中有该用户的key + if (memberRedis.getMemberKeys().contains(keyPrefix.concat(topic.getUserId()))) { + ResiGroupMemberInfoRedisDTO memberInfoCache = memberRedis.getMemberMap().get(topic.getUserId()); + if (null != memberInfoCache) { + //缓存中有该用户信息 + topic.setReleaseUserName(StringUtils.isBlank(memberInfoCache.getUserShowName())?"":memberInfoCache.getUserShowName()); + topic.setReleaseUserHeadPhoto(StringUtils.isBlank(memberInfoCache.getUserHeadPhoto())?"":memberInfoCache.getUserHeadPhoto()); + } else { + //缓存中没有该用户信息 + usersNotInCache.add(topic.getUserId()); + } + } else { + //缓存中没有该用户的key + usersNotInCache.add(topic.getUserId()); + } + } + } + + //3.如果存在缺失缓存的组员，去数据库中查找，并存入缓存 + if (usersNotInCache.size() > 0) { + Map> topicMap + = topics.stream().collect(Collectors.groupingBy(ResiTopicIncludeIssueInfoResultDTO::getUserId)); + List userIds = new ArrayList<>(usersNotInCache); + Result> result = + epmetUserFeignClient.getUserResiInfoList(new UserResiInfoListFormDTO(userIds)); + + if (result.success() && null != result.getData() && result.getData().size() > 0) { + for (UserResiInfoResultDTO user : result.getData()) { + ResiTopicIncludeIssueInfoResultDTO topic = + topicMap.get(user.getUserId()).get(0); + topic.setReleaseUserHeadPhoto(user.getHeadPhoto()); + topic.setReleaseUserName(user.getShowName()); + + //存入缓存 + ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO(); + ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId()); + memberRedisDTO.setMemberStatus(memberMySql.getStatus()); + memberRedisDTO.setUserId(user.getUserId()); + memberRedisDTO.setUserShowName(user.getShowName()); + memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType()); + memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag()); + memberRedisDTO.setUserHeadPhoto(user.getHeadPhoto()); + memberRedisDTO.setGroupId(groupId); + resiGroupMemberRedis.set(memberRedisDTO); + } + } else { + + logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND); + } + } + + } + /** * @Description 更新组统计缓存信息 * @Param groupId diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 57ba94d5b6..f274faffff 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -109,7 +109,7 @@ - SELECT topic.ID AS topicId, topic.GROUP_ID, @@ -117,7 +117,9 @@ topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, - attachement2.firstPhoto, + topic.SHIFT_ISSUE AS shiftIssueFlag, + IFNULL(topic.ISSUE_ID,'') AS issueId, + IFNULL(attachement2.firstPhoto,'') AS firstPhoto, CASE WHEN topic.CREATED_BY = #{userId} THEN 'me' ELSE 'other' @@ -157,7 +159,56 @@ topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, - attachement2.firstPhoto, + IFNULL(attachement2.firstPhoto,'') AS firstPhoto, + CASE + WHEN topic.CREATED_BY = #{userId} THEN 'me' + ELSE 'other' + END AS releaseUserFlag + FROM + RESI_TOPIC topic + LEFT JOIN + ( + SELECT + attachment.TOPIC_ID AS attachmentTopicId, + attachment.ATTACHMENT_URL as firstPhoto, + MIN(attachment.SORT) + FROM + RESI_TOPIC_ATTACHMENT attachment + WHERE + attachment.DEL_FLAG = '0' + GROUP BY attachment.TOPIC_ID + ) attachement2 + ON + topic.ID = attachement2.attachmentTopicId + + topic.DEL_FLAG = '0' + AND topic.GROUP_ID = #{groupId} + + AND 'hidden' ]]> + + + AND topic.STATUS = #{status} + + + + ORDER BY + topic.CREATED_TIME DESC + LIMIT #{pageNo},#{pageSize} + + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java new file mode 100644 index 0000000000..e643a1bd75 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java @@ -0,0 +1,43 @@ +package com.epmet.resi.group.dto.topic; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * 话题详情(议题详情中的) + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java new file mode 100644 index 0000000000..9c8c2dc5e4 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询话题信息 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index c9ad7e98a8..5ce70364f8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallback; @@ -17,6 +18,7 @@ import java.util.List; * @Description epmet_user服务fegin * @Author yinzuomei * @Date 2020/3/16 14:48 + * url = "localhost:8087" */ @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class) public interface EpmetUserFeignClient { @@ -63,4 +65,13 @@ public interface EpmetUserFeignClient { @PostMapping(value = "epmetuser/staffrole/specificrolesstaffs", consumes = MediaType.APPLICATION_JSON_VALUE) Result> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO); + + /** + * @Description 查询议题发起人 + * @param formDTO + * @author zxc + * @date 2020/5/11 10:53 + */ + @PostMapping(value = "/epmetuser/userresiinfo/selectissueinitiator") + Result selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java index e778691743..3f2377fa95 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -43,4 +44,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { public Result> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "specificRolesStaffs", rolesUsersListFormDTO); } + + @Override + public Result selectIssueInitiator(IssueInitiatorFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index f0f488efe5..6a86db52ff 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -5,6 +5,7 @@ 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.modules.topic.service.ResiTopicService; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; @@ -187,4 +188,15 @@ public class ResiTopicController { return topicService.getTopicDetailGov(topicDetailFormDTO.getTopicId()); } + /** + * @Description 根据topicId查询话题信息 （议题详情——话题信息） + * @param topicInfo + * @author zxc + * @date 2020/5/11 14:15 + */ + @PostMapping(value = "selectdetail") + public Result selectDetail(@RequestBody TopicInfoFormDTO topicInfo){ + return new Result().ok(topicService.selectDetail(topicInfo)); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index 7399e0ca43..95d679080a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -21,8 +21,10 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; +import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -110,4 +112,12 @@ public interface ResiTopicDao extends BaseDao { * @Date 2020.04.01 15:21 **/ List selectTopicList(ResiTopicDTO resiTopicDTO); + + /** + * @Description 根据topicId查询话题信息 （议题详情——话题信息） + * @param formDTO + * @author zxc + * @date 2020/5/11 15:28 + */ + TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 2282d66cb9..f7694dcf76 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -26,9 +26,11 @@ import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; @@ -219,4 +221,12 @@ public interface ResiTopicService extends BaseService { **/ Result getTopicDetailGov(String topicId); + /** + * @Description 根据topicId查询话题信息 （议题详情——话题信息） + * @param formDTO + * @author zxc + * @date 2020/5/11 14:16 + */ + TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index aa688b9d26..920c6cfda4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -29,7 +29,9 @@ import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.constant.GroupMemberConstant; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -60,9 +62,11 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; @@ -117,6 +121,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); + wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId()); + wrapper.orderByAsc(TopicConstant.SORT); + List attachments = resiTopicAttachmentDao.selectList(wrapper); + List attachmentUrls = new ArrayList<>(); + for(ResiTopicAttachmentEntity attachment : attachments){ + attachmentUrls.add(attachment.getAttachmentUrl()); + } + topicInfo.setTopicImgs(attachmentUrls); + //话题发起人 + IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO(); + issueInitiator.setUserId(topicInfo.getTopicId()); + Result issueInitiatorResult = epmetUserFeignClient.selectIssueInitiator(issueInitiator); + topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator()); + return topicInfo; + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index f274faffff..62cef3f328 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -337,4 +337,18 @@ + + + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java new file mode 100644 index 0000000000..b4fee06837 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * 投票折线数据 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class PolyLineDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java new file mode 100644 index 0000000000..8df402c618 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询所属网格 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class BelongGridNameFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格id + */ + private String gridId; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java new file mode 100644 index 0000000000..6b16e733ec --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 议题Id + * @Author zxc + * @Date 2020/5/11 9:30 + */ +@Data +public class IssueIdFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214503489L; + + @NotBlank(message = "议题id不能为空") + private String issueId; + +} + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java index 42b2885f66..00231b0b9d 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java @@ -15,9 +15,9 @@ public class IssueInitiatorFormDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 话题id + * userId 用户id */ - private String topicId; + private String userId; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java new file mode 100644 index 0000000000..cf85fae8c8 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询话题信息 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java new file mode 100644 index 0000000000..5d7091a66d --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询所属网格 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class BelongGridNameResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 所属网格名称 eg:所属网格(网格所属机关单位名称-网格名称) + */ + private String belongsGridName; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java new file mode 100644 index 0000000000..b278b9f585 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 议题详情回参 + * @CreateTime 2020/5/11 9:31 + */ +@Data +public class IssueResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题状态(voting 已转项目：shift_project 已关闭：closed) + */ + private String issueStatus; + + /** + * 议题建议 + */ + private String issueSuggestion; + + /** + * 网格Id + */ + private String gridId; + + /** + * 用户id + */ + private String userId; + + /** + * 话题Id + */ + private String topicId; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java new file mode 100644 index 0000000000..b92e466fce --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 议题表决折线图 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class VotingTrendResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 应表决数量 + */ + private Integer shouldVoteCount; + + /** + * 实际表决数量 + */ + private Integer realityVoteCount; + + /** + * 截至今日赞成票总数 + */ + private Integer supportAmount; + + /** + * 截至今日反对票总数 + */ + private Integer oppositionAmount; + + +} diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 66d1426a33..4c3d9cdefc 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -19,11 +19,6 @@ resi-hall-client 2.0.0 - - com.epmet - epmet-commons-mybatis - 2.0.0 - org.springframework.boot spring-boot-starter-web diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java index e14c45ec0c..48d63f37c9 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java @@ -31,10 +31,15 @@ public class IssueController { * @date 2020/5/11 9:42 */ @PostMapping(value = "/detail") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result detail(@RequestBody IssueDetailFormDTO issueDetail){ return new Result().ok(issueService.detail(issueDetail)); } + /*@PostMapping(value = "votingtrend") + public Result<> votingTrend(){ + return + }*/ + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 168555cc4a..6b397e298e 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @dscription * @date 2020/5/11 10:32 */ -//url = "8087" +//url = "localhost:8087" @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) public interface EpmetUserFeignClient { diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java new file mode 100644 index 0000000000..972dad25ff --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java @@ -0,0 +1,29 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.feign.fallback.GovIssueFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * @Description Feign调用gov-issue-server模块 + * @ClassName GovIssueFeignFallBack + * url = "localhost:8101" + */ +@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class) +public interface GovIssueFeignClient { + + /** + * @Description 议题详情 + * @param issueDetail + * @author zxc + * @date 2020/5/11 16:50 + */ + @PostMapping("/gov/issue/issue/issuedetail") + Result issueDetail(@RequestBody IssueDetailFormDTO issueDetail); +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..fbb1aeea7e --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,24 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.BelongGridNameFormDTO; +import com.epmet.dto.result.BelongGridNameResultDTO; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * @Description Feign调用gov-org-server模块 + * @ClassName GovOrgFeginFallBack + * url = "localhost:8092" + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { + + + @PostMapping("/gov/org/customergrid/getgridnamebygridid") + Result getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO); +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..661ef0e761 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -0,0 +1,28 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.TopicInfoDTO; +import com.epmet.dto.form.TopicInfoFormDTO; +import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @author zxc + * url = "localhost:8095" + */ +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) +public interface ResiGroupFeignClient { + + /** + * @Description 获取话题详情 + * @param formDTO + * @author zxc + * @date 2020/5/11 15:42 + */ + @PostMapping("/resi/group/topic/selectdetail") + Result selectDetail(TopicInfoFormDTO formDTO); + + +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java new file mode 100644 index 0000000000..62d2ceb77b --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java @@ -0,0 +1,22 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.feign.GovIssueFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description Feign + * @ClassName GovIssueFeginFallBack + */ +@Component +public class GovIssueFeignClientFallBack implements GovIssueFeignClient { + + @Override + public Result issueDetail(IssueDetailFormDTO issueDetail) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..1c58c6f9ed --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,23 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.BelongGridNameFormDTO; +import com.epmet.dto.result.BelongGridNameResultDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description Feign + * @ClassName GovOrgFeginFallBack + */ +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + + @Override + public Result getGridNameByGridId(BelongGridNameFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..d75c1a0f91 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,21 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.TopicInfoDTO; +import com.epmet.dto.form.TopicInfoFormDTO; +import com.epmet.feign.ResiGroupFeignClient; +import org.springframework.stereotype.Component; + +/** + * @author zxc + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { + + @Override + public Result selectDetail(TopicInfoFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectDetail", formDTO); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java index a6bc3862f2..999fb46355 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java @@ -1,15 +1,13 @@ package com.epmet.service; -import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.form.IssueDetailFormDTO; import com.epmet.dto.result.IssueDetailResultDTO; -import com.epmet.entity.IssueEntity; /** * @Author zxc * @CreateTime 2020/5/11 9:44 */ -public interface IssueService extends BaseService { +public interface IssueService { /** * @Description 议题详情 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index ccf27d6be4..b27ed53daf 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1,11 +1,21 @@ package com.epmet.service.impl; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.dao.IssueDao; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.TopicInfoDTO; +import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; +import com.epmet.dto.form.TopicInfoFormDTO; +import com.epmet.dto.result.BelongGridNameResultDTO; import com.epmet.dto.result.IssueDetailResultDTO; -import com.epmet.entity.IssueEntity; +import com.epmet.dto.result.IssueInitiatorResultDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.GovIssueFeignClient; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.ResiGroupFeignClient; import com.epmet.service.IssueService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,10 +24,16 @@ import org.springframework.stereotype.Service; * @CreateTime 2020/5/11 9:46 */ @Service -public class IssueServiceImpl extends BaseServiceImpl implements IssueService { +public class IssueServiceImpl implements IssueService { @Autowired - private IssueDao issueDao; + private EpmetUserFeignClient userFeignClient; + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @Autowired + private ResiGroupFeignClient resiGroupFeignClient; + @Autowired + private GovIssueFeignClient govIssueFeignClient; /** * @Description 议题详情 @@ -27,8 +43,29 @@ public class IssueServiceImpl extends BaseServiceImpl imp */ @Override public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) { - IssueDetailResultDTO issueDetailResult = issueDao.issueDetail(issueDetail); - + IssueDetailResultDTO issueDetailResult = new IssueDetailResultDTO(); + //议题信息 + Result issueResultDTOResult = govIssueFeignClient.issueDetail(issueDetail); + IssueResultDTO issueResult = issueResultDTOResult.getData(); + if (issueResult==null){ + return issueDetailResult; + } + BeanUtils.copyProperties(issueResult,issueDetailResult); + //话题发起人 + IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO(); + initiatorFormDTO.setUserId(issueResult.getUserId()); + Result initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO); + issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator()); + //网格名称 + BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO(); + belongGridName.setGridId(issueResult.getGridId()); + Result belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName); + issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName()); + //话题信息 + TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO(); + topicInfoFormDTO.setTopicId(issueResult.getTopicId()); + Result topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO); + issueDetailResult.setTopicInfo(topicInfoDTOResult.getData()); return issueDetailResult; } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java new file mode 100644 index 0000000000..e52d7c19e6 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询议题发起人dto + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class IssueInitiatorFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String userId; + + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java new file mode 100644 index 0000000000..08e0113ace --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 返回议题发起人dto eg：山东路178号——刘女士 + * @CreateTime 2020/5/11 10:49 + */ +@Data +public class IssueInitiatorResultDTO implements Serializable { + + /** + * 议题发起人（山东路168-尹女士） + */ + private String issueInitiator; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 825cc6e78b..8844cfbdc1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -26,9 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.excel.UserResiInfoExcel; import com.epmet.service.UserResiInfoService; @@ -150,4 +152,14 @@ public class UserResiInfoController { return userResiInfoService.saveResiInfo(userResiInfoDTO); } + /** + * @Description 根据userId查询议题发起人 eg:山东路168号——刘女士 + * @param formDTO + * @author zxc + */ + @PostMapping("selectissueinitiator") + public Result selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO){ + return new Result().ok(userResiInfoService.selectIssueInitiator(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index e14b927f1b..4f57bfa73c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -19,7 +19,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import org.apache.ibatis.annotations.Mapper; @@ -59,4 +61,12 @@ public interface UserResiInfoDao extends BaseDao { * @Date 2020/4/7 18:26 **/ List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); + + /** + * @Description 根据userId查询议题发起人 + * @param formDTO + * @author zxc + * @date 2020/5/11 11:18 + */ + IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java index 5f0817a62e..d01c706fd5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java @@ -21,9 +21,11 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; @@ -141,4 +143,12 @@ public interface UserResiInfoService extends BaseService { * @Date 2020/4/7 18:21 **/ Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO); + + /** + * @Description 根据userId查询议题发起人 + * @param formDTO + * @author zxc + * @date 2020/5/11 10:59 + */ + IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index b11fd29898..af31e780ec 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -31,9 +31,11 @@ import com.epmet.constant.UserRoleConstant; import com.epmet.dao.UserResiInfoDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import com.epmet.feign.MessageFeignClient; @@ -272,4 +274,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl + + + From d9e91c7349c7386bb87ed09e53c5009f493f82a9 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 11 May 2020 20:12:04 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-hall-client/resi-hall-client.iml | 145 +++++++++++++ .../resi-hall-server/resi-hall-server.iml | 196 ++++++++++++++++++ .../IssueCustomerParameterController.java | 94 --------- .../controller/IssueProcessController.java | 94 --------- .../IssueProjectRelationController.java | 94 --------- .../IssueSatisfactionDetailController.java | 94 --------- ...ssueSatisfactionStatisticalController.java | 94 --------- .../controller/IssueVoteDetailController.java | 94 --------- .../IssueVoteStatisticalController.java | 94 --------- .../IssueVoteStatisticalDailyController.java | 94 --------- .../controller/ResiHallDemoController.java | 27 --- .../epmet/dao/IssueCustomerParameterDao.java | 33 --- .../src/main/java/com/epmet/dao/IssueDao.java | 43 ---- .../java/com/epmet/dao/IssueProcessDao.java | 33 --- .../epmet/dao/IssueProjectRelationDao.java | 33 --- .../epmet/dao/IssueSatisfactionDetailDao.java | 33 --- .../dao/IssueSatisfactionStatisticalDao.java | 33 --- .../com/epmet/dao/IssueVoteDetailDao.java | 33 --- .../dao/IssueVoteStatisticalDailyDao.java | 33 --- .../epmet/dao/IssueVoteStatisticalDao.java | 33 --- .../entity/IssueCustomerParameterEntity.java | 66 ------ .../java/com/epmet/entity/IssueEntity.java | 116 ----------- .../com/epmet/entity/IssueProcessEntity.java | 66 ------ .../entity/IssueProjectRelationEntity.java | 51 ----- .../entity/IssueSatisfactionDetailEntity.java | 56 ----- .../IssueSatisfactionStatisticalEntity.java | 61 ------ .../epmet/entity/IssueVoteDetailEntity.java | 51 ----- .../IssueVoteStatisticalDailyEntity.java | 86 -------- .../entity/IssueVoteStatisticalEntity.java | 61 ------ .../excel/IssueCustomerParameterExcel.java | 71 ------- .../main/java/com/epmet/excel/IssueExcel.java | 101 --------- .../com/epmet/excel/IssueProcessExcel.java | 71 ------- .../excel/IssueProjectRelationExcel.java | 62 ------ .../excel/IssueSatisfactionDetailExcel.java | 65 ------ .../IssueSatisfactionStatisticalExcel.java | 68 ------ .../com/epmet/excel/IssueVoteDetailExcel.java | 62 ------ .../excel/IssueVoteStatisticalDailyExcel.java | 83 -------- .../excel/IssueVoteStatisticalExcel.java | 68 ------ .../redis/IssueCustomerParameterRedis.java | 47 ----- .../com/epmet/redis/IssueProcessRedis.java | 47 ----- .../redis/IssueProjectRelationRedis.java | 47 ----- .../main/java/com/epmet/redis/IssueRedis.java | 47 ----- .../redis/IssueSatisfactionDetailRedis.java | 47 ----- .../IssueSatisfactionStatisticalRedis.java | 47 ----- .../com/epmet/redis/IssueVoteDetailRedis.java | 47 ----- .../redis/IssueVoteStatisticalDailyRedis.java | 47 ----- .../redis/IssueVoteStatisticalRedis.java | 47 ----- .../IssueCustomerParameterService.java | 95 --------- .../epmet/service/IssueProcessService.java | 95 --------- .../service/IssueProjectRelationService.java | 95 --------- .../IssueSatisfactionDetailService.java | 95 --------- .../IssueSatisfactionStatisticalService.java | 95 --------- .../epmet/service/IssueVoteDetailService.java | 95 --------- .../IssueVoteStatisticalDailyService.java | 95 --------- .../service/IssueVoteStatisticalService.java | 95 --------- .../IssueCustomerParameterServiceImpl.java | 99 --------- .../service/impl/IssueProcessServiceImpl.java | 104 ---------- .../impl/IssueProjectRelationServiceImpl.java | 104 ---------- .../IssueSatisfactionDetailServiceImpl.java | 104 ---------- ...sueSatisfactionStatisticalServiceImpl.java | 104 ---------- .../impl/IssueVoteDetailServiceImpl.java | 104 ---------- .../IssueVoteStatisticalDailyServiceImpl.java | 104 ---------- .../impl/IssueVoteStatisticalServiceImpl.java | 104 ---------- .../mapper/IssueCustomerParameterDao.xml | 22 -- .../main/resources/mapper/IssueProcessDao.xml | 22 -- .../mapper/IssueProjectRelationDao.xml | 19 -- .../mapper/IssueSatisfactionDetailDao.xml | 20 -- .../IssueSatisfactionStatisticalDao.xml | 21 -- .../resources/mapper/IssueVoteDetailDao.xml | 19 -- .../mapper/IssueVoteStatisticalDailyDao.xml | 26 --- .../mapper/IssueVoteStatisticalDao.xml | 21 -- epmet-module/resi-hall/resi-hall.iml | 51 +++++ 72 files changed, 392 insertions(+), 4531 deletions(-) create mode 100644 epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml create mode 100644 epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml create mode 100644 epmet-module/resi-hall/resi-hall.iml diff --git a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml new file mode 100644 index 0000000000..f1936e17be --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml new file mode 100644 index 0000000000..9b122af4a2 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java deleted file mode 100644 index 7371c32666..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueCustomerParameterDTO; -import com.epmet.excel.IssueCustomerParameterExcel; -import com.epmet.service.IssueCustomerParameterService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issuecustomerparameter") -public class IssueCustomerParameterController { - - @Autowired - private IssueCustomerParameterService issueCustomerParameterService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueCustomerParameterService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueCustomerParameterDTO data = issueCustomerParameterService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueCustomerParameterDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueCustomerParameterService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueCustomerParameterDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueCustomerParameterService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueCustomerParameterService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueCustomerParameterService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueCustomerParameterExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java deleted file mode 100644 index bf6c57f863..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueProcessDTO; -import com.epmet.excel.IssueProcessExcel; -import com.epmet.service.IssueProcessService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issueprocess") -public class IssueProcessController { - - @Autowired - private IssueProcessService issueProcessService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueProcessService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueProcessDTO data = issueProcessService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueProcessDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueProcessService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueProcessDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueProcessService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueProcessService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueProcessService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java deleted file mode 100644 index 7efd1b1394..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueProjectRelationDTO; -import com.epmet.excel.IssueProjectRelationExcel; -import com.epmet.service.IssueProjectRelationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issueprojectrelation") -public class IssueProjectRelationController { - - @Autowired - private IssueProjectRelationService issueProjectRelationService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueProjectRelationService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueProjectRelationDTO data = issueProjectRelationService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueProjectRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueProjectRelationService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueProjectRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueProjectRelationService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueProjectRelationService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueProjectRelationService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java deleted file mode 100644 index 8772539ab3..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueSatisfactionDetailDTO; -import com.epmet.excel.IssueSatisfactionDetailExcel; -import com.epmet.service.IssueSatisfactionDetailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issuesatisfactiondetail") -public class IssueSatisfactionDetailController { - - @Autowired - private IssueSatisfactionDetailService issueSatisfactionDetailService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueSatisfactionDetailService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueSatisfactionDetailDTO data = issueSatisfactionDetailService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueSatisfactionDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueSatisfactionDetailService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueSatisfactionDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueSatisfactionDetailService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueSatisfactionDetailService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueSatisfactionDetailService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java deleted file mode 100644 index f9412e0996..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueSatisfactionStatisticalDTO; -import com.epmet.excel.IssueSatisfactionStatisticalExcel; -import com.epmet.service.IssueSatisfactionStatisticalService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issuesatisfactionstatistical") -public class IssueSatisfactionStatisticalController { - - @Autowired - private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueSatisfactionStatisticalService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueSatisfactionStatisticalDTO data = issueSatisfactionStatisticalService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueSatisfactionStatisticalDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueSatisfactionStatisticalService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueSatisfactionStatisticalDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueSatisfactionStatisticalService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueSatisfactionStatisticalService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueSatisfactionStatisticalService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java deleted file mode 100644 index 981aacf50e..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueVoteDetailDTO; -import com.epmet.excel.IssueVoteDetailExcel; -import com.epmet.service.IssueVoteDetailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issuevotedetail") -public class IssueVoteDetailController { - - @Autowired - private IssueVoteDetailService issueVoteDetailService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueVoteDetailService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueVoteDetailDTO data = issueVoteDetailService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueVoteDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueVoteDetailService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueVoteDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueVoteDetailService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueVoteDetailService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueVoteDetailService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java deleted file mode 100644 index ab98b72498..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueVoteStatisticalDTO; -import com.epmet.excel.IssueVoteStatisticalExcel; -import com.epmet.service.IssueVoteStatisticalService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issuevotestatistical") -public class IssueVoteStatisticalController { - - @Autowired - private IssueVoteStatisticalService issueVoteStatisticalService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueVoteStatisticalService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueVoteStatisticalDTO data = issueVoteStatisticalService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueVoteStatisticalDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueVoteStatisticalService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueVoteStatisticalDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueVoteStatisticalService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueVoteStatisticalService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueVoteStatisticalService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java deleted file mode 100644 index 7e5506354a..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.controller; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IssueVoteStatisticalDailyDTO; -import com.epmet.excel.IssueVoteStatisticalDailyExcel; -import com.epmet.service.IssueVoteStatisticalDailyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@RestController -@RequestMapping("issuevotestatisticaldaily") -public class IssueVoteStatisticalDailyController { - - @Autowired - private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = issueVoteStatisticalDailyService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IssueVoteStatisticalDailyDTO data = issueVoteStatisticalDailyService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IssueVoteStatisticalDailyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - issueVoteStatisticalDailyService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IssueVoteStatisticalDailyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - issueVoteStatisticalDailyService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - issueVoteStatisticalDailyService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = issueVoteStatisticalDailyService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalDailyExcel.class); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java deleted file mode 100644 index 56c01421a7..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.DemoTestFormDTO; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; - -/** - * @Description 测试 - * @Author yinzuomei - * @Date 2020/5/7 22:47 - */ -@RestController -@RequestMapping("demo") -public class ResiHallDemoController { - private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class); - - @PostMapping("test") - public Result test(@RequestBody DemoTestFormDTO formDTO) { - logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); - ValidatorUtils.validateEntity(formDTO); - return new Result().ok("resi-hall-server请求成功"); - } -} - diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java deleted file mode 100644 index 48fa1e3491..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueCustomerParameterEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueCustomerParameterDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java deleted file mode 100644 index 8f390edc63..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.form.IssueDetailFormDTO; -import com.epmet.dto.result.IssueDetailResultDTO; -import com.epmet.entity.IssueEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueDao extends BaseDao { - - /** - * @Description 议题详情 - * @param formDTO - * @author zxc - * @date 2020/5/11 10:11 - */ - IssueDetailResultDTO issueDetail(IssueDetailFormDTO formDTO); - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java deleted file mode 100644 index 26603169ae..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueProcessEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueProcessDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java deleted file mode 100644 index 430dc74741..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueProjectRelationEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueProjectRelationDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java deleted file mode 100644 index 01727f507a..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueSatisfactionDetailEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueSatisfactionDetailDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java deleted file mode 100644 index e3eeabb823..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueSatisfactionStatisticalEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueSatisfactionStatisticalDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java deleted file mode 100644 index f8a41e3747..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueVoteDetailEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueVoteDetailDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java deleted file mode 100644 index e09695b2b8..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueVoteStatisticalDailyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueVoteStatisticalDailyDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java deleted file mode 100644 index 7f833487d8..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IssueVoteStatisticalEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Mapper -public interface IssueVoteStatisticalDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java deleted file mode 100644 index 72e7769da7..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_customer_parameter") -public class IssueCustomerParameterEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 参数键 eg:voting_time_limit - */ - private String parameterKey; - - /** - * 参数名 eg:表决期限 - */ - private String parameterName; - - /** - * 参数值 eg:10（天） - */ - private String parameterValue; - - /** - * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天 - */ - private String description; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java deleted file mode 100644 index cfa9b8c046..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue") -public class IssueEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed - */ - private String issueStatus; - - /** - * 来源类型 eg:resi_topic - */ - private String sourceType; - - /** - * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID) - */ - private String sourceId; - - /** - * 关闭理由 【未关闭时可以为空】关闭话题时必填的理由，转项目后而且已经结案，这个字段不回写 - */ - private String closeReason; - - /** - * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写 - */ - private String resolveType; - - /** - * 议题名称 最多20字 - */ - private String issueTitle; - - /** - * 建议 建议 - */ - private String suggestion; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 网格ID 居民端议题对应一个网格iId - */ - private String gridId; - - /** - * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制 - */ - private String orgIdPath; - - /** - * 组织ID 【数据权限-非必填】agencyId - */ - private String orgId; - - /** - * 表决截止日期 表决截止日期 - */ - private Date votingDeadline; - - /** - * 表决发起日期（转议题日期） 表决发起日期（转议题日期） - */ - private Date decidedTime; - - /** - * 转项目日期 转项目日期（服务间调用日期一致性） - */ - private Date shiftedTime; - - /** - * 关闭日期 关闭日期 - */ - private Date closedTime; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java deleted file mode 100644 index 701a3c6c61..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_process") -public class IssueProcessEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID - */ - private String issueId; - - /** - * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed - */ - private String issueStatus; - - /** - * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID - */ - private String orgType; - - /** - * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID） - */ - private String orgId; - - /** - * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】) - */ - private String operationExplain; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java deleted file mode 100644 index c1fcf5f579..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_project_relation") -public class IssueProjectRelationEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID 议题ID - */ - private String issueId; - - /** - * 项目ID 项目ID - */ - private String projectId; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java deleted file mode 100644 index d36fdababc..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_satisfaction_detail") -public class IssueSatisfactionDetailEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID - */ - private String issueId; - - /** - * 评论 - 最多300字 - */ - private String comment; - - /** - * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect - */ - private String satisfaction; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java deleted file mode 100644 index 243b1e441a..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_satisfaction_statistical") -public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID - */ - private String issueId; - - /** - * 一般满意数 - */ - private Integer goodCount; - - /** - * 非常满意数 - */ - private Integer perfectCount; - - /** - * 不满意数 - */ - private Integer badCount; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java deleted file mode 100644 index 1f3381b687..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_vote_detail") -public class IssueVoteDetailEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID - */ - private String issueId; - - /** - * 态度 - opposition（反对）support（赞成） - */ - private String attitude; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java deleted file mode 100644 index 92feff0236..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_vote_statistical_daily") -public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID - */ - private String issueId; - - /** - * 统计日期 yyyy-MM-dd - */ - private Date statisticalDate; - - /** - * 到该日的总赞成数 - */ - private Integer supportCount; - - /** - * 到该日的总反对数 - */ - private Integer oppositionCount; - - /** - * 到该日的总票数 - */ - private Integer totalCount; - - /** - * 该日增量 - */ - private Integer todayIncrement; - - /** - * 该日赞成增量 - */ - private Integer supportIncrement; - - /** - * 该日反对增量 - */ - private Integer oppositionIncrement; - - /** - * 到该日的应表决数 - */ - private Integer votableCount; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java deleted file mode 100644 index d287eddf27..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("issue_vote_statistical") -public class IssueVoteStatisticalEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题ID - */ - private String issueId; - - /** - * 支持数 - */ - private Integer supportCount; - - /** - * 反对数 - */ - private Integer oppositionCount; - - /** - * 应表决数 - */ - private Integer votableCount; - -} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java deleted file mode 100644 index 9ede57879c..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueCustomerParameterExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "客户ID") - private String customerId; - - @Excel(name = "参数键 eg:voting_time_limit") - private String parameterKey; - - @Excel(name = "参数名 eg:表决期限") - private String parameterName; - - @Excel(name = "参数值 eg:10（天）") - private String parameterValue; - - @Excel(name = "参数说明 eg:这个客户下所有的网格议题表决期限都是10天") - private String description; - - @Excel(name = "删除标志 0：未删除，1：已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java deleted file mode 100644 index f7df76d076..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题详情表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueExcel { - - @Excel(name = "议题ID") - private String id; - - @Excel(name = "议题状态 表决中：voting 已转项目：shift_project 已关闭：closed") - private String issueStatus; - - @Excel(name = "来源类型 eg:resi_topic") - private String sourceType; - - @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为\"resi_topic\"时，这里指话题的ID)") - private String sourceId; - - @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写") - private String closeReason; - - @Excel(name = "解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写") - private String resolveType; - - @Excel(name = "议题名称 最多20字") - private String issueTitle; - - @Excel(name = "建议 最多1000字") - private String suggestion; - - @Excel(name = "客户ID") - private String customerId; - - @Excel(name = "网格ID 居民端议题对应一个网格Id") - private String gridId; - - @Excel(name = "所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制") - private String orgIdPath; - - @Excel(name = "组织ID 【数据权限-非必填】agencyId") - private String orgId; - - @Excel(name = "表决截止日期") - private Date votingDeadline; - - @Excel(name = "表决发起日期（转议题日期）") - private Date decidedTime; - - @Excel(name = "转项目日期 （服务间调用日期一致性）") - private Date shiftedTime; - - @Excel(name = "关闭日期") - private Date closedTime; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java deleted file mode 100644 index 587e28e8c2..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueProcessExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "议题ID") - private String issueId; - - @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed") - private String issueStatus; - - @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID") - private String orgType; - - @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）") - private String orgId; - - @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)") - private String operationExplain; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java deleted file mode 100644 index 620eee36c1..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueProjectRelationExcel { - - @Excel(name = "主键ID 主键ID") - private String id; - - @Excel(name = "议题ID 议题ID") - private String issueId; - - @Excel(name = "项目ID 项目ID") - private String projectId; - - @Excel(name = "删除标识 0：未删除1：已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间 议题转项目时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java deleted file mode 100644 index 804d0bbacc..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueSatisfactionDetailExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "议题ID") - private String issueId; - - @Excel(name = "评论 - 最多300字") - private String comment; - - @Excel(name = "满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect") - private String satisfaction; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java deleted file mode 100644 index be2b748413..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueSatisfactionStatisticalExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "议题ID") - private String issueId; - - @Excel(name = "一般满意数") - private Integer goodCount; - - @Excel(name = "非常满意数") - private Integer perfectCount; - - @Excel(name = "不满意数") - private Integer badCount; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java deleted file mode 100644 index 5ea0c106a3..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueVoteDetailExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "议题ID") - private String issueId; - - @Excel(name = "态度 - opposition（反对）support（赞成）") - private String attitude; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java deleted file mode 100644 index deafe9f0b9..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueVoteStatisticalDailyExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "议题ID") - private String issueId; - - @Excel(name = "统计日期 yyyy-MM-dd") - private Date statisticalDate; - - @Excel(name = "到该日的总赞成数") - private Integer supportCount; - - @Excel(name = "到该日的总反对数") - private Integer oppositionCount; - - @Excel(name = "到该日的总票数") - private Integer totalCount; - - @Excel(name = "该日增量") - private Integer todayIncrement; - - @Excel(name = "该日赞成增量") - private Integer supportIncrement; - - @Excel(name = "该日反对增量") - private Integer oppositionIncrement; - - @Excel(name = "到该日的应表决数") - private Integer votableCount; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java deleted file mode 100644 index ffa83424a8..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Data -public class IssueVoteStatisticalExcel { - - @Excel(name = "主键ID") - private String id; - - @Excel(name = "议题ID") - private String issueId; - - @Excel(name = "支持数") - private Integer supportCount; - - @Excel(name = "反对数") - private Integer oppositionCount; - - @Excel(name = "应表决数") - private Integer votableCount; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0未删除、1已删除") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java deleted file mode 100644 index 1152ccab05..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueCustomerParameterRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java deleted file mode 100644 index d550f5bf5e..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueProcessRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java deleted file mode 100644 index 75ec7d9d0d..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueProjectRelationRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java deleted file mode 100644 index cfed63cb4d..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题详情表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java deleted file mode 100644 index 706304b1ff..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueSatisfactionDetailRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java deleted file mode 100644 index 6d5d8ec0dc..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueSatisfactionStatisticalRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java deleted file mode 100644 index 89c8f04994..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueVoteDetailRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java deleted file mode 100644 index 852ff4a3e7..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueVoteStatisticalDailyRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java deleted file mode 100644 index c9c928f08f..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Component -public class IssueVoteStatisticalRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java deleted file mode 100644 index 941d8efde9..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueCustomerParameterDTO; -import com.epmet.entity.IssueCustomerParameterEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueCustomerParameterService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueCustomerParameterDTO - * @author generator - * @date 2020-05-11 - */ - IssueCustomerParameterDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueCustomerParameterDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueCustomerParameterDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java deleted file mode 100644 index fa285655aa..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueProcessDTO; -import com.epmet.entity.IssueProcessEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueProcessService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueProcessDTO - * @author generator - * @date 2020-05-11 - */ - IssueProcessDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueProcessDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueProcessDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java deleted file mode 100644 index 1381151c65..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueProjectRelationDTO; -import com.epmet.entity.IssueProjectRelationEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueProjectRelationService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueProjectRelationDTO - * @author generator - * @date 2020-05-11 - */ - IssueProjectRelationDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueProjectRelationDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueProjectRelationDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java deleted file mode 100644 index ab47a3797a..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueSatisfactionDetailDTO; -import com.epmet.entity.IssueSatisfactionDetailEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueSatisfactionDetailService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueSatisfactionDetailDTO - * @author generator - * @date 2020-05-11 - */ - IssueSatisfactionDetailDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueSatisfactionDetailDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueSatisfactionDetailDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java deleted file mode 100644 index 0d21c0cc99..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueSatisfactionStatisticalDTO; -import com.epmet.entity.IssueSatisfactionStatisticalEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueSatisfactionStatisticalService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueSatisfactionStatisticalDTO - * @author generator - * @date 2020-05-11 - */ - IssueSatisfactionStatisticalDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueSatisfactionStatisticalDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueSatisfactionStatisticalDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java deleted file mode 100644 index 36f3e0579c..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueVoteDetailDTO; -import com.epmet.entity.IssueVoteDetailEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueVoteDetailService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueVoteDetailDTO - * @author generator - * @date 2020-05-11 - */ - IssueVoteDetailDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueVoteDetailDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueVoteDetailDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java deleted file mode 100644 index c40851887d..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueVoteStatisticalDailyDTO; -import com.epmet.entity.IssueVoteStatisticalDailyEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueVoteStatisticalDailyService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueVoteStatisticalDailyDTO - * @author generator - * @date 2020-05-11 - */ - IssueVoteStatisticalDailyDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueVoteStatisticalDailyDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueVoteStatisticalDailyDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java deleted file mode 100644 index 4d54243be0..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IssueVoteStatisticalDTO; -import com.epmet.entity.IssueVoteStatisticalEntity; - -import java.util.List; -import java.util.Map; - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -public interface IssueVoteStatisticalService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-05-11 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-05-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IssueVoteStatisticalDTO - * @author generator - * @date 2020-05-11 - */ - IssueVoteStatisticalDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void save(IssueVoteStatisticalDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-05-11 - */ - void update(IssueVoteStatisticalDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-05-11 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java deleted file mode 100644 index 1a751ab574..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueCustomerParameterDao; -import com.epmet.dto.IssueCustomerParameterDTO; -import com.epmet.entity.IssueCustomerParameterEntity; -import com.epmet.service.IssueCustomerParameterService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题客户参数定制表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueCustomerParameterServiceImpl extends BaseServiceImpl implements IssueCustomerParameterService { - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueCustomerParameterDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueCustomerParameterDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueCustomerParameterDTO get(String id) { - IssueCustomerParameterEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueCustomerParameterDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueCustomerParameterDTO dto) { - IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueCustomerParameterDTO dto) { - IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java deleted file mode 100644 index fad2ebfb01..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueProcessDao; -import com.epmet.dto.IssueProcessDTO; -import com.epmet.entity.IssueProcessEntity; -import com.epmet.redis.IssueProcessRedis; -import com.epmet.service.IssueProcessService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题进展记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueProcessServiceImpl extends BaseServiceImpl implements IssueProcessService { - - @Autowired - private IssueProcessRedis issueProcessRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueProcessDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueProcessDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueProcessDTO get(String id) { - IssueProcessEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueProcessDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueProcessDTO dto) { - IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueProcessDTO dto) { - IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java deleted file mode 100644 index 2b40a83079..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueProjectRelationDao; -import com.epmet.dto.IssueProjectRelationDTO; -import com.epmet.entity.IssueProjectRelationEntity; -import com.epmet.redis.IssueProjectRelationRedis; -import com.epmet.service.IssueProjectRelationService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题项目关系表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueProjectRelationServiceImpl extends BaseServiceImpl implements IssueProjectRelationService { - - @Autowired - private IssueProjectRelationRedis issueProjectRelationRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueProjectRelationDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueProjectRelationDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueProjectRelationDTO get(String id) { - IssueProjectRelationEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueProjectRelationDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueProjectRelationDTO dto) { - IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueProjectRelationDTO dto) { - IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java deleted file mode 100644 index 5662e355c4..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueSatisfactionDetailDao; -import com.epmet.dto.IssueSatisfactionDetailDTO; -import com.epmet.entity.IssueSatisfactionDetailEntity; -import com.epmet.redis.IssueSatisfactionDetailRedis; -import com.epmet.service.IssueSatisfactionDetailService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题满意度调查记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl implements IssueSatisfactionDetailService { - - @Autowired - private IssueSatisfactionDetailRedis issueSatisfactionDetailRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueSatisfactionDetailDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionDetailDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueSatisfactionDetailDTO get(String id) { - IssueSatisfactionDetailEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueSatisfactionDetailDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueSatisfactionDetailDTO dto) { - IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueSatisfactionDetailDTO dto) { - IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java deleted file mode 100644 index f912e4d4c9..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueSatisfactionStatisticalDao; -import com.epmet.dto.IssueSatisfactionStatisticalDTO; -import com.epmet.entity.IssueSatisfactionStatisticalEntity; -import com.epmet.redis.IssueSatisfactionStatisticalRedis; -import com.epmet.service.IssueSatisfactionStatisticalService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题满意度调查统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl implements IssueSatisfactionStatisticalService { - - @Autowired - private IssueSatisfactionStatisticalRedis issueSatisfactionStatisticalRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueSatisfactionStatisticalDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionStatisticalDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueSatisfactionStatisticalDTO get(String id) { - IssueSatisfactionStatisticalEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueSatisfactionStatisticalDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueSatisfactionStatisticalDTO dto) { - IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueSatisfactionStatisticalDTO dto) { - IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java deleted file mode 100644 index e63133484c..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueVoteDetailDao; -import com.epmet.dto.IssueVoteDetailDTO; -import com.epmet.entity.IssueVoteDetailEntity; -import com.epmet.redis.IssueVoteDetailRedis; -import com.epmet.service.IssueVoteDetailService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题表决记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueVoteDetailServiceImpl extends BaseServiceImpl implements IssueVoteDetailService { - - @Autowired - private IssueVoteDetailRedis issueVoteDetailRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueVoteDetailDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueVoteDetailDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueVoteDetailDTO get(String id) { - IssueVoteDetailEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueVoteDetailDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueVoteDetailDTO dto) { - IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueVoteDetailDTO dto) { - IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java deleted file mode 100644 index e356e2fa0a..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueVoteStatisticalDailyDao; -import com.epmet.dto.IssueVoteStatisticalDailyDTO; -import com.epmet.entity.IssueVoteStatisticalDailyEntity; -import com.epmet.redis.IssueVoteStatisticalDailyRedis; -import com.epmet.service.IssueVoteStatisticalDailyService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题表决按天统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl implements IssueVoteStatisticalDailyService { - - @Autowired - private IssueVoteStatisticalDailyRedis issueVoteStatisticalDailyRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueVoteStatisticalDailyDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDailyDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueVoteStatisticalDailyDTO get(String id) { - IssueVoteStatisticalDailyEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDailyDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueVoteStatisticalDailyDTO dto) { - IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueVoteStatisticalDailyDTO dto) { - IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java deleted file mode 100644 index bff7fd4f94..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.IssueVoteStatisticalDao; -import com.epmet.dto.IssueVoteStatisticalDTO; -import com.epmet.entity.IssueVoteStatisticalEntity; -import com.epmet.redis.IssueVoteStatisticalRedis; -import com.epmet.service.IssueVoteStatisticalService; -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 java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 议题表决统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-05-11 - */ -@Service -public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl implements IssueVoteStatisticalService { - - @Autowired - private IssueVoteStatisticalRedis issueVoteStatisticalRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IssueVoteStatisticalDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IssueVoteStatisticalDTO get(String id) { - IssueVoteStatisticalEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IssueVoteStatisticalDTO dto) { - IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IssueVoteStatisticalDTO dto) { - IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml deleted file mode 100644 index d0934a775e..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml deleted file mode 100644 index 81b04ec584..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml deleted file mode 100644 index d7188c1811..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml deleted file mode 100644 index 86f0a14d13..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml deleted file mode 100644 index ccc9f115c6..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml deleted file mode 100644 index 93a382ef60..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml deleted file mode 100644 index fc9b69d379..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml deleted file mode 100644 index d34f9eb2ae..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall.iml b/epmet-module/resi-hall/resi-hall.iml new file mode 100644 index 0000000000..0d9345ff78 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall.iml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c4d0632bd6d1885810ff3a98bdd7af6da0bce7ec Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 12 May 2020 09:25:57 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IssueDetailFormDTO.java | 21 ++++ .../dto/result/IssueDetailResultDTO.java | 49 ++++++++ .../com/epmet/dto/result/IssueResultDTO.java | 48 ++++++++ .../com/epmet/controller/IssueController.java | 40 ++++++ .../IssueCustomerParameterController.java | 94 ++++++++++++++ .../controller/IssueProcessController.java | 94 ++++++++++++++ .../IssueProjectRelationController.java | 94 ++++++++++++++ .../IssueSatisfactionDetailController.java | 94 ++++++++++++++ ...ssueSatisfactionStatisticalController.java | 94 ++++++++++++++ .../controller/IssueVoteDetailController.java | 94 ++++++++++++++ .../IssueVoteStatisticalController.java | 94 ++++++++++++++ .../IssueVoteStatisticalDailyController.java | 94 ++++++++++++++ .../controller/ResiHallDemoController.java | 27 ++++ .../epmet/dao/IssueCustomerParameterDao.java | 33 +++++ .../src/main/java/com/epmet/dao/IssueDao.java | 43 +++++++ .../java/com/epmet/dao/IssueProcessDao.java | 33 +++++ .../epmet/dao/IssueProjectRelationDao.java | 33 +++++ .../epmet/dao/IssueSatisfactionDetailDao.java | 33 +++++ .../dao/IssueSatisfactionStatisticalDao.java | 33 +++++ .../com/epmet/dao/IssueVoteDetailDao.java | 33 +++++ .../dao/IssueVoteStatisticalDailyDao.java | 33 +++++ .../epmet/dao/IssueVoteStatisticalDao.java | 33 +++++ .../entity/IssueCustomerParameterEntity.java | 66 ++++++++++ .../java/com/epmet/entity/IssueEntity.java | 116 ++++++++++++++++++ .../com/epmet/entity/IssueProcessEntity.java | 66 ++++++++++ .../entity/IssueProjectRelationEntity.java | 51 ++++++++ .../entity/IssueSatisfactionDetailEntity.java | 56 +++++++++ .../IssueSatisfactionStatisticalEntity.java | 61 +++++++++ .../epmet/entity/IssueVoteDetailEntity.java | 51 ++++++++ .../IssueVoteStatisticalDailyEntity.java | 86 +++++++++++++ .../entity/IssueVoteStatisticalEntity.java | 61 +++++++++ .../excel/IssueCustomerParameterExcel.java | 71 +++++++++++ .../main/java/com/epmet/excel/IssueExcel.java | 101 +++++++++++++++ .../com/epmet/excel/IssueProcessExcel.java | 71 +++++++++++ .../excel/IssueProjectRelationExcel.java | 62 ++++++++++ .../excel/IssueSatisfactionDetailExcel.java | 65 ++++++++++ .../IssueSatisfactionStatisticalExcel.java | 68 ++++++++++ .../com/epmet/excel/IssueVoteDetailExcel.java | 62 ++++++++++ .../excel/IssueVoteStatisticalDailyExcel.java | 83 +++++++++++++ .../excel/IssueVoteStatisticalExcel.java | 68 ++++++++++ .../redis/IssueCustomerParameterRedis.java | 47 +++++++ .../com/epmet/redis/IssueProcessRedis.java | 47 +++++++ .../redis/IssueProjectRelationRedis.java | 47 +++++++ .../main/java/com/epmet/redis/IssueRedis.java | 47 +++++++ .../redis/IssueSatisfactionDetailRedis.java | 47 +++++++ .../IssueSatisfactionStatisticalRedis.java | 47 +++++++ .../com/epmet/redis/IssueVoteDetailRedis.java | 47 +++++++ .../redis/IssueVoteStatisticalDailyRedis.java | 47 +++++++ .../redis/IssueVoteStatisticalRedis.java | 47 +++++++ .../IssueCustomerParameterService.java | 95 ++++++++++++++ .../epmet/service/IssueProcessService.java | 95 ++++++++++++++ .../service/IssueProjectRelationService.java | 95 ++++++++++++++ .../IssueSatisfactionDetailService.java | 95 ++++++++++++++ .../IssueSatisfactionStatisticalService.java | 95 ++++++++++++++ .../java/com/epmet/service/IssueService.java | 22 ++++ .../epmet/service/IssueVoteDetailService.java | 95 ++++++++++++++ .../IssueVoteStatisticalDailyService.java | 95 ++++++++++++++ .../service/IssueVoteStatisticalService.java | 95 ++++++++++++++ .../main/java/com/epmet/service/impl/.gitkeep | 0 .../IssueCustomerParameterServiceImpl.java | 99 +++++++++++++++ .../service/impl/IssueProcessServiceImpl.java | 104 ++++++++++++++++ .../impl/IssueProjectRelationServiceImpl.java | 104 ++++++++++++++++ .../IssueSatisfactionDetailServiceImpl.java | 104 ++++++++++++++++ ...sueSatisfactionStatisticalServiceImpl.java | 104 ++++++++++++++++ .../epmet/service/impl/IssueServiceImpl.java | 34 +++++ .../impl/IssueVoteDetailServiceImpl.java | 104 ++++++++++++++++ .../IssueVoteStatisticalDailyServiceImpl.java | 104 ++++++++++++++++ .../impl/IssueVoteStatisticalServiceImpl.java | 104 ++++++++++++++++ .../mapper/IssueCustomerParameterDao.xml | 22 ++++ .../src/main/resources/mapper/IssueDao.xml | 46 +++++++ .../main/resources/mapper/IssueProcessDao.xml | 22 ++++ .../mapper/IssueProjectRelationDao.xml | 19 +++ .../mapper/IssueSatisfactionDetailDao.xml | 20 +++ .../IssueSatisfactionStatisticalDao.xml | 21 ++++ .../resources/mapper/IssueVoteDetailDao.xml | 19 +++ .../mapper/IssueVoteStatisticalDailyDao.xml | 26 ++++ .../mapper/IssueVoteStatisticalDao.xml | 21 ++++ 77 files changed, 4791 insertions(+) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/.gitkeep create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java new file mode 100644 index 0000000000..84b0d8f5e6 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 议题详情入参 + * @Author zxc + * @Date 2020/5/11 9:30 + */ +@Data +public class IssueDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214503489L; + + @NotBlank(message = "议题id不能为空") + private String issueId; + +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java new file mode 100644 index 0000000000..8769c93e5b --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java @@ -0,0 +1,49 @@ +package com.epmet.dto.result; + +import com.epmet.dto.TopicInfoDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 议题详情回参 + * @CreateTime 2020/5/11 9:31 + */ +@Data +public class IssueDetailResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题状态(voting 已转项目：shift_project 已关闭：closed) + */ + private String issueStatus; + + /** + * 话题信息 + */ + private TopicInfoDTO topicInfo; + + /** + * 议题建议 + */ + private String issueSuggestion; + + /** + * 所属网格(网格所属机关单位名称-网格名称) + */ + private String belongsGridName; + + /** + * 议题发起人（山东路168-尹女士） + */ + private String issueInitiator; + + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java new file mode 100644 index 0000000000..b278b9f585 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 议题详情回参 + * @CreateTime 2020/5/11 9:31 + */ +@Data +public class IssueResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题状态(voting 已转项目：shift_project 已关闭：closed) + */ + private String issueStatus; + + /** + * 议题建议 + */ + private String issueSuggestion; + + /** + * 网格Id + */ + private String gridId; + + /** + * 用户id + */ + private String userId; + + /** + * 话题Id + */ + private String topicId; + + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java new file mode 100644 index 0000000000..05cdb50892 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -0,0 +1,40 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.service.IssueService; +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; + +/** + * @Description 居民端党群议事 + * @Author yinzuomei + * @Date 2020/5/11 9:04 + */ +@RestController +@RequestMapping("issue") +public class IssueController { + + @Autowired + private IssueService issueService; + + /** + * @Description 议题详情 + * @param issueDetail + * @author zxc + * @date 2020/5/11 9:42 + */ + @PostMapping(value = "/detail") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) + public Result detail(@RequestBody IssueDetailFormDTO issueDetail){ + return new Result().ok(issueService.detail(issueDetail)); + } + +} + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java new file mode 100644 index 0000000000..7371c32666 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueCustomerParameterDTO; +import com.epmet.excel.IssueCustomerParameterExcel; +import com.epmet.service.IssueCustomerParameterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issuecustomerparameter") +public class IssueCustomerParameterController { + + @Autowired + private IssueCustomerParameterService issueCustomerParameterService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueCustomerParameterService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueCustomerParameterDTO data = issueCustomerParameterService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueCustomerParameterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueCustomerParameterService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueCustomerParameterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueCustomerParameterService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueCustomerParameterService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueCustomerParameterService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueCustomerParameterExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java new file mode 100644 index 0000000000..bf6c57f863 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueProcessDTO; +import com.epmet.excel.IssueProcessExcel; +import com.epmet.service.IssueProcessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issueprocess") +public class IssueProcessController { + + @Autowired + private IssueProcessService issueProcessService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueProcessService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueProcessDTO data = issueProcessService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueProcessDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueProcessService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueProcessDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueProcessService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueProcessService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueProcessService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java new file mode 100644 index 0000000000..7efd1b1394 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueProjectRelationDTO; +import com.epmet.excel.IssueProjectRelationExcel; +import com.epmet.service.IssueProjectRelationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issueprojectrelation") +public class IssueProjectRelationController { + + @Autowired + private IssueProjectRelationService issueProjectRelationService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueProjectRelationService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueProjectRelationDTO data = issueProjectRelationService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueProjectRelationDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueProjectRelationService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueProjectRelationDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueProjectRelationService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueProjectRelationService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueProjectRelationService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java new file mode 100644 index 0000000000..8772539ab3 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueSatisfactionDetailDTO; +import com.epmet.excel.IssueSatisfactionDetailExcel; +import com.epmet.service.IssueSatisfactionDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issuesatisfactiondetail") +public class IssueSatisfactionDetailController { + + @Autowired + private IssueSatisfactionDetailService issueSatisfactionDetailService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueSatisfactionDetailService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueSatisfactionDetailDTO data = issueSatisfactionDetailService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueSatisfactionDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueSatisfactionDetailService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueSatisfactionDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueSatisfactionDetailService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueSatisfactionDetailService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueSatisfactionDetailService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java new file mode 100644 index 0000000000..f9412e0996 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueSatisfactionStatisticalDTO; +import com.epmet.excel.IssueSatisfactionStatisticalExcel; +import com.epmet.service.IssueSatisfactionStatisticalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issuesatisfactionstatistical") +public class IssueSatisfactionStatisticalController { + + @Autowired + private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueSatisfactionStatisticalService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueSatisfactionStatisticalDTO data = issueSatisfactionStatisticalService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueSatisfactionStatisticalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueSatisfactionStatisticalService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueSatisfactionStatisticalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueSatisfactionStatisticalService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueSatisfactionStatisticalService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueSatisfactionStatisticalService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java new file mode 100644 index 0000000000..981aacf50e --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueVoteDetailDTO; +import com.epmet.excel.IssueVoteDetailExcel; +import com.epmet.service.IssueVoteDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issuevotedetail") +public class IssueVoteDetailController { + + @Autowired + private IssueVoteDetailService issueVoteDetailService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueVoteDetailService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueVoteDetailDTO data = issueVoteDetailService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueVoteDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueVoteDetailService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueVoteDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueVoteDetailService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueVoteDetailService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueVoteDetailService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java new file mode 100644 index 0000000000..ab98b72498 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueVoteStatisticalDTO; +import com.epmet.excel.IssueVoteStatisticalExcel; +import com.epmet.service.IssueVoteStatisticalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issuevotestatistical") +public class IssueVoteStatisticalController { + + @Autowired + private IssueVoteStatisticalService issueVoteStatisticalService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueVoteStatisticalService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueVoteStatisticalDTO data = issueVoteStatisticalService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueVoteStatisticalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueVoteStatisticalService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueVoteStatisticalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueVoteStatisticalService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueVoteStatisticalService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueVoteStatisticalService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java new file mode 100644 index 0000000000..7e5506354a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IssueVoteStatisticalDailyDTO; +import com.epmet.excel.IssueVoteStatisticalDailyExcel; +import com.epmet.service.IssueVoteStatisticalDailyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@RestController +@RequestMapping("issuevotestatisticaldaily") +public class IssueVoteStatisticalDailyController { + + @Autowired + private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = issueVoteStatisticalDailyService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IssueVoteStatisticalDailyDTO data = issueVoteStatisticalDailyService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody IssueVoteStatisticalDailyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + issueVoteStatisticalDailyService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody IssueVoteStatisticalDailyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + issueVoteStatisticalDailyService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + issueVoteStatisticalDailyService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = issueVoteStatisticalDailyService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalDailyExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java new file mode 100644 index 0000000000..56c01421a7 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java @@ -0,0 +1,27 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.DemoTestFormDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +/** + * @Description 测试 + * @Author yinzuomei + * @Date 2020/5/7 22:47 + */ +@RestController +@RequestMapping("demo") +public class ResiHallDemoController { + private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class); + + @PostMapping("test") + public Result test(@RequestBody DemoTestFormDTO formDTO) { + logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); + ValidatorUtils.validateEntity(formDTO); + return new Result().ok("resi-hall-server请求成功"); + } +} + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java new file mode 100644 index 0000000000..48fa1e3491 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueCustomerParameterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueCustomerParameterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java new file mode 100644 index 0000000000..8c601bd3ca --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -0,0 +1,43 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.entity.IssueEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueDao extends BaseDao { + + /** + * @Description 议题详情 + * @param formDTO + * @author zxc + * @date 2020/5/11 10:11 + */ + IssueResultDTO issueDetail(IssueDetailFormDTO formDTO); + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java new file mode 100644 index 0000000000..26603169ae --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueProcessEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueProcessDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java new file mode 100644 index 0000000000..430dc74741 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueProjectRelationEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueProjectRelationDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java new file mode 100644 index 0000000000..01727f507a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueSatisfactionDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueSatisfactionDetailDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java new file mode 100644 index 0000000000..e3eeabb823 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueSatisfactionStatisticalEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueSatisfactionStatisticalDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java new file mode 100644 index 0000000000..f8a41e3747 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueVoteDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueVoteDetailDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java new file mode 100644 index 0000000000..e09695b2b8 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueVoteStatisticalDailyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueVoteStatisticalDailyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java new file mode 100644 index 0000000000..7f833487d8 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IssueVoteStatisticalEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Mapper +public interface IssueVoteStatisticalDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java new file mode 100644 index 0000000000..72e7769da7 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java @@ -0,0 +1,66 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_customer_parameter") +public class IssueCustomerParameterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 参数键 eg:voting_time_limit + */ + private String parameterKey; + + /** + * 参数名 eg:表决期限 + */ + private String parameterName; + + /** + * 参数值 eg:10（天） + */ + private String parameterValue; + + /** + * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天 + */ + private String description; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java new file mode 100644 index 0000000000..cfa9b8c046 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java @@ -0,0 +1,116 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue") +public class IssueEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed + */ + private String issueStatus; + + /** + * 来源类型 eg:resi_topic + */ + private String sourceType; + + /** + * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID) + */ + private String sourceId; + + /** + * 关闭理由 【未关闭时可以为空】关闭话题时必填的理由，转项目后而且已经结案，这个字段不回写 + */ + private String closeReason; + + /** + * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写 + */ + private String resolveType; + + /** + * 议题名称 最多20字 + */ + private String issueTitle; + + /** + * 建议 建议 + */ + private String suggestion; + + /** + * 客户ID 客户ID + */ + private String customerId; + + /** + * 网格ID 居民端议题对应一个网格iId + */ + private String gridId; + + /** + * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制 + */ + private String orgIdPath; + + /** + * 组织ID 【数据权限-非必填】agencyId + */ + private String orgId; + + /** + * 表决截止日期 表决截止日期 + */ + private Date votingDeadline; + + /** + * 表决发起日期（转议题日期） 表决发起日期（转议题日期） + */ + private Date decidedTime; + + /** + * 转项目日期 转项目日期（服务间调用日期一致性） + */ + private Date shiftedTime; + + /** + * 关闭日期 关闭日期 + */ + private Date closedTime; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java new file mode 100644 index 0000000000..701a3c6c61 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java @@ -0,0 +1,66 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_process") +public class IssueProcessEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String issueId; + + /** + * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed + */ + private String issueStatus; + + /** + * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID + */ + private String orgType; + + /** + * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID） + */ + private String orgId; + + /** + * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】) + */ + private String operationExplain; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java new file mode 100644 index 0000000000..c1fcf5f579 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java @@ -0,0 +1,51 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_project_relation") +public class IssueProjectRelationEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID 议题ID + */ + private String issueId; + + /** + * 项目ID 项目ID + */ + private String projectId; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java new file mode 100644 index 0000000000..d36fdababc --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java @@ -0,0 +1,56 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_satisfaction_detail") +public class IssueSatisfactionDetailEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String issueId; + + /** + * 评论 - 最多300字 + */ + private String comment; + + /** + * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect + */ + private String satisfaction; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java new file mode 100644 index 0000000000..243b1e441a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java @@ -0,0 +1,61 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_satisfaction_statistical") +public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String issueId; + + /** + * 一般满意数 + */ + private Integer goodCount; + + /** + * 非常满意数 + */ + private Integer perfectCount; + + /** + * 不满意数 + */ + private Integer badCount; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java new file mode 100644 index 0000000000..1f3381b687 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java @@ -0,0 +1,51 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_vote_detail") +public class IssueVoteDetailEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String issueId; + + /** + * 态度 - opposition（反对）support（赞成） + */ + private String attitude; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java new file mode 100644 index 0000000000..92feff0236 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_vote_statistical_daily") +public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String issueId; + + /** + * 统计日期 yyyy-MM-dd + */ + private Date statisticalDate; + + /** + * 到该日的总赞成数 + */ + private Integer supportCount; + + /** + * 到该日的总反对数 + */ + private Integer oppositionCount; + + /** + * 到该日的总票数 + */ + private Integer totalCount; + + /** + * 该日增量 + */ + private Integer todayIncrement; + + /** + * 该日赞成增量 + */ + private Integer supportIncrement; + + /** + * 该日反对增量 + */ + private Integer oppositionIncrement; + + /** + * 到该日的应表决数 + */ + private Integer votableCount; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java new file mode 100644 index 0000000000..d287eddf27 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java @@ -0,0 +1,61 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_vote_statistical") +public class IssueVoteStatisticalEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String issueId; + + /** + * 支持数 + */ + private Integer supportCount; + + /** + * 反对数 + */ + private Integer oppositionCount; + + /** + * 应表决数 + */ + private Integer votableCount; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java new file mode 100644 index 0000000000..9ede57879c --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java @@ -0,0 +1,71 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueCustomerParameterExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "参数键 eg:voting_time_limit") + private String parameterKey; + + @Excel(name = "参数名 eg:表决期限") + private String parameterName; + + @Excel(name = "参数值 eg:10（天）") + private String parameterValue; + + @Excel(name = "参数说明 eg:这个客户下所有的网格议题表决期限都是10天") + private String description; + + @Excel(name = "删除标志 0：未删除，1：已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java new file mode 100644 index 0000000000..e012192a3f --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java @@ -0,0 +1,101 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题详情表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueExcel { + + @Excel(name = "议题ID") + private String id; + + @Excel(name = "议题状态 表决中：voting 已转项目：shift_project 已关闭：closed") + private String issueStatus; + + @Excel(name = "来源类型 eg:resi_topic") + private String sourceType; + + @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为 resi_topic 时，这里指话题的ID)") + private String sourceId; + + @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写") + private String closeReason; + + @Excel(name = "解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写") + private String resolveType; + + @Excel(name = "议题名称 最多20字") + private String issueTitle; + + @Excel(name = "建议 最多1000字") + private String suggestion; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "网格ID 居民端议题对应一个网格Id") + private String gridId; + + @Excel(name = "所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制") + private String orgIdPath; + + @Excel(name = "组织ID 【数据权限-非必填】agencyId") + private String orgId; + + @Excel(name = "表决截止日期") + private Date votingDeadline; + + @Excel(name = "表决发起日期（转议题日期）") + private Date decidedTime; + + @Excel(name = "转项目日期 （服务间调用日期一致性）") + private Date shiftedTime; + + @Excel(name = "关闭日期") + private Date closedTime; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java new file mode 100644 index 0000000000..587e28e8c2 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java @@ -0,0 +1,71 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueProcessExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "议题ID") + private String issueId; + + @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed") + private String issueStatus; + + @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID") + private String orgType; + + @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）") + private String orgId; + + @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)") + private String operationExplain; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java new file mode 100644 index 0000000000..620eee36c1 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java @@ -0,0 +1,62 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueProjectRelationExcel { + + @Excel(name = "主键ID 主键ID") + private String id; + + @Excel(name = "议题ID 议题ID") + private String issueId; + + @Excel(name = "项目ID 项目ID") + private String projectId; + + @Excel(name = "删除标识 0：未删除1：已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间 议题转项目时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java new file mode 100644 index 0000000000..804d0bbacc --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java @@ -0,0 +1,65 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueSatisfactionDetailExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "议题ID") + private String issueId; + + @Excel(name = "评论 - 最多300字") + private String comment; + + @Excel(name = "满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect") + private String satisfaction; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java new file mode 100644 index 0000000000..be2b748413 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java @@ -0,0 +1,68 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueSatisfactionStatisticalExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "议题ID") + private String issueId; + + @Excel(name = "一般满意数") + private Integer goodCount; + + @Excel(name = "非常满意数") + private Integer perfectCount; + + @Excel(name = "不满意数") + private Integer badCount; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java new file mode 100644 index 0000000000..5ea0c106a3 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java @@ -0,0 +1,62 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueVoteDetailExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "议题ID") + private String issueId; + + @Excel(name = "态度 - opposition（反对）support（赞成）") + private String attitude; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java new file mode 100644 index 0000000000..deafe9f0b9 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java @@ -0,0 +1,83 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueVoteStatisticalDailyExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "议题ID") + private String issueId; + + @Excel(name = "统计日期 yyyy-MM-dd") + private Date statisticalDate; + + @Excel(name = "到该日的总赞成数") + private Integer supportCount; + + @Excel(name = "到该日的总反对数") + private Integer oppositionCount; + + @Excel(name = "到该日的总票数") + private Integer totalCount; + + @Excel(name = "该日增量") + private Integer todayIncrement; + + @Excel(name = "该日赞成增量") + private Integer supportIncrement; + + @Excel(name = "该日反对增量") + private Integer oppositionIncrement; + + @Excel(name = "到该日的应表决数") + private Integer votableCount; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java new file mode 100644 index 0000000000..ffa83424a8 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java @@ -0,0 +1,68 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Data +public class IssueVoteStatisticalExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "议题ID") + private String issueId; + + @Excel(name = "支持数") + private Integer supportCount; + + @Excel(name = "反对数") + private Integer oppositionCount; + + @Excel(name = "应表决数") + private Integer votableCount; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java new file mode 100644 index 0000000000..1152ccab05 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueCustomerParameterRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java new file mode 100644 index 0000000000..d550f5bf5e --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueProcessRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java new file mode 100644 index 0000000000..75ec7d9d0d --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueProjectRelationRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java new file mode 100644 index 0000000000..cfed63cb4d --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题详情表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java new file mode 100644 index 0000000000..706304b1ff --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueSatisfactionDetailRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java new file mode 100644 index 0000000000..6d5d8ec0dc --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueSatisfactionStatisticalRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java new file mode 100644 index 0000000000..89c8f04994 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueVoteDetailRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java new file mode 100644 index 0000000000..852ff4a3e7 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueVoteStatisticalDailyRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java new file mode 100644 index 0000000000..c9c928f08f --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Component +public class IssueVoteStatisticalRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java new file mode 100644 index 0000000000..941d8efde9 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueCustomerParameterDTO; +import com.epmet.entity.IssueCustomerParameterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueCustomerParameterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueCustomerParameterDTO + * @author generator + * @date 2020-05-11 + */ + IssueCustomerParameterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueCustomerParameterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueCustomerParameterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java new file mode 100644 index 0000000000..fa285655aa --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueProcessDTO; +import com.epmet.entity.IssueProcessEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueProcessService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueProcessDTO + * @author generator + * @date 2020-05-11 + */ + IssueProcessDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueProcessDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueProcessDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java new file mode 100644 index 0000000000..1381151c65 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueProjectRelationDTO; +import com.epmet.entity.IssueProjectRelationEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueProjectRelationService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueProjectRelationDTO + * @author generator + * @date 2020-05-11 + */ + IssueProjectRelationDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueProjectRelationDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueProjectRelationDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java new file mode 100644 index 0000000000..ab47a3797a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueSatisfactionDetailDTO; +import com.epmet.entity.IssueSatisfactionDetailEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueSatisfactionDetailService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueSatisfactionDetailDTO + * @author generator + * @date 2020-05-11 + */ + IssueSatisfactionDetailDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueSatisfactionDetailDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueSatisfactionDetailDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java new file mode 100644 index 0000000000..0d21c0cc99 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueSatisfactionStatisticalDTO; +import com.epmet.entity.IssueSatisfactionStatisticalEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueSatisfactionStatisticalService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueSatisfactionStatisticalDTO + * @author generator + * @date 2020-05-11 + */ + IssueSatisfactionStatisticalDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueSatisfactionStatisticalDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueSatisfactionStatisticalDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java new file mode 100644 index 0000000000..7890e150fa --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -0,0 +1,22 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.entity.IssueEntity; + +/** + * @Author zxc + * @CreateTime 2020/5/11 9:44 + */ +public interface IssueService extends BaseService { + + /** + * @Description 议题详情 + * @param issueDetail + * @author zxc + * @date 2020/5/11 10:04 + */ + IssueResultDTO detail(IssueDetailFormDTO issueDetail); + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java new file mode 100644 index 0000000000..36f3e0579c --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueVoteDetailDTO; +import com.epmet.entity.IssueVoteDetailEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueVoteDetailService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueVoteDetailDTO + * @author generator + * @date 2020-05-11 + */ + IssueVoteDetailDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueVoteDetailDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueVoteDetailDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java new file mode 100644 index 0000000000..c40851887d --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueVoteStatisticalDailyDTO; +import com.epmet.entity.IssueVoteStatisticalDailyEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueVoteStatisticalDailyService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueVoteStatisticalDailyDTO + * @author generator + * @date 2020-05-11 + */ + IssueVoteStatisticalDailyDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueVoteStatisticalDailyDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueVoteStatisticalDailyDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java new file mode 100644 index 0000000000..4d54243be0 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IssueVoteStatisticalDTO; +import com.epmet.entity.IssueVoteStatisticalEntity; + +import java.util.List; +import java.util.Map; + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +public interface IssueVoteStatisticalService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IssueVoteStatisticalDTO + * @author generator + * @date 2020-05-11 + */ + IssueVoteStatisticalDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void save(IssueVoteStatisticalDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-11 + */ + void update(IssueVoteStatisticalDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-11 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java new file mode 100644 index 0000000000..1a751ab574 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java @@ -0,0 +1,99 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueCustomerParameterDao; +import com.epmet.dto.IssueCustomerParameterDTO; +import com.epmet.entity.IssueCustomerParameterEntity; +import com.epmet.service.IssueCustomerParameterService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueCustomerParameterServiceImpl extends BaseServiceImpl implements IssueCustomerParameterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueCustomerParameterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueCustomerParameterDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueCustomerParameterDTO get(String id) { + IssueCustomerParameterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueCustomerParameterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueCustomerParameterDTO dto) { + IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueCustomerParameterDTO dto) { + IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java new file mode 100644 index 0000000000..fad2ebfb01 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueProcessDao; +import com.epmet.dto.IssueProcessDTO; +import com.epmet.entity.IssueProcessEntity; +import com.epmet.redis.IssueProcessRedis; +import com.epmet.service.IssueProcessService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueProcessServiceImpl extends BaseServiceImpl implements IssueProcessService { + + @Autowired + private IssueProcessRedis issueProcessRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueProcessDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueProcessDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueProcessDTO get(String id) { + IssueProcessEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueProcessDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueProcessDTO dto) { + IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueProcessDTO dto) { + IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java new file mode 100644 index 0000000000..2b40a83079 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueProjectRelationDao; +import com.epmet.dto.IssueProjectRelationDTO; +import com.epmet.entity.IssueProjectRelationEntity; +import com.epmet.redis.IssueProjectRelationRedis; +import com.epmet.service.IssueProjectRelationService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueProjectRelationServiceImpl extends BaseServiceImpl implements IssueProjectRelationService { + + @Autowired + private IssueProjectRelationRedis issueProjectRelationRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueProjectRelationDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueProjectRelationDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueProjectRelationDTO get(String id) { + IssueProjectRelationEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueProjectRelationDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueProjectRelationDTO dto) { + IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueProjectRelationDTO dto) { + IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java new file mode 100644 index 0000000000..5662e355c4 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueSatisfactionDetailDao; +import com.epmet.dto.IssueSatisfactionDetailDTO; +import com.epmet.entity.IssueSatisfactionDetailEntity; +import com.epmet.redis.IssueSatisfactionDetailRedis; +import com.epmet.service.IssueSatisfactionDetailService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl implements IssueSatisfactionDetailService { + + @Autowired + private IssueSatisfactionDetailRedis issueSatisfactionDetailRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueSatisfactionDetailDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionDetailDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueSatisfactionDetailDTO get(String id) { + IssueSatisfactionDetailEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueSatisfactionDetailDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueSatisfactionDetailDTO dto) { + IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueSatisfactionDetailDTO dto) { + IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java new file mode 100644 index 0000000000..f912e4d4c9 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueSatisfactionStatisticalDao; +import com.epmet.dto.IssueSatisfactionStatisticalDTO; +import com.epmet.entity.IssueSatisfactionStatisticalEntity; +import com.epmet.redis.IssueSatisfactionStatisticalRedis; +import com.epmet.service.IssueSatisfactionStatisticalService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl implements IssueSatisfactionStatisticalService { + + @Autowired + private IssueSatisfactionStatisticalRedis issueSatisfactionStatisticalRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueSatisfactionStatisticalDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionStatisticalDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueSatisfactionStatisticalDTO get(String id) { + IssueSatisfactionStatisticalEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueSatisfactionStatisticalDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueSatisfactionStatisticalDTO dto) { + IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueSatisfactionStatisticalDTO dto) { + IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java new file mode 100644 index 0000000000..327d135bd8 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -0,0 +1,34 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.IssueDao; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.entity.IssueEntity; +import com.epmet.service.IssueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Author zxc + * @CreateTime 2020/5/11 9:46 + */ +@Service +public class IssueServiceImpl extends BaseServiceImpl implements IssueService { + + @Autowired + private IssueDao issueDao; + + /** + * @Description 议题详情 + * @param issueDetail + * @author zxc + * @date 2020/5/11 10:04 + */ + @Override + public IssueResultDTO detail(IssueDetailFormDTO issueDetail) { + //议题信息 + IssueResultDTO issueResult = issueDao.issueDetail(issueDetail); + return issueResult; + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java new file mode 100644 index 0000000000..e63133484c --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueVoteDetailDao; +import com.epmet.dto.IssueVoteDetailDTO; +import com.epmet.entity.IssueVoteDetailEntity; +import com.epmet.redis.IssueVoteDetailRedis; +import com.epmet.service.IssueVoteDetailService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueVoteDetailServiceImpl extends BaseServiceImpl implements IssueVoteDetailService { + + @Autowired + private IssueVoteDetailRedis issueVoteDetailRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueVoteDetailDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueVoteDetailDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueVoteDetailDTO get(String id) { + IssueVoteDetailEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueVoteDetailDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueVoteDetailDTO dto) { + IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueVoteDetailDTO dto) { + IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java new file mode 100644 index 0000000000..e356e2fa0a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueVoteStatisticalDailyDao; +import com.epmet.dto.IssueVoteStatisticalDailyDTO; +import com.epmet.entity.IssueVoteStatisticalDailyEntity; +import com.epmet.redis.IssueVoteStatisticalDailyRedis; +import com.epmet.service.IssueVoteStatisticalDailyService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl implements IssueVoteStatisticalDailyService { + + @Autowired + private IssueVoteStatisticalDailyRedis issueVoteStatisticalDailyRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueVoteStatisticalDailyDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDailyDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueVoteStatisticalDailyDTO get(String id) { + IssueVoteStatisticalDailyEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDailyDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueVoteStatisticalDailyDTO dto) { + IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueVoteStatisticalDailyDTO dto) { + IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java new file mode 100644 index 0000000000..bff7fd4f94 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IssueVoteStatisticalDao; +import com.epmet.dto.IssueVoteStatisticalDTO; +import com.epmet.entity.IssueVoteStatisticalEntity; +import com.epmet.redis.IssueVoteStatisticalRedis; +import com.epmet.service.IssueVoteStatisticalService; +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 java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-11 + */ +@Service +public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl implements IssueVoteStatisticalService { + + @Autowired + private IssueVoteStatisticalRedis issueVoteStatisticalRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueVoteStatisticalDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IssueVoteStatisticalDTO get(String id) { + IssueVoteStatisticalEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IssueVoteStatisticalDTO dto) { + IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IssueVoteStatisticalDTO dto) { + IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml new file mode 100644 index 0000000000..d0934a775e --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml new file mode 100644 index 0000000000..212d8066dd --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml new file mode 100644 index 0000000000..81b04ec584 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml new file mode 100644 index 0000000000..d7188c1811 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml new file mode 100644 index 0000000000..86f0a14d13 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml new file mode 100644 index 0000000000..ccc9f115c6 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml new file mode 100644 index 0000000000..93a382ef60 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml new file mode 100644 index 0000000000..fc9b69d379 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml new file mode 100644 index 0000000000..d34f9eb2ae --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5c2746e53f88e85b9341c071a32ffec33680e0d6 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 12 May 2020 09:35:09 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=A1=A5=E6=BC=8FDTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IssueCustomerParameterDTO.java | 96 ++++++++++++ .../src/main/java/com/epmet/dto/IssueDTO.java | 146 ++++++++++++++++++ .../java/com/epmet/dto/IssueProcessDTO.java | 96 ++++++++++++ .../epmet/dto/IssueProjectRelationDTO.java | 81 ++++++++++ .../epmet/dto/IssueSatisfactionDetailDTO.java | 86 +++++++++++ .../dto/IssueSatisfactionStatisticalDTO.java | 91 +++++++++++ .../com/epmet/dto/IssueVoteDetailDTO.java | 81 ++++++++++ .../epmet/dto/IssueVoteStatisticalDTO.java | 91 +++++++++++ .../dto/IssueVoteStatisticalDailyDTO.java | 116 ++++++++++++++ 9 files changed, 884 insertions(+) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java new file mode 100644 index 0000000000..1d713b3b12 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java @@ -0,0 +1,96 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题客户参数定制表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueCustomerParameterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 参数键 eg:voting_time_limit + */ + private String parameterKey; + + /** + * 参数名 eg:表决期限 + */ + private String parameterName; + + /** + * 参数值 eg:10（天） + */ + private String parameterValue; + + /** + * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天 + */ + private String description; + + /** + * 删除标志 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java new file mode 100644 index 0000000000..fe12ca4a76 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java @@ -0,0 +1,146 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题详情表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 议题ID + */ + private String id; + + /** + * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed + */ + private String issueStatus; + + /** + * 来源类型 eg:resi_topic + */ + private String sourceType; + + /** + * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID) + */ + private String sourceId; + + /** + * 关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写 + */ + private String closeReason; + + /** + * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写 + */ + private String resolveType; + + /** + * 议题名称 最多20字 + */ + private String issueTitle; + + /** + * 建议 最多1000字 + */ + private String suggestion; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格ID 居民端议题对应一个网格Id + */ + private String gridId; + + /** + * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制 + */ + private String orgIdPath; + + /** + * 组织ID 【数据权限-非必填】agencyId + */ + private String orgId; + + /** + * 表决截止日期 + */ + private Date votingDeadline; + + /** + * 表决发起日期（转议题日期） + */ + private Date decidedTime; + + /** + * 转项目日期 （服务间调用日期一致性） + */ + private Date shiftedTime; + + /** + * 关闭日期 + */ + private Date closedTime; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java new file mode 100644 index 0000000000..20f2992fda --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java @@ -0,0 +1,96 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题进展记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueProcessDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 议题ID + */ + private String issueId; + + /** + * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed + */ + private String issueStatus; + + /** + * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID + */ + private String orgType; + + /** + * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID） + */ + private String orgId; + + /** + * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】) + */ + private String operationExplain; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java new file mode 100644 index 0000000000..dc58cbb60c --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java @@ -0,0 +1,81 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题项目关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueProjectRelationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID 主键ID + */ + private String id; + + /** + * 议题ID 议题ID + */ + private String issueId; + + /** + * 项目ID 项目ID + */ + private String projectId; + + /** + * 删除标识 0：未删除1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 议题转项目时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java new file mode 100644 index 0000000000..ddf04a4ece --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题满意度调查记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueSatisfactionDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 议题ID + */ + private String issueId; + + /** + * 评论 - 最多300字 + */ + private String comment; + + /** + * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect + */ + private String satisfaction; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java new file mode 100644 index 0000000000..935feef5cd --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java @@ -0,0 +1,91 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题满意度调查统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueSatisfactionStatisticalDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 议题ID + */ + private String issueId; + + /** + * 一般满意数 + */ + private Integer goodCount; + + /** + * 非常满意数 + */ + private Integer perfectCount; + + /** + * 不满意数 + */ + private Integer badCount; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java new file mode 100644 index 0000000000..777f2dfbbc --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java @@ -0,0 +1,81 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题表决记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueVoteDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 议题ID + */ + private String issueId; + + /** + * 态度 - opposition（反对）support（赞成） + */ + private String attitude; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java new file mode 100644 index 0000000000..3c25a4dcd5 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java @@ -0,0 +1,91 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题表决统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueVoteStatisticalDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 议题ID + */ + private String issueId; + + /** + * 支持数 + */ + private Integer supportCount; + + /** + * 反对数 + */ + private Integer oppositionCount; + + /** + * 应表决数 + */ + private Integer votableCount; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java new file mode 100644 index 0000000000..1434cef2db --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java @@ -0,0 +1,116 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 议题表决按天统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-05-12 + */ +@Data +public class IssueVoteStatisticalDailyDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 议题ID + */ + private String issueId; + + /** + * 统计日期 yyyy-MM-dd + */ + private Date statisticalDate; + + /** + * 到该日的总赞成数 + */ + private Integer supportCount; + + /** + * 到该日的总反对数 + */ + private Integer oppositionCount; + + /** + * 到该日的总票数 + */ + private Integer totalCount; + + /** + * 该日增量 + */ + private Integer todayIncrement; + + /** + * 该日赞成增量 + */ + private Integer supportIncrement; + + /** + * 该日反对增量 + */ + private Integer oppositionIncrement; + + /** + * 到该日的应表决数 + */ + private Integer votableCount; + + /** + * 删除标识 0未删除、1已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file From 5313b95651ec9dfcd4d34e4d751fe23a117bdfdb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 May 2020 09:50:24 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AEDB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db.migration/epmet_gov_project.sql | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql index f6a22b3126..f87285eecd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql @@ -141,4 +141,10 @@ CREATE TABLE `project_staff` ( SET FOREIGN_KEY_CHECKS = 1; -alter table project_staff add column PROCESS_ID varchar(64) NOT NULL COMMENT '处理进展ID'; \ No newline at end of file +alter table project_staff add column PROCESS_ID varchar(64) NOT NULL COMMENT '处理进展ID'; + +alter table project_process add column OPERATION_NAME varchar(200) NOT NULL COMMENT '处理名称' after OPERATION; + +alter table project_staff add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after STAFF_ID; + +alter table project_process add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after PROJECT_ID; From be05d5aad5d7c60104eb6392c82b84884ffddc8e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 May 2020 09:59:30 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AEDB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ProjectProcessDTO.java | 97 +++++++++++-------- .../java/com/epmet/dto/ProjectStaffDTO.java | 5 + .../epmet/entity/ProjectProcessEntity.java | 10 ++ .../com/epmet/entity/ProjectStaffEntity.java | 5 + .../com/epmet/excel/ProjectProcessExcel.java | 6 ++ .../com/epmet/excel/ProjectStaffExcel.java | 3 + 6 files changed, 83 insertions(+), 43 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java index 6c42eb1dd5..4a0e30f907 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java @@ -19,6 +19,7 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + import lombok.Data; @@ -31,76 +32,86 @@ import lombok.Data; @Data public class ProjectProcessDTO implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 唯一标识 - */ + /** + * 唯一标识 + */ private String id; - /** - * 项目ID - */ + /** + * 项目ID + */ private String projectId; - /** - * 负负责人ID - */ + /** + * 部门名 + */ + private String departmentName; + + /** + * 负负责人ID + */ private String staffId; - /** - * 处理：结案close，退回return，部门流转transfer，创建项目created - */ + /** + * 处理：结案close，退回return，部门流转transfer，创建项目created + */ private String operation; - /** - * 公开答复 - */ + /** + * 处理名 + */ + private String operationName; + + /** + * 公开答复 + */ private String publicReply; - /** - * 内部备注 - */ + /** + * 内部备注 + */ private String internalRemark; - /** - * 结束时间 - */ + /** + * 结束时间 + */ private Date endTime; - /** - * 耗费天数 - */ + /** + * 耗费天数 + */ private String costWorkdays; - /** - * 删除标识：0.未删除 1.已删除 - */ + /** + * 删除标识：0.未删除 1.已删除 + */ private String delFlag; - /** - * 乐观锁 - */ + /** + * 乐观锁 + */ private Integer revision; - /** - * 创建人 - */ + /** + * 创建人 + */ private String createdBy; - /** - * 创建时间 - */ + /** + * 创建时间 + */ private Date createdTime; - /** - * 更新人 - */ + /** + * 更新人 + */ private String updatedBy; - /** - * 更新时间 - */ + /** + * 更新时间 + */ private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java index 9072cfbb3d..ea0ef88350 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java @@ -78,6 +78,11 @@ public class ProjectStaffDTO implements Serializable { */ private String staffId; + /** + * 部门名 + */ + private String departmentName; + /** * 是否处理：未处理unhandle，已处理handle */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java index 68f06bb6eb..0890e5dec8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java @@ -48,6 +48,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity { */ private String processId; + /** + * 部门名 + */ + private String departmentName; + /** * 负负责人ID */ @@ -58,6 +63,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity { */ private String operation; + /** + * 处理名 + */ + private String operationName; + /** * 公开答复 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java index a971380628..dc8e798090 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java @@ -73,6 +73,11 @@ public class ProjectStaffEntity extends BaseEpmetEntity { */ private String staffId; + /** + * 部门名 + */ + private String departmentName; + /** * 是否处理：未处理unhandle，已处理handle */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java index a60f113441..263745f2bf 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java @@ -37,12 +37,18 @@ public class ProjectProcessExcel { @Excel(name = "项目ID") private String projectId; + @Excel(name = "部门名") + private String departmentName; + @Excel(name = "负负责人ID") private String staffId; @Excel(name = "处理：结案close，退回return，部门流转transfer，创建项目created") private String operation; + @Excel(name = "处理名") + private String operationName; + @Excel(name = "公开答复") private String publicReply; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java index bfa228dd25..d9e54ca24b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java @@ -58,6 +58,9 @@ public class ProjectStaffExcel { @Excel(name = "人员ID") private String staffId; + @Excel(name = "部门名") + private String departmentName; + @Excel(name = "是否处理：未处理unhandle，已处理handle") private String isHandle; From 13931105a200be657bcc7bebbfc8c182b9cbb8d5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 May 2020 10:19:04 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B7=BB=E5=8A=A0feign=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/IssueConstant.java | 17 +++++++++++++++++ .../java/com/epmet/feign/GovOrgFeignClient.java | 14 ++++++++++++++ .../com/epmet/feign/MessageFeignClient.java | 14 ++++++++++++++ .../com/epmet/feign/ResiGroupFeignClient.java | 14 ++++++++++++++ .../fallback/GovOrgFeignClientFallBack.java | 12 ++++++++++++ .../fallback/MessageFeignClientFallback.java | 15 +++++++++++++++ .../fallback/ResiGroupFeignClientFallBack.java | 12 ++++++++++++ 7 files changed, 98 insertions(+) create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java new file mode 100644 index 0000000000..f8c36c2cac --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.constant; + +/** + * 常量 + * @author sun + * @since 1.0.0 + */ +public interface IssueConstant { +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..b8f7090437 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,14 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @Description 调用gov-org服务 + * @Author sun + * , url = "localhost:8092" + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java new file mode 100644 index 0000000000..0f61ebfa6b --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -0,0 +1,14 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.MessageFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @Description 调用epmet-message服务 + * @Author sun + * , url = "localhost:8085" + */ +@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class) +public interface MessageFeignClient { +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..f47fd95a21 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -0,0 +1,14 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @Description 调用resi-group服务 + * @Author sun + * , url = "localhost:8095" + */ +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) +public interface ResiGroupFeignClient { +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..5205700ec6 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,12 @@ +package com.epmet.feign.fallback; + +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 调用gov-org服务 + * @Author sun + */ +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java new file mode 100644 index 0000000000..ebd50f1adc --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java @@ -0,0 +1,15 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.MessageFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 调用epmet-message服务 + * @Author sun + */ +@Component +public class MessageFeignClientFallback implements MessageFeignClient { +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..dfb34c250d --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,12 @@ +package com.epmet.feign.fallback; + +import com.epmet.feign.ResiGroupFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 调用resi-group服务 + * @Author sun + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { +} From 5982491b02625d87ed7a1904eeb820c7cc070e48 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 12 May 2020 10:27:25 +0800 Subject: [PATCH 13/13] =?UTF-8?q?issue=5Fprocess=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=BB=84=E7=BB=87=E5=90=8D=E5=AD=97sql=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8Cmapper=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E9=87=8AdemoController=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IssueProcessDTO.java | 5 +++ .../main/java/com/epmet/dto/TopicInfoDTO.java | 43 +++++++++++++++++++ .../controller/GovIssueDemoController.java | 4 +- .../controller/ResiHallDemoController.java | 4 +- .../com/epmet/entity/IssueProcessEntity.java | 5 +++ .../com/epmet/excel/IssueProcessExcel.java | 11 +++-- .../db.migration/epmet_gov_issue.sql | 7 +++ .../main/resources/mapper/IssueProcessDao.xml | 1 + 8 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java index 20f2992fda..a0eeb2df09 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java @@ -63,6 +63,11 @@ public class IssueProcessDTO implements Serializable { */ private String operationExplain; + /** + * 组织名称 + * */ + private String orgName; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java new file mode 100644 index 0000000000..6dcf993139 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * 话题详情(议题详情中的) + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java index 219426566f..174ac7a057 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java @@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*; public class GovIssueDemoController { private static final Logger logger = LoggerFactory.getLogger(GovIssueDemoController.class); - @PostMapping("test") + /* @PostMapping("test") public Result test(@RequestBody DemoTestFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); return new Result().ok("gov-issue-server请求成功"); - } + }*/ } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java index 56c01421a7..6f8021d0df 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java @@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*; public class ResiHallDemoController { private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class); - @PostMapping("test") + /* @PostMapping("test") public Result test(@RequestBody DemoTestFormDTO formDTO) { logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); ValidatorUtils.validateEntity(formDTO); return new Result().ok("resi-hall-server请求成功"); - } + }*/ } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java index 701a3c6c61..3dceb5a1e3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java @@ -63,4 +63,9 @@ public class IssueProcessEntity extends BaseEpmetEntity { */ private String operationExplain; + /** + * 组织名称 + * */ + private String orgName; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java index 587e28e8c2..0873d88c68 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java @@ -37,19 +37,22 @@ public class IssueProcessExcel { @Excel(name = "议题ID") private String issueId; - @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed") + @Excel(name = "操作状态") private String issueStatus; - @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID") + @Excel(name = "组织类型 ") private String orgType; @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）") private String orgId; - @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)") + @Excel(name = "部门名称") + private String orgName; + + @Excel(name = "操作说明 ") private String operationExplain; - @Excel(name = "删除标识 0未删除、1已删除") + @Excel(name = "删除标识") private String delFlag; @Excel(name = "乐观锁") diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql index c9eb447029..85fc5c249e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql @@ -206,4 +206,11 @@ CREATE TABLE `issue_vote_statistical_daily` ( SET FOREIGN_KEY_CHECKS = 1; +-- @Date 2020-05-12 10:00 +-- @Author wangc +-- @Description 数据库epmet_gov_issue中的ISSUE_PROCESS(议题进展表)表新增一个字段，db语句： +ALTER TABLE ISSUE_PROCESS ADD ( + ORG_NAME varchar(128) NOT NULL COMMENT '议题当前处理进度所在的部门名称，因为有存储Id，无需担心部门之后有修改名称的可能' + ); + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml index 81b04ec584..baadaa6e9e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml @@ -9,6 +9,7 @@ +