From af73409f431fb97eade82d34eff8c7b05e7fac92 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 14:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java | 4
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java | 6 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 11 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 55 +++++---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java | 4
/dev/null | 36 ------
springcloud_k8s_panzhihuazhihuishequ/common/pom.xml | 7 +
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthElderlyApi.java | 107 +++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 27 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java | 6 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml | 6
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java | 44 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 2
26 files changed, 266 insertions(+), 91 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java
index 4433ce4..72a478e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java
@@ -9,12 +9,12 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComEldersAuthUserVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.TencentUtils;
@@ -26,8 +26,6 @@
import com.panzhihua.common.model.vos.IPageVO;
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
-import com.panzhihua.common.model.vos.community.EldersAuthVO;
/**
*
@@ -43,6 +41,8 @@
@Resource
private CommunityService eldersAuthService;
+ @Resource
+ private UserService userService;
/**
* 分页查找
@@ -182,4 +182,40 @@
return eldersAuthService.editEldersByApp(authUserAddAppDTO);
}
+ /**
+ * 分页查找
+ * @param pageComEldersRecordsDTO 查找高龄认证记录
+ * @return 查找结果
+ */
+ @PostMapping("/records")
+ @ApiOperation(value = "生存认证记录", response = EldersAuthVO.class)
+ R query(@Validated @RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO){
+ ClazzUtils.setIfStringIsEmpty(pageComEldersRecordsDTO);
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ pageComEldersRecordsDTO.setOperUserId(loginUserInfoVO.getUserId());
+ pageComEldersRecordsDTO.setOperUserName(loginUserInfoVO.getNickName());
+ return eldersAuthService.queryEldersRecord(pageComEldersRecordsDTO);
+ }
+
+ /**
+ * 查询高龄老人库详细信息
+ * @param id 高龄老人库 id
+ * @return 查找结果
+ */
+ @GetMapping("/records/{id}")
+ @ApiOperation(value = "认证详情详细信息")
+ R<ComEldersAuthElderlyDetailsVO> detail(@PathVariable("id") Long id){
+ return eldersAuthService.comEldersAuthElderlyDetails(id);
+ }
+
+ @GetMapping("/no/tips")
+ @ApiOperation(value = "高龄认证不再显示提示")
+ public R noTips(){
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ if(loginUserInfoVO == null){
+ return R.fail("请先登录");
+ }
+ return userService.noTips(loginUserInfoVO.getUserId());
+ }
+
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/SurviveAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/SurviveAuthApi.java
deleted file mode 100644
index a436bb6..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/SurviveAuthApi.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.panzhihua.applets.api;
-
-import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
-import com.panzhihua.common.model.vos.community.EldersAuthVO;
-import com.panzhihua.common.service.community.CommunityService;
-import com.panzhihua.common.utlis.ClazzUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- *
- * @author cedoo email:cedoo(a)qq.com
- * @version 1.0
- * @since 1.0
- * */
-@Slf4j
-@RestController
-@RequestMapping("/surviveauth")
-@Api(tags = {"生存认证记录"})
-public class SurviveAuthApi extends BaseController {
-
- @Resource
- private CommunityService communityService;
-
- /**
- * 分页查找
- * @param pageComEldersRecordsDTO 查找高龄认证记录
- * @return 查找结果
- */
- @PostMapping("/records")
- @ApiOperation(value = "生存认证记录", response = EldersAuthVO.class)
- R query(@Validated @RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO){
- ClazzUtils.setIfStringIsEmpty(pageComEldersRecordsDTO);
- LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
- pageComEldersRecordsDTO.setOperUserId(loginUserInfoVO.getUserId());
- pageComEldersRecordsDTO.setOperUserName(loginUserInfoVO.getNickName());
- return communityService.queryEldersRecord(pageComEldersRecordsDTO);
- }
-
- /**
- * 查询高龄老人库详细信息
- * @param id 高龄老人库 id
- * @return 查找结果
- */
- @GetMapping("/records/{id}")
- @ApiOperation(value = "认证详情详细信息")
- R<ComEldersAuthElderlyDetailsVO> details(@PathVariable("id") Long id){
- return communityService.comEldersAuthElderlyDetails(id);
- }
-}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml b/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
index 0487c69..25bb308 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
@@ -14,6 +14,12 @@
<packaging>jar</packaging>
<dependencies>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-core</artifactId>
+ <version>4.0.7</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
@@ -130,6 +136,7 @@
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
+
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java</artifactId>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index 86db85b..c850570 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -90,7 +90,7 @@
/**
* 令牌有效期（分钟）
*/
- public final static long _EXPIRE = 720;
+ public final static long TOKEN_EXPIRE = 720;
/**
* 参数管理 cache key
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
index cee15f6..9e6c9ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
@@ -39,7 +40,7 @@
}
- private static final int BATCH_COUNT = 500;
+ private static final int BATCH_COUNT = 3000;
private List<EldersAuthElderlyExcelVO> list = new ArrayList<>();
@Override
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java
index 825cd93..c02004c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java
@@ -42,9 +42,9 @@
@ApiModelProperty(value = "人员类别",example = "1:80-89周岁;2:90-99周岁;3:100周岁（含）以上")
private Integer level;
- @ApiModelProperty(value = "是否健在",example = "1是，0否")
+ @ApiModelProperty(value = "是否健在",example = "1是，2否")
private Integer isExist;
- @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，0否")
+ @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，2否")
private Integer isBigAge;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index abb4d9b..1c1cfeb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -174,4 +174,7 @@
@ApiModelProperty("下班时间")
private Integer workEndTime;
+ @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
+ private Integer bigAgeTips;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java
index 91df356..cbfb397 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java
@@ -5,8 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+
/**
*
@@ -66,6 +66,9 @@
@ApiModelProperty(value = "管辖社区")
private String communityName;
+ @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
+ private Integer type;
+
@ApiModelProperty(value = "反馈信息")
private List<EldersAuthFeedbackVO> feedback;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java
index a40465e..c532d39 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java
@@ -68,4 +68,10 @@
@ApiModelProperty(value = "家庭成员ID")
private Long familyUserId;
+ @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
+ private Integer type;
+
+ @ApiModelProperty(value = "人脸核验结果数据")
+ private Integer verificationResult;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index c4157b8..9e5f7eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -757,4 +757,7 @@
*/
@PostMapping("gridMemberEditStatus")
R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ @GetMapping("big/no/tip")
+ R noTips(@RequestParam("userId") Long userId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java
index cf650d9..8d1525b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java
@@ -1,9 +1,9 @@
package com.panzhihua.common.utlis;
import com.tencentcloudapi.common.Credential;
-import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.common.profile.ClientProfile;
import com.tencentcloudapi.common.profile.HttpProfile;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.faceid.v20180301.FaceidClient;
import com.tencentcloudapi.faceid.v20180301.models.*;
import lombok.extern.slf4j.Slf4j;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
index ac06523..d99b5b6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -303,6 +303,7 @@
return communityService.listBuildType();
}
+
@ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
@PostMapping("pageotherbuild")
public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
@@ -446,6 +447,7 @@
return communityService.deleteVolunteerExamine(comMngVolunteerMngVO);
}
+
@ApiOperation(value = "导入居民")
@PostMapping("importuser")
public R importUser(MultipartFile multipartFile)throws IOException {
@@ -462,6 +464,9 @@
EasyExcel.read(multipartFile.getInputStream(), EexcelUserDTO.class, new UploadEexcelUserDTOListener(userService,name)) .extraRead(CellExtraTypeEnum.MERGE).headRowNumber(1).sheet().doRead();
return R.ok();
}
+
+
+
@ApiOperation(value = "社区人员详情",response = CommunityUserInfoVO.class)
@GetMapping("detailuser")
@@ -575,6 +580,7 @@
}
}
+
@ApiOperation(value = "选择导入的小区",response =ComMngStructAreaVO.class )
@GetMapping("listareas")
public R listAreas(String param) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthElderlyApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthElderlyApi.java
new file mode 100644
index 0000000..3a6d010
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthElderlyApi.java
@@ -0,0 +1,107 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.alibaba.excel.EasyExcel;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComEldersAuthElderlyExcelListen;
+import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
+import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * */
+@Slf4j
+@RestController
+@RequestMapping("/eldersauthelderly")
+@Api(tags = {"高龄老人"})
+public class EldersAuthElderlyApi extends BaseController {
+
+
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 高领老人列表
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/page")
+ @ApiOperation(value = "高领老人列表", response = ComEldersAuthElderlyVO.class)
+ R query(@Validated @RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO){
+// ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
+// pageEldersAuthElderlyDTO.setUserId(getUserId());
+ return communityService.pageQueryEldersAuthElderly(pageEldersAuthElderlyDTO);
+ }
+
+ /**
+ * 高领老人导入
+ * @param file
+ * @return
+ */
+ @PostMapping("/import")
+ @ApiOperation(value = "高领老人导入", response = R.class)
+ R batchSave(@RequestParam MultipartFile file){
+ InputStream inputStream;
+ try {
+ inputStream = file.getInputStream();
+ EasyExcel.read(inputStream, EldersAuthElderlyExcelVO.class, new ComEldersAuthElderlyExcelListen(communityService, getCommunityId(),getUserId())).sheet().doRead();
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("导入模板失败【{}】", e.getMessage());
+ }
+ return R.ok();
+
+ }
+
+ /**
+ * 查看高龄老人详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/{id}")
+ @ApiOperation(value = "高领老人详情", response = ComEldersAuthElderlyVO.class)
+ R details(@PathVariable("id") Long id){
+ return communityService.getEldersAuthElderlyById(id);
+ }
+
+ /**
+ * 修改高龄老人
+ * @param eldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/update")
+ @ApiOperation(value = "更新高龄老人信息", response = R.class)
+ R update(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO){
+ return communityService.updateEldersAuthElderly(eldersAuthElderlyDTO);
+ }
+
+ /**
+ * 删除高龄老人
+ * @param id
+ * @return
+ */
+ @PostMapping("/delete")
+ @ApiOperation(value = "更新高龄老人信息", response = R.class)
+ R delete(@RequestParam("id") Long id){
+ return communityService.deleteEldersAuthElderly(id);
+ }
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index af8099f..81a7f69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -82,6 +83,8 @@
private EldersAuthService eldersAuthService;
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ public ComEldersAuthUserService comEldersAuthUserService;
/**
* 新增社区活动
@@ -1576,29 +1579,23 @@
@PostMapping("/eldersauth/addByFamilyUser")
R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
- List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
- ComMngFamilyInfoVO theFamily = null;
- Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
- for (ComMngFamilyInfoVO family : list) {
- if (familyUserId == family.getId()) {
- theFamily = family;
- }
+ ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ if(authUserDO == null){
+ return R.fail("未查询到老人信息");
}
- if(theFamily==null){
- return R.fail("家庭成员信息错误");
- }
- Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
+ Integer age = IdcardUtil.getAgeByIdCard(authUserDO.getIdCard());
if(age>=80){
Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
EldersAuthDO eldersAuthDO = new EldersAuthDO();
- eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
+ eldersAuthDO.setSumitUserId(loginUserId);
eldersAuthDO.setCreateBy(loginUserId);
eldersAuthDO.setCreateAt(new Date());
- eldersAuthDO.setIdCard(theFamily.getIdCard());
- eldersAuthDO.setAuthUserName(theFamily.getName());
+ eldersAuthDO.setIdCard(authUserDO.getIdCard());
+ eldersAuthDO.setAuthUserName(authUserDO.getName());
eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
- eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
//根据身份证查询出籍贯 出生日期
//String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
index 202ffc3..c75eef8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
+import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java
index b14ec86..c7e367b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* DAO
@@ -22,6 +23,7 @@
* 分页查询高龄老人用户绑定列表
* @return 高龄老人用户绑定列表
*/
- IPage<ComElderAuthUserAppVO> findByPage(Page page);
+ IPage<ComElderAuthUserAppVO> findByPage(Page page,@Param("userId") Long userId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
index 76f83ab..1db5bea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -35,7 +35,7 @@
private String happenAddr;
/**
- * 状态 1待处理 2已处理
+ * 状态 1待审核 2进行中 3已驳回 4已完成
*/
private Integer status;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java
index 9e497f4..42e1ea4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java
@@ -125,7 +125,7 @@
* @param eldersAuthTypeQueryDTO
* @return
*/
- R<SysConfVO> communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+ R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
/**
* 分页查询生存认证记录
@@ -141,4 +141,5 @@
* @return
*/
R setCommunityAuthType(Long communityId, Integer type);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
index 8d01fdc..44c57d9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
@@ -60,8 +60,8 @@
comEldersAuthElderlyDO.setCommunityId(communityId);
comEldersAuthElderlyDO.setCreateBy(createBy);
comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
- comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:0);
- comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:0);
+ comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
+ comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
listDO.add(comEldersAuthElderlyDO);
});
this.saveBatch(listDO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
index e5fe736..17bf70b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -175,6 +176,9 @@
@Override
public R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(Long id) {
EldersAuthDO eldersAuthDO = eldersAuthDAO.selectById(id);
+ if(eldersAuthDO == null){
+ return R.fail("未查询到认证记录");
+ }
ComEldersAuthElderlyDetailsVO comEldersAuthElderlyDetailsVO = new ComEldersAuthElderlyDetailsVO();
BeanUtils.copyProperties(eldersAuthDO, comEldersAuthElderlyDetailsVO);
@@ -193,16 +197,16 @@
}
@Override
- public R<SysConfVO> communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
+ public R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
Long communityId = eldersAuthTypeQueryDTO.getCommunityId();
List<SysConfDO> confDOList =
sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, communityId)
- .orderByDesc(SysConfDO::getCreateAt));
+ .orderByDesc(SysConfDO::getCreateAt));
if(confDOList==null || confDOList.size()==0){
SysConfDO sysConfDO = new SysConfDO();
sysConfDO.setCode("ELDER_AUTH_TYPE");
sysConfDO.setName("高龄认证类型");
- sysConfDO.setValue(1+"");//核验类型（1.视频认证 2.人脸核验）
+ sysConfDO.setValue(2+"");//核验类型（1.视频认证 2.人脸核验）
sysConfDO.setDescription("高龄认证默认添加的核验类型");
sysConfDO.setCommunityId(communityId);
sysConfDO.setCreateBy(eldersAuthTypeQueryDTO.getUserId());
@@ -218,7 +222,7 @@
SysConfDO latest = confDOList.get(0);
SysConfVO sysConfVO = new SysConfVO();
BeanUtils.copyProperties(latest, sysConfVO);
- return R.ok(sysConfVO);
+ return R.ok(sysConfVO.getValue());
}
return R.ok();
}
@@ -239,9 +243,14 @@
eldersAuthDO.setCreateBy(authGetResultDTO.getUserId());
eldersAuthDO.setCreateAt(new Date());
eldersAuthDO.setSumitUserId(authGetResultDTO.getUserId());
- eldersAuthDO.setDomicile(this.baseMapper.selectDomicile(authUserDO.getIdCard()));
+ String domicile = this.baseMapper.selectDomicile(eldersAuthDO.getIdCard());
+ if(org.springframework.util.StringUtils.isEmpty(domicile)){
+ domicile = "暂无";
+ }
+ eldersAuthDO.setDomicile(domicile);
eldersAuthDO.setBirthDay(IdCard.birthDay(authUserDO.getIdCard()));
eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
eldersAuthDO.setType(2);
eldersAuthDO.setVerificationResult(authGetResultDTO.getVerificationResult());
@@ -250,7 +259,7 @@
authUserDO.setIsAuth(ComEldersAuthUserDO.isAuth.yes);
comEldersAuthUserMapper.updateById(authUserDO);
- return R.ok();
+ return R.ok(eldersAuthDO.getId());
}
log.error("人脸核验新增认证记录失败，错误原因：未查询到老人记录，老人id：" + authGetResultDTO.getAuthUserId());
return R.fail();
@@ -266,23 +275,27 @@
//判断当前用户是否是高龄老人，如果是则将这个人新增到高龄老人的列表里
SysUserVO userVO = this.eldersAuthDAO.getSysUserByUserId(authPageDTO.getUserId());
if(userVO != null){
- //查询老人库是否存在当前用户信息
- ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
- .eq(ComEldersAuthElderlyDO::getIdCard,userVO.getIdCard()));
-
- if(authElderlyDO != null){
- ComEldersAuthUserDO authUserDO = new ComEldersAuthUserDO();
- authUserDO.setUserId(userVO.getUserId());
- authUserDO.setRelation(ComEldersAuthUserDO.relation.br);
- authUserDO.setName(userVO.getName());
- authUserDO.setIdCard(userVO.getIdCard());
- authUserDO.setCommunityId(authElderlyDO.getCommunityId());
- authUserDO.setBigAgeId(authElderlyDO.getId());
- comEldersAuthUserMapper.insert(authUserDO);
+ //查询当前用户是否已存在用户关联中
+ ComEldersAuthUserDO oldAuthUserDO = comEldersAuthUserMapper.selectOne(new QueryWrapper<ComEldersAuthUserDO>().lambda()
+ .eq(ComEldersAuthUserDO::getIdCard,userVO.getIdCard()));
+ if(oldAuthUserDO == null){
+ //查询老人库是否存在当前用户信息
+ ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
+ .eq(ComEldersAuthElderlyDO::getIdCard,userVO.getIdCard()));
+ if(authElderlyDO != null){
+ ComEldersAuthUserDO authUserDO = new ComEldersAuthUserDO();
+ authUserDO.setUserId(userVO.getUserId());
+ authUserDO.setRelation(ComEldersAuthUserDO.relation.br);
+ authUserDO.setName(userVO.getName());
+ authUserDO.setIdCard(userVO.getIdCard());
+ authUserDO.setCommunityId(authElderlyDO.getCommunityId());
+ authUserDO.setBigAgeId(authElderlyDO.getId());
+ comEldersAuthUserMapper.insert(authUserDO);
+ }
}
}
- IPage<ComElderAuthUserAppVO> authUserAppVOIPage = comEldersAuthUserMapper.findByPage(new Page(authPageDTO.getPageNum(),authPageDTO.getPageSize()));
+ IPage<ComElderAuthUserAppVO> authUserAppVOIPage = comEldersAuthUserMapper.findByPage(new Page(authPageDTO.getPageNum(),authPageDTO.getPageSize()),authPageDTO.getUserId());
if(!authUserAppVOIPage.getRecords().isEmpty()){
authUserAppVOIPage.getRecords().forEach(authUser -> {
@@ -331,7 +344,7 @@
authUserDO.setBigAgeId(authElderlyDO.getId());
authUserDO.setName(authElderlyDO.getName());
if(comEldersAuthUserMapper.insert(authUserDO) > 0){
- return R.ok();
+ return R.ok(authUserDO.getId());
}
return R.fail("添加失败");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml
index a73ea67..117d31d1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml
@@ -33,7 +33,10 @@
FROM
com_elders_auth_user AS ceau
LEFT JOIN com_act AS ca ON ca.community_id = ceau.community_id
+ where ceau.user_id = #{userId}
order by ceau.create_at desc
+
+
</select>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml
index 2e4e31c..186829a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml
@@ -9,7 +9,7 @@
<result property="name" column="name"/>
<result property="code" column="code"/>
<result property="value" column="value"/>
- <result property="describe" column="`describe`"/>
+ <result property="describe" column="describe"/>
<result property="createAt" column="create_at"/>
<result property="createBy" column="create_by"/>
<result property="communityId" column="community_id"/>
@@ -17,7 +17,7 @@
<sql id="columns">
<![CDATA[
- id,name,code,value,describe,create_at,create_by,community_id
+ id,name,code,value,`describe`,create_at,create_by,community_id
]]>
</sql>
@@ -40,7 +40,7 @@
AND value = #{pageSysConfDTO.value}
</if>
<if test="pageSysConfDTO.describe!=null">
- AND describe = #{pageSysConfDTO.describe}
+ AND `describe` = #{pageSysConfDTO.describe}
</if>
<if test="pageSysConfDTO.createAtBegin!=null">
AND create_at >= #{pageSysConfDTO.createAtBegin}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapperTest.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapperTest.java
deleted file mode 100644
index 56a2e59..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapperTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.panzhihua.service_grid.dao;
-
-import com.panzhihua.service_grid.model.dos.ApplicationAppRelease;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-class ApplicationAppReleaseMapperTest {
-
- @Autowired
- private ApplicationAppReleaseMapper applicationAppReleaseMapper;
-
- @Test
- void selectByRand() {
- ApplicationAppRelease result = applicationAppReleaseMapper.selectByRand(2L);
- System.out.println("JSONObject.toJSONString(result) = " + result.getProductName());
- }
-}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/GridMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/GridMemberApi.java
deleted file mode 100644
index e6ae3dd..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/GridMemberApi.java
+++ /dev/null
@@ -1,36 +0,0 @@
-//package com.panzhihua.service_user.api;
-//
-//import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
-//import com.panzhihua.common.model.vos.R;
-//import com.panzhihua.service_user.service.UserService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.Resource;
-//
-///**
-// * 网格员管理
-// */
-//
-//@Slf4j
-//@RestController("/grid/")
-//public class GridMemberApi {
-//
-// @Resource
-// private UserService userService;
-//
-// /**
-// * 网格员管理
-// * @param memberRelationDTO 请求参数
-// * @return 网格员列表
-// */
-// @PostMapping("/member/list")
-// public R getGridMemberList(@RequestBody PageEventGridMemberRelationDTO memberRelationDTO){
-// return userService.getGridMemberList(memberRelationDTO);
-// }
-//
-//
-//
-//}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 28457d6..4455ebf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -963,5 +963,10 @@
return userService.gridMemberEditStatus(gridMemberEditDTO);
}
+ @GetMapping("big/no/tip")
+ public R noTips(@RequestParam("userId") Long userId){
+ return userService.noTips(userId);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
index 546291a..b41787d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -191,5 +191,9 @@
* 网格员上班结束时间
*/
private Integer workEndTime;
+ /**
+ * 高龄认证显示提示（1.是 2.否）
+ */
+ private Integer bigAgeTips;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 3628f16..0088aea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -458,4 +458,6 @@
R deleteMembers(List<Long> Ids);
R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ R noTips(Long userId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index f346875..e7012b4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2037,4 +2037,15 @@
userDao.gridMemberEditStatus(gridMemberEditDTO);
return R.ok();
}
+
+ public R noTips(Long userId){
+ SysUserDO userDO = this.userDao.selectById(userId);
+ if(userDO != null){
+ userDO.setBigAgeTips(2);
+ if(this.userDao.updateById(userDO) > 0){
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1