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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 人大代表个人中心，是否显示@me
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 15:01
+ */
+@Data
+public class UserEventLogoResultDTO implements Serializable {
+    private static final long serialVersionUID = 3232361347890014097L;
+    /**
+     * true:人大代表；false：不是人大代表；此列用来判断是否显示@我
+     */
+    private Boolean isNpc;
+    /**
+     * 展示红点：true；隐藏：false
+     */
+    private Boolean redDot;
+    public UserEventLogoResultDTO(){
+        this.isNpc=false;
+        this.redDot=false;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/pom.xml

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

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -8,15 +8,10 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.GridMemberStatsFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.OpenStaffDetailResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.*;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PersonalPatrolListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
@@ -200,4 +195,17 @@ public class EpmetUserController {
     }
 
 
+    /**
+     * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点
+     *
+     * @param tokenDto
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/3 15:07
+     */
+    @PostMapping("mentionme")
+    public Result<UserEventLogoResultDTO> mentionMeEvent(@LoginUser TokenDto tokenDto){
+        return new Result<UserEventLogoResultDTO>().ok(epmetUserService.mentionMeEvent(tokenDto.getUserId()));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java

@@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户徽章关系表
@@ -30,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ResiUserBadgeDao extends BaseDao<ResiUserBadgeEntity> {
 
+    ResiUserBadgeEntity selectUserByBadge(@Param("userId")String userId, @Param("badgeKey")String badgeKey);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

@@ -68,4 +68,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<String> selectDepartmentNameList(ProjectDTO project);
 
     List<ProjectDistributionResultDTO> selectList(@Param("customerId") String customerId,@Param("list")List<String> issueIds);
+
+    int countRedDot(String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -86,4 +86,14 @@ public interface EpmetUserService {
      * @Author sun
      **/
     List<StaffRoleListResultDTO> getStaffRoleList(String customerId, String userId);
+    
+    /**
+     * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点
+     * 
+     * @param userId 
+     * @return  com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO
+     * @author yinzuomei 
+     * @date 2021/8/3 15:09
+     */
+    UserEventLogoResultDTO mentionMeEvent(String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -3,11 +3,9 @@ package com.epmet.dataaggre.service.epmetuser.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.BadgeConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
-import com.epmet.dataaggre.dao.epmetuser.CustomerStaffDao;
+import com.epmet.dataaggre.dao.epmetuser.*;
-import com.epmet.dataaggre.dao.epmetuser.StaffPatrolRecordDao;
-import com.epmet.dataaggre.dao.epmetuser.StaffRoleDao;
-import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao;
 import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO;
@@ -19,17 +17,18 @@ import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
+import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dataaggre.service.govproject.GovProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -57,6 +56,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private StaffRoleDao staffRoleDao;
     @Resource
     private CustomerStaffDao customerStaffDao;
+    @Autowired
+    private ResiUserBadgeDao resiUserBadgeDao;
+    @Autowired
+    private GovProjectService govProjectService;
 
     /**
      * @Description  根据UserIds查询
@@ -374,5 +377,28 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return staffRoleDao.selectStaffRoleList(customerId, userId);
     }
 
+    /**
+     * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点
+     *
+     * @param userId
+     * @return com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO
+     * @author yinzuomei
+     * @date 2021/8/3 15:09
+     */
+    @Override
+    public UserEventLogoResultDTO mentionMeEvent(String userId) {
+        UserEventLogoResultDTO resultDTO = new UserEventLogoResultDTO();
+        ResiUserBadgeEntity resiUserBadgeEntity = resiUserBadgeDao.selectUserByBadge(userId, BadgeConstant.BADGE_KEY_NPC);
+        //是否是人大代表
+        if (null != resiUserBadgeEntity) {
+            resultDTO.setIsNpc(true);
+        }
+        //展示红点：true；隐藏：false
+        if(govProjectService.countRedDot(userId)>0){
+            resultDTO.setRedDot(true);
+        };
+        return resultDTO;
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -41,4 +41,14 @@ public interface GovProjectService {
 
 
     List<ProjectDistributionResultDTO> queryProjectDistribution(ProjectDistributionFormDTO formDTO);
+
+	/**
+	 * 查询resi_event_mention
+	 *
+	 * @param userId
+	 * @return  int
+	 * @author yinzuomei
+	 * @date 2021/8/3 15:27
+	 */
+	int countRedDot(String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -233,4 +233,18 @@ public class GovProjectServiceImpl implements GovProjectService {
 			throw new RenException("计算首次响应时间失败");
 		}
 	}
+
+	/**
+	 * 查询resi_event_mention
+	 *
+	 * @param userId
+	 * @return int
+	 * @author yinzuomei
+	 * @date 2021/8/3 15:27
+	 */
+	@Override
+	public int countRedDot(String userId) {
+		return projectDao.countRedDot(userId);
+	}
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml

@@ -3,4 +3,17 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmetuser.ResiUserBadgeDao">
 
+    <select id="selectUserByBadge" parameterType="map" resultType="com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity">
+        SELECT
+            rub.*
+        FROM
+            resi_user_badge rub
+            INNER JOIN badge b ON ( rub.BADGE_ID = b.ID )
+        WHERE
+            rub.DEL_FLAG = '0'
+            AND b.DEL_FLAG = '0'
+            AND rub.USER_ID = #{userId}
+            AND b.BADGE_KEY = #{badgeKey}
+            AND rub.CERTIFICATION_AUTID_STATUS = 'approved'
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -144,4 +144,15 @@
             </foreach>
             order by p.CREATED_TIME desc
     </select>
+
+    <select id="countRedDot" parameterType="java.lang.String" resultType="int">
+        SELECT
+            count(1) as total
+        FROM
+            resi_event_mention rem
+        WHERE
+            rem.DEL_FLAG = '0'
+            AND rem.RED_DOT = '1'
+            AND rem.USER_ID = #{userId}
+    </select>
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 1:38 下午
+ * @DESC
+ */
+@Data
+public class EventProjectInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 5622220354099001615L;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 操作人【xxx社区-张三】
+     */
+    private String operationName;
+
+    /**
+     * 操作时间
+     */
+    private String operationTime;
+
+    /**
+     * 报事说明
+     */
+    private String projectDeclare;
+
+    public EventProjectInfoDTO() {
+        this.projectId = "";
+        this.operationName = "";
+        this.operationTime = "";
+        this.projectDeclare = "";
+    }
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.result.ResiEventIdDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 选择已解决，未解决？？
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 13:53
+ */
+@Data
+public class ChooseResolveFormDTO extends ResiEventIdDTO implements Serializable {
+    private static final long serialVersionUID = 7888566055415227282L;
+
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 是否解决：已解决 resolved，未解决 un_solved
+     */
+    @NotBlank(message = "resolveStatus不能为空",groups = AddUserInternalGroup.class)
+    private String resolveStatus;
+
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 1:27 下午
+ * @DESC
+ */
+@Data
+public class EventDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -297495947153154171L;
+
+    public interface EventDetailForm{}
+
+    @NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class)
+    private String eventId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 10:43 上午
+ * @DESC
+ */
+@Data
+public class EventListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5882062169112022561L;
+
+    public interface EventListForm{}
+
+    /**
+     * 报事列表类型【处理中：processed 	待处理：undisposed 	已办结：transferred】
+     */
+    @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class)
+    private String eventType;
+
+    @NotBlank(message = "",groups = EventListForm.class)
+    private String orgId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 我的报事列表查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 14:07
+ */
+@Data
+public class MyReportedFormDTO implements Serializable {
+    private static final long serialVersionUID = 8426911903236849796L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 未处理:un_read；处理中：processing；已办结：closed_case
+     */
+    @NotBlank(message = "statusCondition不能为空",groups = AddUserInternalGroup.class)
+    private String statusCondition;
+
+    private Integer pageNo;
+    private Integer pageSize;
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.result.ResiEventIdDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 撤回事件入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 11:28
+ */
+@Data
+public class ReCallEventFormDTO extends ResiEventIdDTO implements Serializable {
+    private static final long serialVersionUID = 2127663703852717437L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 11:07 上午
+ * @DESC
+ */
+@Data
+public class ReplyListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3875624725235229558L;
+
+    public interface ReplyListForm{}
+
+    @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class)
+    private String resiEventId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 我要报事-提交（尹）
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 10:46
+ */
+@Data
+public class ResiEventFormDTO implements Serializable {
+    private static final long serialVersionUID = -778643059131036832L;
+
+    public interface AddUserInternalGroup {
+    }
+
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 10:55 上午
+ * @DESC
+ */
+@Data
+public class UpdateViewTimeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7104400078458366322L;
+
+    public interface UpdateViewTimeForm{}
+
+    /**
+     * 居民端用户:resi_user；工作人员:staff
+     */
+    @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class)
+    private String viewType;
+
+    @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class)
+    private String eventId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java

@@ -0,0 +1,82 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.EventProjectInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 1:30 下午
+ * @DESC
+ */
+@Data
+public class EventDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3905105043326445613L;
+
+    /**
+     * 报事时间
+     */
+    private String eventTime;
+
+    /**
+     * 报事内容
+     */
+    private String eventContent;
+
+    /**
+     * 报事地址
+     */
+    private String eventAddress;
+
+    /**
+     * 所属网格【xx社区-xx网格】
+     */
+    private String gridName;
+
+    /**
+     * 是否办结【是：true，否：false】
+     */
+    private Boolean isClosed;
+
+    /**
+     * 是否解决【是：true，否：false】
+     */
+    private Boolean isResolve;
+
+    /**
+     * 是否可以撤回【true：是，false：否】
+     */
+    private Boolean isRollback;
+
+    /**
+     * 报事图片
+     */
+    private List<String> eventImgs;
+
+    /**
+     * 报事提到的人
+     */
+    private List<String> eventPerson;
+
+    /**
+     * 项目信息
+     */
+    private EventProjectInfoDTO projectInfo;
+
+    public EventDetailResultDTO() {
+        this.eventTime = "";
+        this.eventContent = "";
+        this.eventAddress = "";
+        this.gridName = "";
+        this.isClosed = false;
+        this.isResolve = false;
+        this.isRollback = false;
+        this.eventImgs = new ArrayList<>();
+        this.eventPerson = new ArrayList<>();
+        this.projectInfo = new EventProjectInfoDTO();
+    }
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 10:41 上午
+ * @DESC
+ */
+@Data
+public class EventListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8550265282744924930L;
+
+    /**
+     * 报事标题
+     */
+    private String eventTitle;
+
+    /**
+     * 报事时间
+     */
+    private String eventTime;
+
+    /**
+     * 报事ID
+     */
+    private String eventId;
+
+    /**
+     * 是否立项【true：是，false：否】
+     */
+    private Boolean isProject;
+
+    /**
+     * 红点显示【true：显示，false：不显示】
+     */
+    private Boolean redDot;
+
+    /**
+     * 报事图片
+     */
+    private List<String> eventImgs;
+
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java

@@ -0,0 +1,55 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报事列表
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 14:11
+ */
+@Data
+public class MyReportedResultDTO implements Serializable {
+    private static final long serialVersionUID = -7372245830000262134L;
+
+    /**
+     * 事件id
+     */
+    private String resiEventId;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 图片列表，可为空
+     */
+    private List<String> imgList;
+
+    /**
+     * true展示；false不展示
+     */
+    private Boolean redDot;
+
+    /**
+     * 处理中：processing；已办结：closed_case
+     */
+    private String status;
+
+    /**
+     * true:已转项目；false：未立项
+     */
+    private Boolean shiftProject;
+
+    /**
+     * 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date showTime;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 11:07 上午
+ * @DESC
+ */
+@Data
+public class ReplyListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4875335642497226847L;
+
+
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 事件id
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 10:48
+ */
+@Data
+public class ResiEventIdDTO implements Serializable {
+    private static final long serialVersionUID = 1553798655658549134L;
+    public interface ResiEventIdGroup {
+    }
+    /**
+     * 居民端报的事件id
+     */
+    @NotBlank(message = "事件id不能为空",groups = ResiEventIdGroup.class)
+    private String resiEventId;
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java

@@ -0,0 +1,17 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 2:45 下午
+ * @DESC
+ */
+public interface EventConstant {
+
+    /**
+     * 【处理中：processed 	待处理：undisposed 	已办结：transferred】
+     */
+    String EVENT_PROCESSED = "processed";
+    String EVENT_UN_DISPOSED = "undisposed";
+    String EVENT_TRANSFERRED = "transferred";
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java

@@ -0,0 +1,30 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.EventListFormDTO;
+import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventListResultDTO;
+import com.epmet.service.ResiEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@RestController
+@RequestMapping("event")
+public class EventController {
+    
+    @Autowired
+    private ResiEventService resiEventService;
+
+
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -17,11 +17,26 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.EventDetailResultDTO;
+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.result.EventListResultDTO;
+import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.ResiEventIdDTO;
 import com.epmet.service.ResiEventService;
 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;
+
 
 /**
  * 居民报事表
@@ -36,5 +51,108 @@ public class ResiEventController {
     @Autowired
     private ResiEventService resiEventService;
 
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    @PostMapping("eventdetail")
+    public Result<EventDetailResultDTO> eventDetail(@RequestBody EventDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO));
+    }
+    /**
+     * 我要报事-提交（尹）
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/3 10:46
+     */
+    public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        //校验参数
+        //todo
+        return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO));
+    }
+
+    /**
+     * 我要报事-撤回（尹）
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/3 10:54
+     */
+    @PostMapping("recall")
+    public Result recall(@LoginUser TokenDto tokenDto,@RequestBody ReCallEventFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ReCallEventFormDTO.AddUserInternalGroup.class);
+        resiEventService.reCall(formDTO);
+        return new Result();
+    }
 
+    /**
+     * 选择已解决，未解决
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/3 13:57
+     */
+    @PostMapping("chooseresolve")
+    public Result chooseResolve(@LoginUser TokenDto tokenDto,@RequestBody ChooseResolveFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ChooseResolveFormDTO.AddUserInternalGroup.class);
+        resiEventService.chooseResolve(formDTO);
+        return new Result();
+    }
+
+
+    /**
+     * 我的报事列表查询
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>>
+     * @author yinzuomei
+     * @date 2021/8/3 14:27
+     */
+    @PostMapping("myreported")
+    public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class);
+        return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO));
+    }
+
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    @PostMapping("eventlist")
+    public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
+        return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO));
+    }
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    @PostMapping("updateviewtime")
+    public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class);
+        resiEventService.updateViewTime(formDTO);
+        return new Result();
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java

@@ -17,11 +17,19 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ReplyListFormDTO;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.service.ResiEventReplyService;
 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;
+
 
 /**
  * 事件回复表
@@ -36,5 +44,16 @@ public class ResiEventReplyController {
     @Autowired
     private ResiEventReplyService resiEventReplyService;
 
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    @PostMapping("list")
+    public Result<List<ReplyListResultDTO>> replyList(@RequestBody ReplyListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class);
+        return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO));
+    }
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java

@@ -18,7 +18,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.ReplyListFormDTO;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.entity.ResiEventReplyEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 事件回复表
@@ -28,4 +33,12 @@ import com.epmet.entity.ResiEventReplyEntity;
  */
 public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity> {
 
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java

@@ -1,24 +1,14 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.EventDetailResultDTO;
+import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
+import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.ResiEventIdDTO;
+
+import java.util.List;
 
 /**
  * 居民报事表
@@ -27,4 +17,68 @@ import com.epmet.entity.ResiEventEntity;
  * @since v1.0.0 2021-08-03
  */
 public interface ResiEventService extends BaseService<ResiEventEntity> {
+
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    List<EventListResultDTO> eventList(EventListFormDTO formDTO);
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    void updateViewTime(UpdateViewTimeFormDTO formDTO);
+
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO);
+
+    /**
+     * 我要报事-提交（尹）
+     *
+     * @param formDTO
+     * @return  com.epmet.dto.result.ResiEventResultDTO
+     * @author yinzuomei
+     * @date 2021/8/3 10:51
+     */
+    ResiEventIdDTO report(ResiEventFormDTO formDTO);
+
+    /**
+     * 撤回事件
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/3 13:45
+     */
+    void reCall(ReCallEventFormDTO formDTO);
+
+    /**
+     * 选择已解决，未解决
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/3 13:58
+     */
+    void chooseResolve(ChooseResolveFormDTO formDTO);
+
+    /**
+     * 我的报事列表查询
+     *
+     * @param formDTO
+     * @return  java.util.List<com.epmet.dto.result.MyReportedResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/3 14:28
+     */
+    List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java

@@ -19,10 +19,14 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.dto.form.ReplyListFormDTO;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.entity.ResiEventReplyEntity;
 import com.epmet.service.ResiEventReplyService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 事件回复表
  *
@@ -32,5 +36,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao, ResiEventReplyEntity> implements ResiEventReplyService {
 
-
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    @Override
+    public List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO) {
+        return null;
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -18,11 +18,26 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.EventConstant;
 import com.epmet.dao.ResiEventDao;
+import com.epmet.dto.form.EventDetailFormDTO;
+import com.epmet.dto.form.EventListFormDTO;
+import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventDetailResultDTO;
+import com.epmet.dto.result.EventListResultDTO;
+import com.epmet.dto.form.ChooseResolveFormDTO;
+import com.epmet.dto.form.MyReportedFormDTO;
+import com.epmet.dto.form.ReCallEventFormDTO;
+import com.epmet.dto.form.ResiEventFormDTO;
+import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.ResiEventIdDTO;
 import com.epmet.entity.ResiEventEntity;
 import com.epmet.service.ResiEventService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 居民报事表
  *
@@ -32,5 +47,120 @@ import org.springframework.stereotype.Service;
 @Service
 public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEventEntity> implements ResiEventService {
 
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     *   未处理：按照创建时间正序；
+     *   处理中：按照最新操作时间由近到远排序；
+     *   已办结：按照办结时间由近到远排序；
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    @Override
+    public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
+        // 处理中
+        if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){
+
+        // 待处理
+        }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){
+
+        // 已办结
+        }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){
+
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    @Override
+    public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
 
     }
+
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    @Override
+    public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO) {
+        return null;
+    }
+    /**
+     * 我要报事-提交（尹）
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.ResiEventResultDTO
+     * @author yinzuomei
+     * @date 2021/8/3 10:51
+     */
+    @Override
+    public ResiEventIdDTO report(ResiEventFormDTO formDTO) {
+        //todo
+
+
+
+
+
+        return null;
+    }
+
+    /**
+     * 撤回事件
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/3 13:45
+     */
+    @Override
+    public void reCall(ReCallEventFormDTO formDTO) {
+        // todo
+
+
+
+    }
+
+    /**
+     * 选择已解决，未解决
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/3 13:58
+     */
+    @Override
+    public void chooseResolve(ChooseResolveFormDTO formDTO) {
+        // todo
+
+
+
+
+
+
+    }
+
+    /**
+     * 我的报事列表查询
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.MyReportedResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/3 14:28
+     */
+    @Override
+    public List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO) {
+        // todo
+
+
+
+
+        return null;
+    }
+}