获取用户详情接口修改、解除与网格关联关系、用户认证审核历史

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

@@ -229,4 +229,18 @@ public class ApiAppUserController {
     public Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(@LoginUser TokenDto tokenDto) {
         return appUserService.prepareCompleteUserInfo(tokenDto);
     }
+
+    /**
+     * @param tokenDto
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:16
+     **/
+    @PostMapping("removeGrid")
+    public Result removeGrid(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppRemoveGridFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.removeGrid(tokenDto, formDto);
+    }
 }

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

@@ -5,18 +5,13 @@ import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
-import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -71,12 +66,13 @@ public class ApiWorkUserController {
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
      *
-     * @param userId 用户Id
+     * @param formDto 用户Id
      * @return
      */
     @GetMapping("residentDetail")
-    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(@RequestBody EpdcResidentDetailFormDTO formDto) {
-        return workUserService.residentDetail(userId);
+        ValidatorUtils.validateEntity(formDto);
+        return workUserService.residentDetail(formDto);
     }
 
     /**
@@ -98,6 +94,7 @@ public class ApiWorkUserController {
      */
     @PostMapping("authenticateResident")
     public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateResident(formDTO);
     }
 
@@ -136,4 +133,17 @@ public class ApiWorkUserController {
     public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@LoginUser TokenDto userDetail) {
         return workUserService.indexPanel(userDetail);
     }
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:16
+     **/
+    @GetMapping("authenticateHistory")
+    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(@RequestBody EpdcAuthenticateHistoryFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return workUserService.authenticateHistory(formDTO);
+    }
 }

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

@@ -297,4 +297,24 @@ public interface UserFeignClient {
      */
     @GetMapping("app-user/epdc-app/user/unauthorizedAmount")
     Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:17
+     **/
+    @GetMapping("app-user/epdc-app/userauthenticatehistory/authenticateHistory")
+    Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
+
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description
+     * @Date 2019/11/22 14:22
+     **/
+    @PostMapping("app-user/epdc-app/usergrid/removeGrid")
+	Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
 }

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

@@ -146,4 +146,14 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUnauthorizedAmount", fromDto);
     }
+
+    @Override
+    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "authenticateHistory", formDTO);
+    }
+
+    @Override
+    public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "removeGrid", formDto);
+    }
 }

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

@@ -187,4 +187,14 @@ public interface AppUserService {
      * @date 2019/10/26 15:08
      */
     Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(TokenDto tokenDto);
+
+    /**
+     * @param tokenDto
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:17
+     **/
+    Result removeGrid(TokenDto tokenDto, EpdcAppRemoveGridFormDTO formDto);
 }

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

@@ -3,14 +3,9 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 
 import java.util.List;
@@ -48,10 +43,10 @@ public interface WorkUserService {
 
 	/**
 	 * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
-	 * @param userId 用户Id
+	 * @param formDto 用户Id
 	 * @return
 	 */
-	Result<EpdcResidentDetailResultDTO> residentDetail(String userId);
+	Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto);
 	/**
 	 * 认证用户（用户信息审核）
 	 * @param formDTO
@@ -92,4 +87,13 @@ public interface WorkUserService {
 	 * @Date 2019/11/20 10:43
 	 **/
 	Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail);
+
+	/**
+	 * @param formDTO
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 用户认证审核历史
+	 * @Date 2019/11/22 13:16
+	 **/
+	Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
 }

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

@@ -750,6 +750,21 @@ public class AppUserServiceImpl implements AppUserService {
         return new Result().error("获取用户信息失败");
     }
 
+    /**
+     * @param tokenDto
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:17
+     **/
+    @Override
+    public Result removeGrid(TokenDto tokenDto, EpdcAppRemoveGridFormDTO formDto) {
+        formDto.setCurrentLoginGrid(tokenDto.getGridId());
+        formDto.setUserId(tokenDto.getUserId());
+        return userFeignClient.removeGrid(formDto);
+    }
+
     /**
      * 组装个人完善信息对象
      *

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

@@ -10,14 +10,9 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SysUserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.ResourceFeignClient;
@@ -83,12 +78,12 @@ public class WorkUserServiceImpl implements WorkUserService {
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
      *
-     * @param userId 用户Id
+     * @param formDto 用户Id
      * @return
      */
     @Override
-    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto) {
-        return userFeignClient.residentDetail(userId);
+        return userFeignClient.residentDetail(formDto.getUserId());
     }
 
     /**
@@ -173,4 +168,16 @@ public class WorkUserServiceImpl implements WorkUserService {
         return adminFeignClient.indexPanel(userDetail.getMobile());
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:16
+     **/
+    @Override
+    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
+        return userFeignClient.authenticateHistory(formDTO);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 解除与网格的关联
+ * @Author yinzuomei
+ * @Date 2019/11/22 14:08
+ */
+@Data
+public class EpdcAppRemoveGridFormDTO implements Serializable {
+	private static final long serialVersionUID = 9115962990383560832L;
+	/**
+	 * 网格ID
+	 */
+	@NotBlank(message = "网格ID不能为空")
+	private String gridId;
+
+	/**
+	 * 当前登录网格id
+	 */
+	private Long currentLoginGrid;
+	/**
+	 * 用户id
+	 */
+	private String userId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAuthenticateHistoryFormDTO.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 查询用户认证审核历史 入参
+ * @Author yinzuomei
+ * @Date 2019/11/22 11:05
+ */
+@Data
+public class EpdcAuthenticateHistoryFormDTO implements Serializable {
+	private static final long serialVersionUID = -1684620465958379289L;
+
+	/**
+	 * 用户id
+	 */
+	@NotBlank(message = "用户ID不能为空")
+	private String userId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcResidentDetailFormDTO.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 业务端 居民用户详情接口入参DTO
+ * @Author yinzuomei
+ * @Date 2019/11/22 13:54
+ */
+@Data
+public class EpdcResidentDetailFormDTO implements Serializable {
+	private static final long serialVersionUID = -4267811821756082365L;
+	/**
+	 * 用户id
+	 */
+	@NotBlank(message = "用户ID不能为空")
+	private String userId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAuthenticateHistoryResultDTO.java

@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 查询用户认证审核历史 返参
+ * @Author yinzuomei
+ * @Date 2019/11/22 12:55
+ */
+@Data
+public class EpdcAuthenticateHistoryResultDTO implements Serializable {
+	private static final long serialVersionUID = 8010700951729545501L;
+	/**
+	 * 用户id
+	 */
+	private String userId;
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+	/**
+	 * 地址
+	 */
+	private String address;
+	/**
+	 * 姓名
+	 */
+	private String realName;
+	/**
+	 * 审核是否通过
+	 */
+	private String authenticatedFlag;
+	/**
+	 * 审核时间
+	 */
+	private String time;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java

@@ -49,4 +49,9 @@ public class EpdcResidentDetailResultDTO implements Serializable {
 	 * 扫码网格列表
 	 */
 	private List<EpdcResidentDetailGridResultDTO>  gridList;
+	/**
+	 * 认证历史统计
+	 */
+	private EpdcUserAuthenticateHistoryResultDTO authenticateHistory;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserAuthenticateHistoryResultDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 认证历史统计值
+ * @Author yinzuomei
+ * @Date 2019/11/22 10:04
+ */
+@Data
+public class EpdcUserAuthenticateHistoryResultDTO implements Serializable {
+	private static final long serialVersionUID = -8314871237113228371L;
+	/**
+	 * 认证历史-累计提交认证次数
+	 */
+	private Integer totalSubmitNum;
+
+	/**
+	 * 认证历史-通过次数
+	 */
+	private Integer totalPassSubmitNum;
+
+	/**
+	 * 认证历史-不通过次数
+	 */
+	private Integer totalFailNum;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -301,7 +301,7 @@ public class EpdcAppUserController {
 
     /***
      * 查询待认证用户数量
-     * @param params
+     * @param fromDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
      * @author qushutong
      * @date 2019/11/19 13:25

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.service.UserGridRelationService;
@@ -67,4 +68,16 @@ public class EpdcUserGridRelationController {
     public Result<List<EpdcUserGridResultDTO>> listGridForLeader(@PathVariable("userId") String userId) {
         return userGridRelationService.listUserGridForApi(userId);
     }
-}
+
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:30
+     **/
+    @PostMapping("removeGrid")
+    public Result removeGrid(@RequestBody EpdcAppRemoveGridFormDTO formDto) {
+        return userGridRelationService.removeGrid(formDto);
+    }
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -26,6 +27,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import com.elink.esua.epdc.excel.UserAuthenticateHistoryExcel;
 import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
@@ -45,7 +48,7 @@ import java.util.Map;
  * @since v1.0.0 2019-11-21
  */
 @RestController
-@RequestMapping("userauthenticatehistory")
+@RequestMapping(Constant.EPDC_APP+"userauthenticatehistory")
 public class UserAuthenticateHistoryController {
 
     @Autowired
@@ -109,4 +112,15 @@ public class UserAuthenticateHistoryController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserAuthenticateHistoryExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:17
+     **/
+    @GetMapping("authenticateHistory")
+    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(@RequestBody EpdcAuthenticateHistoryFormDTO formDTO) {
+        return userAuthenticateHistoryService.authenticateHistory(formDTO);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserAuthenticateHistoryDao.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -51,4 +52,13 @@ public interface UserAuthenticateHistoryDao extends BaseDao<UserAuthenticateHist
 	 * @Date 2019/11/21 15:55
 	 **/
 	Integer countAuthenticateHistory(@Param("userId") String userId, @Param("authenticatedFlag")String authenticatedFlag);
+
+	/**
+	 * @param userId
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 用户认证审核历史
+	 * @Date 2019/11/22 13:30
+	 **/
+	List<EpdcAuthenticateHistoryResultDTO> selectListAuthenticateHistory(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserAuthenticateHistoryService.java

@@ -19,7 +19,10 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 
 import java.util.List;
@@ -101,4 +104,13 @@ public interface UserAuthenticateHistoryService extends BaseService<UserAuthenti
      * @Date 2019/11/21 14:01
      **/
     List<UserAuthenticateHistoryEntity> listUserAuthenticateHistory(String userId);
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:17
+     **/
+    Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.entity.UserGridRelationEntity;
@@ -155,4 +156,13 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * @Date 2019/11/21 18:06
      **/
     void unbindGridHandle(String id);
+
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:31
+     **/
+    Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserAuthenticateHistoryServiceImpl.java

@@ -23,8 +23,11 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
 import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import com.elink.esua.epdc.redis.UserAuthenticateHistoryRedis;
 import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
@@ -113,4 +116,16 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
         return baseDao.selectListUserAuthenticateHistory(userId);
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:17
+     **/
+    @Override
+    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
+        return new Result<List<EpdcAuthenticateHistoryResultDTO>>().ok(baseDao.selectListAuthenticateHistory(formDTO.getUserId()));
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.UserFieldConsant;
 import com.elink.esua.epdc.dao.UserGridRelationDao;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.entity.UserGridRelationEntity;
@@ -177,12 +178,31 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
     @Override
     public void unbindGridHandle(String id) {
         UserGridRelationEntity userGridRelationEntity = this.baseDao.selectById(id);
-        this.baseDao.deleteById(id);
+//        this.baseDao.deleteById(id);
+        this.delete(userGridRelationEntity.getUserId(),userGridRelationEntity.getGridId());//修改删除标志
         String key = RedisKeys.getCpUserKey(userGridRelationEntity.getUserId());
         Map<String, Object> map = redisUtils.hGetAll(key);
         Long currentGridId = userGridRelationEntity.getGridId();
-        if (map.containsKey("gridId") && currentGridId.equals(map.get("gridId"))) {
+        if (map.containsKey("gridId") && currentGridId.equals(Long.valueOf(map.get("gridId").toString()))) {
             redisUtils.delete(RedisKeys.getCpUserKey(userGridRelationEntity.getUserId()));
         }
     }
+
+	/**
+	 * @param formDto
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 解除与网格的关联
+	 * @Date 2019/11/22 14:31
+	 **/
+	@Override
+	public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
+		this.delete(formDto.getUserId(),Long.valueOf(formDto.getGridId()));
+		String key = RedisKeys.getCpUserKey(formDto.getUserId());
+		Map<String, Object> map = redisUtils.hGetAll(key);
+		if (map.containsKey("gridId") && formDto.getCurrentLoginGrid().equals(Long.valueOf(map.get("gridId").toString()))) {
+			redisUtils.delete(RedisKeys.getCpUserKey(formDto.getUserId()));
+		}
+		return new Result();
+	}
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
@@ -540,7 +539,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (StringUtils.isBlank(userId)) {
             return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空");
         }
-        EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
+	    EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
+	    if (null != dto) {
+		    EpdcUserAuthenticateHistoryResultDTO userAuthenticateHistory = new EpdcUserAuthenticateHistoryResultDTO();
+		    userAuthenticateHistory.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, null));
+		    userAuthenticateHistory.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, NumConstant.ZERO_STR));//0 未通过1通过
+		    userAuthenticateHistory.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, NumConstant.ONE_STR));
+		    dto.setAuthenticateHistory(userAuthenticateHistory);
+	    }
         return new Result().ok(dto);
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml

@@ -40,4 +40,18 @@
                 and m.AUTHENTICATED_FLAG=#{authenticatedFlag}
             </if>
     </select>
+
+    <!-- 用户认证审核历史 -->
+    <select id="selectListAuthenticateHistory" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO">
+       select m.USER_ID as userId,
+            m.MOBILE as mobile,
+            m.ADDRESS as address,
+            m.REAL_NAME as realName,
+            m.AUTHENTICATED_FLAG as authenticatedFlag,
+            DATE_FORMAT(m.CREATED_TIME,'%Y-%c-%d %H:%i:%s') as `time`
+        from epdc_user_authenticate_history m
+        where  m.DEL_FLAG='0'
+        and m.USER_ID=#{value}
+	    order by m.CREATED_TIME desc
+    </select>
 </mapper>