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
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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 topicImgs;
+
+ /**
+ * 话题发表人（山东路168-尹女士）
+ */
+ private String publishedUser;
+
+ /**
+ * 话题发表时间 (时间戳 毫秒级)
+ */
+ private Long publishedTime;
+
+}
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/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/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/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/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 95%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
index 56c01421a7..6f8021d0df 100644
--- a/epmet-module/resi-hall/resi-hall-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/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 92%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
index 8f390edc63..8c601bd3ca 100644
--- a/epmet-module/resi-hall/resi-hall-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
@@ -19,7 +19,7 @@ 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.dto.result.IssueResultDTO;
import com.epmet.entity.IssueEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -38,6 +38,6 @@ public interface IssueDao extends BaseDao {
* @author zxc
* @date 2020/5/11 10:11
*/
- IssueDetailResultDTO issueDetail(IssueDetailFormDTO formDTO);
+ IssueResultDTO 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/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 97%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
index 701a3c6c61..3dceb5a1e3 100644
--- a/epmet-module/resi-hall/resi-hall-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/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 96%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java
index 0f674d8e26..e012192a3f 100644
--- a/epmet-module/resi-hall/resi-hall-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
@@ -40,7 +40,7 @@ public class IssueExcel {
@Excel(name = "来源类型 eg:resi_topic")
private String sourceType;
- @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)")
+ @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为 resi_topic 时，这里指话题的ID)")
private String sourceId;
@Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")
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..0873d88c68
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
@@ -0,0 +1,74 @@
+/**
+ * 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 {
+
+ /**
+ * @Description 议题详情
+ * @param issueDetail
+ * @author zxc
+ * @date 2020/5/11 10:04
+ */
+ IssueResultDTO detail(IssueDetailFormDTO issueDetail);
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
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/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
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/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
diff --git a/epmet-module/resi-hall/resi-hall-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
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
rename to epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
similarity index 100%
rename from epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
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 @@
+
+
+
+
+
+
+
+
+
+
+ SELECT
+ issue_title AS issueTitle,
+ issue_status AS issueStatus,
+ suggestion AS issueSuggestion,
+ grid_id AS belongsGridName,
+ created_by AS issueInitiator
+ FROM
+ issue
+ WHERE
+ id = #{IssueId}
+ AND del_flag = 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/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
similarity index 93%
rename from epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
index 81b04ec584..baadaa6e9e 100644
--- a/epmet-module/resi-hall/resi-hall-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 @@
getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO){
+ return new Result().ok(customerGridService.getGridNameByGridId(formDTO));
+ }
+
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index ccf6d62ed9..cc9f544cfb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -19,11 +19,8 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.*;
-import com.epmet.dto.form.ListCustomerGridFormDTO;
-import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
+import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.DeleteGridFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.entity.CustomerGridEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -155,4 +152,12 @@ public interface CustomerGridDao extends BaseDao {
* @Author sun
*/
List selectGridByIds(@Param("gridIdList") List gridIdList);
+
+ /**
+ * @Description 获取所属网格
+ * @param formDTO
+ * @author zxc
+ * @date 2020/5/11 18:50
+ */
+ BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index 0553e60758..0f62db96e5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -228,4 +228,12 @@ public interface CustomerGridService extends BaseService {
*/
Result> getGridListByGridIds(List gridIdList);
+ /**
+ * @Description 获取所属网格
+ * @param formDTO
+ * @author zxc
+ * @date 2020/5/11 18:36
+ */
+ BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 367ee133fa..da1371aca7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -536,4 +536,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl list = baseDao.selectGridByIds(gridIdList);
return result.ok(list);
}
+
+ /**
+ * @Description 获取所属网格
+ * @param formDTO
+ * @author zxc
+ * @date 2020/5/11 18:37
+ */
+ @Override
+ public BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO) {
+ return baseDao.getGridNameByGridId(formDTO);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index aebba044c4..5f40d5c0d8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -270,4 +270,19 @@
)
+
+
+ SELECT
+ CONCAT(
+ IFNULL( ca.organization_name, '' ),
+ '-',
+ IFNULL( cg.grid_name, '' )) AS belongsGridName
+ FROM
+ customer_grid cg
+ LEFT JOIN customer_agency ca ON ca.id = cg.pid
+ WHERE
+ cg.id = #{gridId}
+ AND cg.del_flag = 0
+
+
\ No newline at end of file
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 223fa90ad7..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
@@ -43,6 +43,11 @@ public class ProjectStaffDTO implements Serializable {
*/
private String projectId;
+ /**
+ * 项目处理进展ID
+ */
+ private String processId;
+
/**
* 客户ID
*/
@@ -73,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 de53a677c5..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
@@ -43,6 +43,16 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
*/
private String projectId;
+ /**
+ * 项目处理进展ID
+ */
+ private String processId;
+
+ /**
+ * 部门名
+ */
+ private String departmentName;
+
/**
* 负负责人ID
*/
@@ -53,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 1a920d4712..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
@@ -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;
@@ -55,6 +58,9 @@ public class ProjectStaffExcel {
@Excel(name = "人员ID")
private String staffId;
+ @Excel(name = "部门名")
+ private String departmentName;
+
@Excel(name = "是否处理：未处理unhandle，已处理handle")
private String isHandle;
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 {
+
+}
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..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
@@ -140,3 +140,11 @@ 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';
+
+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;
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-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/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/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..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,8 +5,11 @@ 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;
+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 +57,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 +71,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 +81,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());
}
@@ -185,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 7c602bc126..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,7 +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;
@@ -49,11 +52,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 +67,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
@@ -100,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/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..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,10 +26,14 @@ 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;
import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
@@ -122,7 +126,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 +136,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 +176,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
@@ -217,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 0733a02226..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,10 +62,14 @@ 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;
import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@@ -115,6 +121,9 @@ 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 +309,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());
- }
- UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
- formDTO.setUserIdList(userIdList);
- Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO);
- setUserInfo(userResiInfoDTOListResult, pastTopics);
-
- */
-
- //2.2 在缓存中拉取用户信息
- setCacheUserInfo(topicPageFormDTO.getGroupId(), pastTopics);
+ //2. 在缓存中拉取用户信息
+ setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics);
}
- return new Result>().ok(pastTopics);
+ return new Result>().ok(pastTopics);
}
/**
@@ -505,19 +485,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 +519,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl().ok(resultDTO);
+ return new Result().ok(resultDTO);
}
/**
@@ -703,7 +685,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 +717,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 +796,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
@@ -830,6 +903,34 @@ 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/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，可为空'
+ );
+
+
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..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
@@ -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}
+
+
+
+
+
+ SELECT
+ topic.ID AS topicId,
+ topic.GROUP_ID,
+ topic.TOPIC_CONTENT,
+ topic.STATUS,
+ topic.CREATED_TIME AS releaseTime,
+ topic.CREATED_BY AS userId,
+ 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'
@@ -286,4 +337,18 @@
+
+
+ SELECT
+ id AS topicId,
+ topic_content AS topicContent,
+ created_by AS publishedUser,
+ UNIX_TIMESTAMP( created_time ) AS publishedTime
+ FROM
+ resi_topic
+ WHERE
+ id = #{topicId}
+ AND del_flag = 0
+
+
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-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/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/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/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 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-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
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
+
+
+
+ SELECT
+ CONCAT(
+ uri.street,
+ '-',
+ uri.surname,
+ CASE
+ WHEN uw.sex = '1' THEN
+ '先生'
+ WHEN uw.sex = '2' THEN
+ '女士'
+ ELSE '某某'
+ END
+ ) AS issueInitiator
+ FROM
+ user_resi_info uri
+ LEFT JOIN user_wechat uw ON uw.user_id = uri.user_id
+ WHERE
+ uri.user_id = #{userId}
+ AND uri.del_flag = 0
+ AND uw.del_flag = 0
+