更新

server-module/src/main/java/com/makeit/module/controller/wechat/elder/PlatElderChildrenInfoWechatController.java

@@ -3,6 +3,7 @@ package com.makeit.module.controller.wechat.elder;
 
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.elder.PlatElderIdDTO;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
 import io.swagger.annotations.Api;
@@ -34,6 +35,19 @@ public class PlatElderChildrenInfoWechatController {
         return ApiResponseUtils.success(platElderChildrenInfoService.view());
     }
 
+    @ApiOperation("绑定")
+    @PostMapping("bind")
+    public ApiResponseEntity<?> bind(PlatElderIdDTO dto) {
+        platElderChildrenInfoService.bind(dto.getElderId());
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("解绑")
+    @PostMapping("unbind")
+    public ApiResponseEntity<?> unbind(PlatElderIdDTO dto) {
+        platElderChildrenInfoService.unbind(dto.getElderId());
+        return ApiResponseUtils.success();
+    }
 
 
 }

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -76,7 +76,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
             d.setOrgName(o.getName());
         });
 
-        JoinUtil.joinSplit(voList, platOrgService, PlatDeviceListVO::getOrgId, (d, o) -> {
+        JoinUtil.joinSplit(voList, platOrgService, PlatDeviceListVO::getOrgPath, (d, o) -> {
             d.setOrgName(StreamUtil.join(o, PlatOrg::getName));
         });
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java

@@ -8,11 +8,13 @@ import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.dto.platform.elder.PlatElderChildrenInfoEditVO;
 import com.makeit.dto.platform.elder.PlatElderChildrenInfoQueryDTO;
+import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.elder.PlatElderChildrenInfoMapper;
+import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.service.platform.elder.PlatElderService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
@@ -21,6 +23,7 @@ import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.sql.join.JoinUtil;
 import com.makeit.utils.user.wechat.WechatUserUtil;
+import com.makeit.vo.platform.device.PlatDeviceListVO;
 import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +47,9 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
     @Autowired
     private PlatElderService platElderService;
 
+    @Autowired
+    private PlatOrgService platOrgService;
+
     private LambdaQueryWrapper<PlatElderChildrenInfo> lambdaQueryWrapper(PlatElderChildrenInfoQueryDTO dto) {
         return new QueryWrapper<PlatElderChildrenInfo>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElderChildrenInfo::getName, dto.getName())
@@ -56,6 +62,15 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
         JoinUtil.joinSplit(voList, platElderService, PlatElderChildrenInfoListVO::getElderId, PlatElder::getId, (c, e) -> {
             c.setElderName(StreamUtil.join(e, PlatElder::getName));
         });
+
+        JoinUtil.join(voList, platOrgService, PlatElderChildrenInfoListVO::getOrgId, (d, o) -> {
+            d.setOrgName(o.getName());
+        });
+
+        JoinUtil.joinSplit(voList, platOrgService, PlatElderChildrenInfoListVO::getOrgPath, (d, o) -> {
+            d.setOrgName(StreamUtil.join(o, PlatOrg::getName));
+        });
+
     }
 
     @Override

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -7,6 +7,7 @@ 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.elder.*;
+import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderHealthInfo;
 import com.makeit.entity.platform.elder.PlatElderOtherInfo;
@@ -15,13 +16,16 @@ import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.FileSuffixEnum;
 import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.elder.PlatElderMapper;
+import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.*;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.excel.ExcelUtil;
 import com.makeit.utils.old.StringUtils;
+import com.makeit.utils.sql.join.JoinUtil;
 import com.makeit.utils.sys.FileUtil;
+import com.makeit.vo.platform.device.PlatDeviceListVO;
 import com.makeit.vo.platform.elder.PlatElderExportVO;
 import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
@@ -58,6 +62,9 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     @Autowired
     private PlatElderChildrenInfoService platElderChildrenInfoService;
 
+    @Autowired
+    private PlatOrgService platOrgService;
+
     private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) {
         return new QueryWrapper<PlatElder>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
@@ -78,6 +85,14 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
 
+        JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, (d, o) -> {
+            d.setOrgName(o.getName());
+        });
+
+        JoinUtil.joinSplit(list, platOrgService, PlatElderListVO::getOrgPath, (d, o) -> {
+            d.setOrgName(StreamUtil.join(o, PlatOrg::getName));
+        });
+
         return PageUtil.toPageVO(list, voPage);
 
     }

server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderChildrenInfoListVO.java

@@ -55,6 +55,9 @@ public class PlatElderChildrenInfoListVO extends BaseTenantDTO {
     @ApiModelProperty(value = "组织路径")
     private String orgPath;
 
+    @ApiModelProperty(value = "组织路径")
+    private String orgPathName;
+
     /**
      * 创建时间
      */

server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderListVO.java

@@ -90,6 +90,27 @@ public class PlatElderListVO extends BaseTenantDTO {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "组织id")
+    private String orgId;
+
+    @ApiModelProperty(value = "组织id")
+    private String orgName;
+
+    @ApiModelProperty(value = "城市组织id")
+    private String cityOrgId;
+
+    @ApiModelProperty(value = "区组织id")
+    private String districtOrgId;
+
+    @ApiModelProperty(value = "街道组织id")
+    private String streetOrgId;
+
+    @ApiModelProperty(value = "组织路径")
+    private String orgPath;
+
+    @ApiModelProperty(value = "组织路径名称")
+    private String orgPathName;
+
 
     /**
      * 创建时间