Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java

@@ -2,27 +2,47 @@ package com.elink.esua.epdc.controller;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.service.WorkIssueService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
+
-import org.springframework.web.bind.annotation.RequestMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("work/event/issue/")
+@RequestMapping("work/event/")
 public class ApiWorkIssueController {
 
     @Autowired
     private WorkIssueService workIssueService;
 
 
-    @GetMapping("statistics")
+    @GetMapping("issue/statistics")
     public Result<IssueStateStatisticsResultDTO> statistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
         return workIssueService.stateStatistics(formDto);
 
     }
 
+    @GetMapping("issue/list")
+    public Result<List<IssuePendingResponseResultDTO>> list(@RequestBody IssuePendingResponseFormDTO formDto) {
+        return workIssueService.listIssuePendingResponse(formDto);
+    }
+
+
+    @GetMapping("event/detail/{id}")
+    public Result<EventAppDetailResultDTO> detail(@PathVariable("id") String id) {
+        return workIssueService.detail(id);
+    }
+
+    @GetMapping("event/categoryList")
+    public Result<List<EventCategoryDTO>> categoryList() {
+        return workIssueService.categoryList();
+    }
+
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -2,6 +2,8 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
 import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback;
@@ -9,6 +11,8 @@ import com.elink.esua.epdc.feign.fallback.WorkIssueFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -19,5 +23,13 @@ public interface WorkIssueFeignClient {
     @GetMapping(value = "events/epdc-app/issue/stateStatistics", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
 
+    @GetMapping(value = "events/epdc-app/issue/listIssuePendingResponse", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
+
+    @GetMapping(value = "events/epdc-app/event/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EventAppDetailResultDTO> detail(@PathVariable String id);
+
+    @GetMapping(value = "events/epdc-app/issue/categoryList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EventCategoryDTO>> categoryList();
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -24,4 +25,19 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient {
     public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "stateStatistics", formDto);
     }
+
+    @Override
+    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listIssuePendingResponse", formDto);
+    }
+
+    @Override
+    public Result<EventAppDetailResultDTO> detail(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "detail", id);
+    }
+
+    @Override
+    public Result<List<EventCategoryDTO>> categoryList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "categoryList", "");
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java

@@ -19,12 +19,22 @@ package com.elink.esua.epdc.service;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 public interface WorkIssueService {
 
-    Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
+    Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
+
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
+
+    Result<EventAppDetailResultDTO> detail(String id);
 
+    Result<List<EventCategoryDTO>> categoryList();
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java

@@ -18,13 +18,19 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
 import com.elink.esua.epdc.feign.WorkIssueFeignClient;
 import com.elink.esua.epdc.service.WorkIssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 public class WorkIssueServiceImpl implements WorkIssueService {
@@ -36,4 +42,19 @@ public class WorkIssueServiceImpl implements WorkIssueService {
     public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
         return workIssueFeignClient.stateStatistics(formDto);
     }
+
+    @Override
+    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
+        return workIssueFeignClient.listIssuePendingResponse(formDto);
+    }
+
+    @Override
+    public Result<EventAppDetailResultDTO> detail(String id) {
+        return workIssueFeignClient.detail(id);
+    }
+
+    @Override
+    public Result<List<EventCategoryDTO>> categoryList() {
+        return workIssueFeignClient.categoryList();
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java

@@ -27,6 +27,11 @@ public class EpdcEventsDetailDTO implements Serializable {
      * 手机号
      */
     private String mobile;
+
+    private String userFace;
+
+    private String partyFlag;
+
     /**
      * 事件内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class IssuePendingResponseFormDTO implements Serializable {
+
+    private Long deptId;
+
+    private List deptIdList;
+
+    private Integer pageIndex;
+
+    private Integer pageSize;
+
+    private String timestamp;
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IssuePendingResponseResultDTO implements Serializable {
+
+    private String id;
+
+    private String nickName;
+
+    private String eventContent;
+
+    private String createdTime;
+
+    private String partyFlag;
+
+    private String userFace;
+}
+
+

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java

@@ -5,13 +5,11 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author LC
@@ -38,4 +36,10 @@ public class EpdcAppEventsController {
         epdcEventsService.saveEvent(formDto);
         return new Result();
     }
+
+    @GetMapping("{id}")
+    public Result<EpdcEventsDetailDTO> detail(@PathVariable("id") String id){
+        EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
+        return new Result<EpdcEventsDetailDTO>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@@ -18,11 +18,15 @@
 package com.elink.esua.epdc.modules.events.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -125,6 +129,21 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      */
     int selectCountOfDeptNotice(Long deptId, int state);
 
+    /**
+     *根据网格id和状态获取议题状态统计
+     * @param deptIdList
+     * @param state
+     * @return
+     */
     int selectCountOfEventState(List<Long> deptIdList, int state);
 
+    /**
+     * 查询待回应列表
+     * @param formDto
+     * @return
+     */
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+
+
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@@ -24,7 +24,10 @@ import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -181,4 +184,6 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
 
     int selectCountOfEventState(List<Long> deptIdList, int state);
 
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -39,6 +39,8 @@ import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.modules.async.DeptRespondTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
@@ -395,4 +397,17 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     public int selectCountOfEventState(List<Long> deptIdList, int state) {
         return baseDao.selectCountOfEventState(deptIdList,state);
     }
+
+    @Override
+    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
+        List list;
+        if (formDto.getDeptId() == null){
+            list = SecurityUser.getUser().getDeptIdList();
+        }else {
+            list = new ArrayList();
+            list.add(formDto.getDeptId());
+        }
+        formDto.setDeptIdList(list);
+        return baseDao.listIssuePendingResponse(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

@@ -3,15 +3,19 @@ package com.elink.esua.epdc.modules.issue.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
+import com.elink.esua.epdc.modules.category.service.EventCategoryService;
 import com.elink.esua.epdc.modules.issue.service.EventUserAttitudeService;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 移动端-议题表
@@ -28,6 +32,8 @@ public class EpdcAppIssueController {
     @Autowired
     private EventUserAttitudeService eventUserAttitudeService;
 
+    @Autowired
+    private EventCategoryService eventCategoryService;
 
     /**
      * 最新最热列表
@@ -126,4 +132,17 @@ public class EpdcAppIssueController {
        return issueService.stateStatistics(formDto);
     }
 
+    @GetMapping("listIssuePendingResponse")
+    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto) {
+        return issueService.listIssuePendingResponse(formDto);
+
+    }
+
+    @GetMapping("categoryList")
+    public Result<List<EventCategoryDTO>> categoryList() {
+        Map params = new HashMap<>();
+        List<EventCategoryDTO> list = eventCategoryService.list(params);
+        return new Result<List<EventCategoryDTO>>().ok(list);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -220,4 +220,6 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @return
      */
     Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
+
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -398,4 +398,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         dto.setPendingResponseNum(pendingResponseNum);
         return new Result<IssueStateStatisticsResultDTO>().ok(dto);
     }
+
+    @Override
+    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
+        return epdcEventsService.listIssuePendingResponse(formDto);
+    }
+
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.events.dao.EpdcEventsDao">
+
     <resultMap id="eventDetailMap" type="com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO">
         <result property="id" column="ID"/>
         <result property="eventContent" column="EVENT_CONTENT"/>
@@ -11,6 +12,8 @@
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="userFace" column="USER_FACE"/>
+        <result property="partyFlag" column="IS_PARTY_MEMBER"/>
         <result property="ownGrid" column="ownGrid"/>
         <collection property="imageArray" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
@@ -20,6 +23,8 @@
         SELECT
             e.ID,
             e.EVENT_CONTENT,
+            e.USER_FACE,
+            e.IS_PARTY_MEMBER,
             i.IMG_URL,
             e.NICK_NAME,
             e.MOBILE,
@@ -261,4 +266,29 @@
         AND EVENT_STATE = #{state}
     </select>
 
+    <resultMap id="pendingResponseMap" type="com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO">
+        <result property="id" column="ID"/>
+        <result property="eventContent" column="EVENT_CONTENT"/>
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="partyFlag" column="IS_PARTY_MEMBER"/>
+        <result property="userFace" column="USER_FACE"/>
+    </resultMap>
+
+    <select id="listIssuePendingResponse" resultMap="pendingResponseMap">
+        SELECT ID,EVENT_CONTENT,NICK_NAME,CREATED_TIME,IS_PARTY_MEMBER,USER_FACE
+        FROM epdc_events
+        WHERE DEL_FLAG = '0'
+        AND GRID_ID IN
+        <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        AND EVENT_STATE = 0
+        <if test="formDto.timestamp != null">
+            <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
+        </if>
+        LIMIT #{formDto.pageIndex},#{formDto.pageSize}
+    </select>
+
+
 </mapper>