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

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/StaffMessageCommonFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 政府端wxmp-未读消息查询入参
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:17
+ */
+@Data
+public class StaffMessageCommonFormDTO implements Serializable {
+    private static final long serialVersionUID = 6926536123515417293L;
+
+    /**
+     * 当前登录的工作人员，从token中获取
+     */
+    @NotBlank(message="用户id不能为空")
+    private String userId;
+
+    /**
+     * 用户当前访问的网格对应的客户id
+     */
+    @NotBlank(message="客户id不能为空")
+    private String customerId;
+}
+

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/StaffMessageFormDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 政府端wxmp-查询我的消息
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:50
+ */
+@Data
+public class StaffMessageFormDTO implements Serializable {
+    /**
+     * 当前登录的工作人员，从token中获取
+     */
+    @NotBlank(message="用户id不能为空")
+    private String userId;
+
+    /**
+     * 用户当前访问的网格对应的客户id
+     */
+    @NotBlank(message="客户id不能为空")
+    private String customerId;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private Integer pageNo;
+
+    /**
+     * 每页显示条数
+     */
+    private Integer pageSize = 20;
+}
+

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 政府端wxmp-查询我的消息返参
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:52
+ */
+@Data
+public class StaffMessageResultDTO implements Serializable {
+    /**
+     * 消息id
+     */
+    private String id;
+
+    /**
+     * 消息标题
+     */
+    private String title;
+
+    /**
+     * 消息内容
+     */
+    private String messageContent;
+
+    /**
+     * read已读、unread未读
+     */
+    private String readFlag;
+
+    /**
+     * 通知时间
+     */
+    private Long createdTime;
+}
+

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffUnReadMsgResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 政府端wxmp-未读消息查询返参
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:19
+ */
+@Data
+public class StaffUnReadMsgResultDTO implements Serializable {
+    /**
+     * 未读消息总数
+     */
+    private Integer unReadCount;
+}
+

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -27,7 +28,11 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
 import com.epmet.excel.UserMessageExcel;
 import com.epmet.service.UserMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -143,4 +148,18 @@ public class UserMessageController {
     public Result saveUserMessageList(@RequestBody List<UserMessageFormDTO> msgList) {
         return userMessageService.saveUserMessageList(msgList);
     }
+
+    @PostMapping("staff/queryunreadmsg")
+    public Result<StaffUnReadMsgResultDTO> queryUnReadMsg(@RequestBody StaffMessageCommonFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = userMessageService.queryUnReadMsg(formDTO);
+        return new Result<StaffUnReadMsgResultDTO>().ok(staffUnReadMsgResultDTO);
+    }
+
+    @PostMapping("staff/querystaffmessage")
+    public Result<List<StaffMessageResultDTO>> queryStaffMessage(@RequestBody StaffMessageFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        List<StaffMessageResultDTO> list = userMessageService.queryStaffMessage(formDTO);
+        return new Result<List<StaffMessageResultDTO>>().ok(list);
+    }
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java

@@ -19,8 +19,11 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
 import com.epmet.entity.UserMessageEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -35,9 +38,28 @@ public interface UserMessageDao extends BaseDao<UserMessageEntity> {
 
     /**
      * 获取消息分页
+     *
      * @param messageFromDTO
      * @return
      */
     List<UserMessageEntity> selectMyMessageList(MymessageFormDTO messageFromDTO);
 
+    /**
+     * @param userId
+     * @param customerId
+     * @return java.lang.Integer
+     * @Author yinzuomei
+     * @Description 根据用户id、客户id统计用户未读消息总数
+     * @Date 2020/5/17 16:47
+     **/
+    Integer queryUnReadMsg(@Param("userId") String userId, @Param("customerId") String customerId);
+
+    /**
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.StaffMessageResultDTO>
+     * @Author yinzuomei
+     * @Description 查询政府端工作人员我的消息列表
+     * @Date 2020/5/17 16:47
+     **/
+    List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java

@@ -22,7 +22,11 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
 import com.epmet.entity.UserMessageEntity;
 import java.util.List;
 import java.util.Map;
@@ -134,4 +138,8 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
 	 * @Description 批量插入未读消息
 	 **/
 	Result saveUserMessageList(List<UserMessageFormDTO> msgList);
+
+    StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO);
+
+	List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java

@@ -29,7 +29,11 @@ import com.epmet.constant.UserMessageConstans;
 import com.epmet.dao.UserMessageDao;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
 import com.epmet.entity.UserMessageEntity;
 import com.epmet.redis.UserMessageRedis;
 import com.epmet.service.UserMessageService;
@@ -174,4 +178,34 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 		insertBatch(entityList);
 		return new Result();
 	}
+
+	/**
+	 * @return com.epmet.dto.result.StaffUnReadMsgResultDTO
+	 * @param formDTO
+	 * @Author yinzuomei
+	 * @Description 根据用户id、客户id统计用户未读消息总数
+	 * @Date 2020/5/17 16:43
+	 **/
+	@Override
+	public StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO) {
+		StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = new StaffUnReadMsgResultDTO();
+		Integer unReadCount = baseDao.queryUnReadMsg(formDTO.getUserId(), formDTO.getCustomerId());
+		staffUnReadMsgResultDTO.setUnReadCount(unReadCount);
+		return staffUnReadMsgResultDTO;
+	}
+
+	/**
+	 * @return java.util.List<com.epmet.dto.result.StaffMessageResultDTO>
+	 * @param formDTO
+	 * @Author yinzuomei
+	 * @Description  查询政府端工作人员我的消息列表
+	 * @Date 2020/5/17 16:43
+	 **/
+	@Override
+	public List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO) {
+		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+		formDTO.setPageNo(pageIndex);
+		List<StaffMessageResultDTO> list = baseDao.queryStaffMessage(formDTO);
+		return list;
+	}
 }

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml

@@ -49,5 +49,34 @@
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
-
+    <!--  根据用户id、客户id统计用户未读消息总数 -->
+    <select id="queryUnReadMsg" parameterType="map" resultType="java.lang.Integer">
+        select count(1)
+        from
+            user_message
+        where
+            del_flag = '0'
+            and app='gov'
+            and CUSTOMER_ID = #{customerId}
+            and USER_ID = #{userId}
+            and read_flag='unread'
+    </select>
+    <!-- 查询政府端工作人员我的消息列表 -->
+    <select id="queryStaffMessage" parameterType="com.epmet.dto.form.StaffMessageFormDTO"
+            resultType="com.epmet.dto.result.StaffMessageResultDTO">
+        select id,
+            title,
+            message_content as messageContent,
+            read_flag as readFlag,
+            unix_timestamp(CREATED_TIME) as createdTime
+        from
+            user_message
+        where
+            del_flag = '0'
+            and app='gov'
+            and CUSTOMER_ID = #{customerId}
+            and USER_ID = #{userId}
+        ORDER BY CREATED_TIME DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
 </mapper>

epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/StaffReadMsgFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 单条消息标记为已读入参
+ * @Author yinzuomei
+ * @Date 2020/5/17 15:56
+ */
+@Data
+public class StaffReadMsgFormDTO implements Serializable {
+    @NotBlank(message = "消息id不能为空")
+    private String messageId;
+
+}
+

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -84,6 +84,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffMessageController.java

@@ -0,0 +1,98 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
+import com.epmet.dto.form.StaffReadMsgFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
+import com.epmet.service.StaffMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description 政府端小程序首页，我的消息
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:11
+ */
+@RestController
+@RequestMapping("message")
+public class StaffMessageController {
+
+    @Autowired
+    private StaffMessageService staffMessageService;
+
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.StaffUnReadMsgResultDTO>
+     * @Author yinzuomei
+     * @Description 未读消息查询
+     * @Date 2020/5/17 15:48
+     **/
+    @PostMapping("unreadmsg")
+    public Result<StaffUnReadMsgResultDTO> unReadMsg(@LoginUser TokenDto tokenDto,
+                                                     @RequestBody StaffMessageCommonFormDTO formDTO) {
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO);
+        StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = staffMessageService.queryUnReadMsg(formDTO);
+        return new Result<StaffUnReadMsgResultDTO>().ok(staffUnReadMsgResultDTO);
+    }
+
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.StaffMessageResultDTO>
+     * @Author yinzuomei
+     * @Description 查询我的消息
+     * @Date 2020/5/17 15:48
+     **/
+    @PostMapping("mymessage")
+    public Result<List<StaffMessageResultDTO>> myMessage(@LoginUser TokenDto tokenDto,
+                                                         @RequestBody StaffMessageFormDTO formDTO) {
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO);
+        List<StaffMessageResultDTO> staffMessageResultDTO = staffMessageService.queryStaffMessage(formDTO);
+        return new Result<List<StaffMessageResultDTO>>().ok(staffMessageResultDTO);
+    }
+
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 全部已读(清楚未读)
+     * @Date 2020/5/17 15:52
+     **/
+    @PostMapping("readall")
+    public Result readAll(@LoginUser TokenDto tokenDto,
+                          @RequestBody StaffMessageCommonFormDTO formDTO) {
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO);
+        staffMessageService.readAllMessage(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 单条消息标记为已读
+     * @Date 2020/5/17 15:57
+     **/
+    @PostMapping("readmsg")
+    public Result readMessage(@RequestBody StaffReadMsgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        staffMessageService.readMessage(formDTO);
+        return new Result();
+    }
+}
+

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetMessageFeignClient.java

@@ -0,0 +1,64 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
+import com.epmet.feign.fallback.EpmetMessageFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/7 14:55
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageFeignClientFallBack.class)
+public interface EpmetMessageFeignClient {
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.StaffUnReadMsgResultDTO>
+     * @Author yinzuomei
+     * @Description 查询未读消息
+     * @Date 2020/5/17 16:10
+     **/
+    @PostMapping("/message/usermessage/staff/queryunreadmsg")
+    Result<StaffUnReadMsgResultDTO> queryUnReadMsg(@RequestBody StaffMessageCommonFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.StaffMessageResultDTO>>
+     * @Author yinzuomei
+     * @Description 查询我的消息列表
+     * @Date 2020/5/17 16:10
+     **/
+    @PostMapping("/message/usermessage/staff/querystaffmessage")
+    Result<List<StaffMessageResultDTO>> queryStaffMessage(@RequestBody StaffMessageFormDTO formDTO);
+
+    /**
+     * 单条消息已读
+     *
+     * @param messageDTO 参数
+     * @return Result
+     */
+    @PostMapping("/message/usermessage/readmsg")
+    Result readMessage(@RequestBody UserMessageDTO messageDTO);
+
+    /**
+     * 消息全部已读
+     *
+     * @param messageDTO 参数
+     * @return Result
+     */
+    @PostMapping("/message/usermessage/readall")
+    Result readAllMessage(@RequestBody UserMessageDTO messageDTO);
+
+
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetMessageFeignClientFallBack.java

@@ -0,0 +1,44 @@
+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.UserMessageDTO;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
+import com.epmet.feign.EpmetMessageFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/7 14:58
+ */
+@Component
+public class EpmetMessageFeignClientFallBack implements EpmetMessageFeignClient {
+
+    @Override
+    public Result<StaffUnReadMsgResultDTO> queryUnReadMsg(StaffMessageCommonFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "queryUnReadMsg", formDTO);
+    }
+
+    @Override
+    public Result<List<StaffMessageResultDTO>> queryStaffMessage(StaffMessageFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "queryStaffMessage", formDTO);
+    }
+
+    @Override
+    public Result readMessage(UserMessageDTO messageDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "readMessage", messageDTO);
+    }
+
+    @Override
+    public Result readAllMessage(UserMessageDTO messageDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "allRead", messageDTO);
+    }
+
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffMessageService.java

@@ -0,0 +1,52 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
+import com.epmet.dto.form.StaffReadMsgFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
+
+import java.util.List;
+
+/**
+ * @Description 政府端小程序首页，我的消息
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:12
+ */
+public interface StaffMessageService {
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.StaffUnReadMsgResultDTO
+     * @Author yinzuomei
+     * @Description 查询未读消息
+     * @Date 2020/5/17 15:58
+     **/
+    StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.StaffMessageResultDTO
+     * @Author yinzuomei
+     * @Description 查询我的消息
+     * @Date 2020/5/17 15:58
+     **/
+    List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return void
+     * @Author yinzuomei
+     * @Description 清除未读
+     * @Date 2020/5/17 15:58
+     **/
+    void readAllMessage(StaffMessageCommonFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return void
+     * @Author yinzuomei
+     * @Description 单条已读
+     * @Date 2020/5/17 15:58
+     **/
+    void readMessage(StaffReadMsgFormDTO formDTO);
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffMessageServiceImpl.java

@@ -0,0 +1,73 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.StaffMessageCommonFormDTO;
+import com.epmet.dto.form.StaffMessageFormDTO;
+import com.epmet.dto.form.StaffReadMsgFormDTO;
+import com.epmet.dto.result.StaffMessageResultDTO;
+import com.epmet.dto.result.StaffUnReadMsgResultDTO;
+import com.epmet.feign.EpmetMessageFeignClient;
+import com.epmet.service.StaffMessageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 政府端小程序首页，我的消息
+ * @Author yinzuomei
+ * @Date 2020/5/17 14:12
+ */
+@Service
+public class StaffMessageServiceImpl implements StaffMessageService {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private EpmetMessageFeignClient epmetMessageFeignClient;
+
+
+    @Override
+    public StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO) {
+        StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = new StaffUnReadMsgResultDTO();
+        staffUnReadMsgResultDTO.setUnReadCount(0);
+        Result<StaffUnReadMsgResultDTO> result = epmetMessageFeignClient.queryUnReadMsg(formDTO);
+        if (result.success() && null != result.getData()) {
+            return result.getData();
+        }
+        return staffUnReadMsgResultDTO;
+    }
+
+    @Override
+    public List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO) {
+        Result<List<StaffMessageResultDTO>> result = epmetMessageFeignClient.queryStaffMessage(formDTO);
+        if (result.success() && null != result.getData() && result.getData().size() > 0) {
+            return result.getData();
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public void readAllMessage(StaffMessageCommonFormDTO formDTO) {
+        UserMessageDTO userMessageDTO = new UserMessageDTO();
+        userMessageDTO.setUserId(formDTO.getUserId());
+        userMessageDTO.setCustomerId(formDTO.getCustomerId());
+        Result result = epmetMessageFeignClient.readAllMessage(userMessageDTO);
+        if (result.success()) {
+            logger.info(String.format("客户id:%s,staffId:%s清除未读消息成功", formDTO.getCustomerId(), formDTO.getUserId()));
+        }
+    }
+
+    @Override
+    public void readMessage(StaffReadMsgFormDTO formDTO) {
+        UserMessageDTO userMessageDTO = new UserMessageDTO();
+        userMessageDTO.setId(formDTO.getMessageId());
+        Result result = epmetMessageFeignClient.readMessage(userMessageDTO);
+        if (result.success()) {
+            logger.info(String.format("消息id:%s置为已读", formDTO.getMessageId()));
+        }
+    }
+}
+

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目跟踪-部门人员选择-接口入参
+ * @Author sun
+ */
+@Data
+public class CanTickStaffListFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    /**
+     * 当前工作人员代表的组织Id
+     */
+    private String agencyId="";
+    /**
+     * 代表是哪个模块调用的接口
+     * issue:议题管理
+     * project:项目跟踪
+     */
+    private String type="";
+    /**
+     * 当前工作人员可能所属的部门
+     * 1：组织下的人则此字段值为空
+     * 2：部门下的人此字段为部门Id
+     * 3：网格下的人此字段为网格Id
+     */
+    private String deptOrGridId="";
+    /**
+     * 工作人员Id
+     */
+    private String staffId;
+
+}
+