fix：子女端登陆绑定长者逻辑修改

b7f2368b · huangjy · cb4c00a6 · b7f2368b · b7f2368b · b7f2368b
Commit b7f2368b authored Nov 06, 2023 by huangjy
Showing with 40 additions and 25 deletions
server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenController.java
server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoUserLoginChildrenController.java
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderIdDTO.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java
server-web/src/main/resources/application.yml
--- a/server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenController.java
@@ -6,6 +6,8 @@ import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.elder.PlatElderQueryDTO;
 import com.makeit.dto.platform.elder.add.PlatElderDTOVO;
+import com.makeit.global.annotation.AuthIgnore;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.elder.PlatElderService;
 import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderWechatSimpleVO;
@@ -41,6 +43,13 @@ public class PlatElderChildrenController {
        return ApiResponseUtils.success(platElderService.list(dto));
    }
+    @ApiOperation("根据老人姓名和证件号查询")
+    @PostMapping("listByElder")
+    @TenantIdIgnore
+    public ApiResponseEntity<List<PlatElderListVO>> listByElder(@RequestBody PlatElderQueryDTO dto) {
+        return ApiResponseUtils.success(platElderService.listByElder(dto));
+    }
    @ApiOperation("我的家庭")
    @PostMapping("listMy")
    public ApiResponseEntity<List<PlatElderWechatSimpleVO>> listMy() {

--- a/server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoUserLoginChildrenController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoUserLoginChildrenController.java
@@ -2,6 +2,7 @@ package com.makeit.module.controller.children.elder;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
 import com.makeit.utils.third.wechat.WechatLoginPhoneDTO;
 import com.makeit.utils.user.wechat.WechatUserInfo;
@@ -23,6 +24,7 @@ public class PlatElderChildrenInfoUserLoginChildrenController {
    @ApiOperation(value = "登录")
    @PostMapping(value = "/login")
+    @TenantIdIgnore
    public ApiResponseEntity<WechatUserInfo> login(@RequestBody WechatLoginPhoneDTO dto) {
        return ApiResponseUtils.success(platElderChildrenInfoUserLoginWechatService.login(dto));
    }

--- a/server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderIdDTO.java
+++ b/server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderIdDTO.java
@@ -19,6 +19,8 @@ public class PlatElderIdDTO {
    @ApiModelProperty(value = "长者id")
    private String elderId;
+    @ApiModelProperty(value = "长者id")
+    private String orgId;
    @ApiModelProperty(value = "设备id")
    private String deviceId;

--- a/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java
@@ -65,6 +65,8 @@ public interface PlatElderService extends IService<PlatElder> {
    List<PlatElderWechatSimpleVO> listMy();
    void batchEdit(PlatElderBatchEditDTOVO dto);
+    List<PlatElderListVO> listByElder(PlatElderQueryDTO dto);
    /*小程序*/
 }
--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
+import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
 import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoDTOVO;
 import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoQueryDTO;
 import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoWechatDTOVO;
@@ -185,6 +186,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
    /*子女端小程序*/
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public void bind(String elderId) {
        PlatElderChildrenInfo childrenInfo = getById(WechatUserUtil.getUserId());
@@ -193,39 +195,30 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_CHILDREN_ELDER_ID_BIND_DUPLICATE);
        }
-        List<String> list = new ArrayList<>(10);
+        PlatElder platElder = platElderService.getById(elderId);
-        if (StringUtils.isNotBlank(childrenInfo.getElderId())) {
+        childrenInfo.setTenantId(platElder.getTenantId());
-            list = Arrays.asList(childrenInfo.getElderId().split(","));
-        }
-        LinkedHashSet<String> linkedHashSet = new LinkedHashSet<>(list);
+        PlatOrgSplitDTO vo = platOrgService.getOrgSplitVO(platElder.getOrgId());
-        linkedHashSet.add(elderId);
-        childrenInfo.setElderId(StreamUtil.join(new ArrayList<>(linkedHashSet), Function.identity()));
+        childrenInfo.setOrgId(platElder.getOrgId());
+        childrenInfo.setCityOrgId(vo.getCityOrgId());
+        childrenInfo.setDistrictOrgId(vo.getDistrictOrgId());
+        childrenInfo.setStreetOrgId(vo.getStreetOrgId());
+        childrenInfo.setOrgPath(vo.getOrgPath());
+        childrenInfo.setElderId(elderId);
        updateById(childrenInfo);
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public void unbind(String elderId) {
-        PlatElderChildrenInfo childrenInfo = getById(WechatUserUtil.getUserId());
+        remove(new QueryWrapper<PlatElderChildrenInfo>().lambda().eq(PlatElderChildrenInfo::getElderId,elderId));
+/*        PlatElderChildrenInfo childrenInfo = getById(WechatUserUtil.getUserId());
-        List<String> list = new ArrayList<>(10);
+        childrenInfo.setElderId(null);
-        if (StringUtils.isNotBlank(childrenInfo.getElderId())) {
-            list = Arrays.asList(childrenInfo.getElderId().split(","));
-        }
-        LinkedHashSet<String> linkedHashSet = new LinkedHashSet<>(list);
-        linkedHashSet.remove(elderId);
-        childrenInfo.setElderId(StreamUtil.join(new ArrayList<>(linkedHashSet), Function.identity()));
+        updateById(childrenInfo);*/
-        if (linkedHashSet.isEmpty()) {
-            childrenInfo.setElderId(null);
-        }
-        updateById(childrenInfo);
    }
 }
 //TODO ywc 组织还没填充
\ No newline at end of file
--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
@@ -229,6 +229,11 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
    }
    @Override
+    public List<PlatElderListVO> listByElder(PlatElderQueryDTO dto) {
+        return list(dto);
+    }
+    @Override
    public void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto) {
        List<PlatElder> dbList = list(lambdaQueryWrapper(dto));

--- a/server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java
@@ -55,13 +55,13 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
            childrenInfo.setOpenid(userInfo.getOpenId());
            childrenInfo.setName(userInfo.getNickName());
-            PlatOrgSplitDTO vo = platOrgService.getOrgSplitVO(dto.getOrgId());
+  /*          PlatOrgSplitDTO vo = platOrgService.getOrgSplitVO(dto.getOrgId());
            childrenInfo.setOrgId(dto.getOrgId());
            childrenInfo.setCityOrgId(vo.getCityOrgId());
            childrenInfo.setDistrictOrgId(vo.getDistrictOrgId());
            childrenInfo.setStreetOrgId(vo.getStreetOrgId());
-            childrenInfo.setOrgPath(vo.getOrgPath());
+            childrenInfo.setOrgPath(vo.getOrgPath());*/
            childrenInfo.setCreateBy(userInfo.getNickName());
            childrenInfo.setUpdateBy(userInfo.getNickName());

--- a/server-web/src/main/resources/application.yml
+++ b/server-web/src/main/resources/application.yml
@@ -148,6 +148,7 @@ tenant:
      - plat_user
      - plat_menu
      - plat_day_duration_record
+      - plat_elder_children_info
 rsa: