二期 管家小程序 bug

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -253,7 +253,6 @@ public class BmsSysUserService{
         BeanUtil.copyProperties(vo,careSysUser);
         careSysUser.setCreateTime(new Date());
         careSysUser.setRole(UserRoleEnum.CHANMB.getValue());
-        careSysUser.setStationId(loginUser.getStationId());
         careSysUser.setOrgId(loginUser.getOrgId());
 
         this.careSysUserService.save(careSysUser);

src/main/java/com/care/keeper/controller/KeeperEventApiController.java

@@ -7,7 +7,7 @@ import com.care.common.util.PageResult;
 import com.care.common.util.Result;
 import com.care.common.vo.PageReqVO;
 import com.care.common.vo.order.*;
-import com.care.keeper.service.KeeperApiService;
+import com.care.keeper.service.KeeperOrderApiService;
 import com.care.keeper.service.KeeperPassportService;
 import com.care.keeper.vo.HouseContactVO;
 import com.care.keeper.vo.KeeperInfoVO;
@@ -34,7 +34,7 @@ import java.util.Map;
 public class KeeperEventApiController {
 
     @Resource
-    private KeeperApiService keeperApiService;
+    private KeeperOrderApiService keeperOrderApiService;
 
     @Resource
     private KeeperPassportService keeperPassportService;
@@ -49,7 +49,7 @@ public class KeeperEventApiController {
         try {
             KeeperInfoVO current = this.keeperPassportService.checkToken(token);
 
-            IPage<ChambEventOrderVO> pageResponse = this.keeperApiService.queryTodoEventByChambId(pageReqVo,current.getId());
+            IPage<ChambEventOrderVO> pageResponse = this.keeperOrderApiService.queryTodoEventByChambId(pageReqVo,current.getId());
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("我的未处理事件 分页列表出现异常",e);
@@ -65,7 +65,7 @@ public class KeeperEventApiController {
         try {
             KeeperInfoVO current = this.keeperPassportService.checkToken(token);
 
-            IPage<ChambEventOrderVO> pageResponse = this.keeperApiService.queryDoingEventByChambId(pageReqVo,current.getId());
+            IPage<ChambEventOrderVO> pageResponse = this.keeperOrderApiService.queryDoingEventByChambId(pageReqVo,current.getId());
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("我的处理中事件 分页列表出现异常",e);
@@ -82,7 +82,7 @@ public class KeeperEventApiController {
         try {
             KeeperInfoVO current = this.keeperPassportService.checkToken(token);
 
-            IPage<ChambEventOrderVO> pageResponse = this.keeperApiService.queryDoneEventByChambId(pageReqVo,current.getId());
+            IPage<ChambEventOrderVO> pageResponse = this.keeperOrderApiService.queryDoneEventByChambId(pageReqVo,current.getId());
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("我的已完成事件 分页列表出现异常",e);
@@ -96,10 +96,10 @@ public class KeeperEventApiController {
     @GetMapping("/getEventInfo")
     @ApiOperation(tags = {"事件处理"},value = "事件处理或者详情  --二期修改")
     public Result<Map<String,Object>> getEventInfo(@RequestParam("orderId") Long orderId){
-        EventOrderVO eventOrderVO = this.keeperApiService.getEventInfo(orderId);
-        List<ChamberlainVO> chambList = this.keeperApiService.queryChambList(orderId);
-        List<OrderOlderVO> olderVOList = this.keeperApiService.queryOrderOlderList(orderId);
-        List<HouseContactVO> houseContactVOList = this.keeperApiService.queryContactByOrderId(orderId);
+        EventOrderVO eventOrderVO = this.keeperOrderApiService.getEventInfo(orderId);
+        List<ChamberlainVO> chambList = this.keeperOrderApiService.queryChambList(orderId);
+        List<OrderOlderVO> olderVOList = this.keeperOrderApiService.queryOrderOlderList(orderId);
+        List<HouseContactVO> houseContactVOList = this.keeperOrderApiService.queryContactByOrderId(orderId);
         Map<String,Object> data = new HashMap<>(4);
         //订单信息
         data.put("info",eventOrderVO);
@@ -117,7 +117,7 @@ public class KeeperEventApiController {
     @ApiOperation(tags = {"事件处理"},value = "获取钥匙信息，data如果为NULL，需要进行申请")
     public Result<OrderKeyApplyVO> getApplyKeyInfo(@RequestHeader("token") String token, @RequestParam("orderId") Long orderId){
         KeeperInfoVO current = this.keeperPassportService.checkToken(token);
-        OrderKeyApplyVO orderKeyApplyVO = this.keeperApiService.getApplyKeyInfo(orderId,current.getId());
+        OrderKeyApplyVO orderKeyApplyVO = this.keeperOrderApiService.getApplyKeyInfo(orderId,current.getId());
         return  Result.success("查询成功！",orderKeyApplyVO);
     }
 
@@ -125,14 +125,14 @@ public class KeeperEventApiController {
     @ApiOperation(tags = {"事件处理"},value = "申请钥匙")
     public Result<Map<String,Object>> toApplyKey(@RequestHeader("token") String token, @RequestParam("orderId") Long orderId){
         KeeperInfoVO current = this.keeperPassportService.checkToken(token);
-        this.keeperApiService.applyKey(orderId,current);
+        this.keeperOrderApiService.applyKey(orderId,current);
         return  Result.success("申请成功！");
     }
 
     @PostMapping("/daoda")
     @ApiOperation(tags = {"事件处理"},value = "到达确认")
     public Result<Object> daoDaConfirm(@RequestParam("chambOrderId") Long chambOrderId){
-        if (this.keeperApiService.daoDaConfirm(chambOrderId)){
+        if (this.keeperOrderApiService.daoDaConfirm(chambOrderId)){
             return  Result.success("到达确认成功！");
         }else{
             return  Result.error("操作失败！");
@@ -143,7 +143,7 @@ public class KeeperEventApiController {
     @PostMapping("/likai")
     @ApiOperation(tags = {"事件处理"},value = "离开确认")
     public Result<Object> liKaiConfirm(@RequestBody LikaiConfimVO likaiConfimVO){
-        if (this.keeperApiService.liKaiConfirm(likaiConfimVO.getChambOrderId(),likaiConfimVO.getRemark(),likaiConfimVO.getUrls())){
+        if (this.keeperOrderApiService.liKaiConfirm(likaiConfimVO.getChambOrderId(),likaiConfimVO.getRemark(),likaiConfimVO.getUrls())){
             return  Result.success("离开确认成功！");
         }else{
             return  Result.error("操作失败！");
@@ -153,7 +153,7 @@ public class KeeperEventApiController {
     @GetMapping("/queryDoHis")
     @ApiOperation(tags = {"事件处理"},value = "处理日志")
     public Result<List<OrderHandleHisVO>> queryDoHis(@RequestParam("orderId") Long orderId){
-        return  Result.success("查询成功！",this.keeperApiService.queryOrderHandleHis(orderId));
+        return  Result.success("查询成功！",this.keeperOrderApiService.queryOrderHandleHis(orderId));
     }
 
     @ApiOperation(tags = {"APP-图片上传"},value = "图片上传接口", notes = "图片上传接口")
@@ -175,7 +175,7 @@ public class KeeperEventApiController {
     @ApiOperation(tags = {"事件处理"},value = "获取管家当前的状态 0:未到达 1 到达、服务中  2 离开")
     public Result<Integer> getKeeperStatus(@RequestParam("chambOrderId") Long chambOrderId){
         Integer status = 0;
-        ChambEventOrderVO orderVO = this.keeperApiService.getChambOrder(chambOrderId);
+        ChambEventOrderVO orderVO = this.keeperOrderApiService.getChambOrder(chambOrderId);
         if (orderVO!=null ){
             if (orderVO.getDaodaTime()!=null && orderVO.getLikaiTime()==null){
                 status = 1;
@@ -191,13 +191,13 @@ public class KeeperEventApiController {
     @ApiOperation(tags = {"首页"},value = "获取管家的服务人数")
     public Result<Integer> getFuwuCount( @RequestHeader(name = "token") String token){
         KeeperInfoVO current = this.keeperPassportService.checkToken(token);
-        return  Result.success("查询成功！",this.keeperApiService.queryOlderCount(current));
+        return  Result.success("查询成功！",this.keeperOrderApiService.queryOlderCount(current));
     }
 
     @GetMapping("/myOrderStat")
     @ApiOperation(tags = {"我的"},value = "工单统计")
     public Result<ChambEventOrderCountVO> myOrderStat( @RequestHeader(name = "token") String token){
         KeeperInfoVO current = this.keeperPassportService.checkToken(token);
-        return  Result.success("查询成功！",this.keeperApiService.getOrderCountByChambId(current.getId()));
+        return  Result.success("查询成功！",this.keeperOrderApiService.getOrderCountByChambId(current.getId()));
     }
 }

src/main/java/com/care/keeper/controller/KeeperMemberApiController.java

@@ -7,6 +7,7 @@ import com.care.common.entity.*;
 import com.care.common.service.*;
 import com.care.common.util.Result;
 import com.care.keeper.service.AbstractKeeperPassportService;
+import com.care.keeper.service.KeeperInfoApiService;
 import com.care.keeper.service.KeeperPassportService;
 import com.care.keeper.vo.KeeperInfoVO;
 import com.care.keeper.vo.OlderVO;
@@ -46,11 +47,8 @@ public class KeeperMemberApiController {
     @Resource
     private CareEventOrderChambService careEventOrderChambService;
     @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareHouseOlderRelService careHouseOlderRelService;
-    @Resource
-    private CareOlderService careOlderService;
+    private KeeperInfoApiService keeperInfoApiService;
+
 
 
     @ApiOperation(value = "获取基本信息", notes = "获取用户基本录信息 -- 二期修改")
@@ -63,30 +61,10 @@ public class KeeperMemberApiController {
             current.setStationName(careStationService.getById(current.getStationId()).getName());
         }
         //服务次数
-        QueryWrapper<CareEventOrderChamb> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.lambda().eq(CareEventOrderChamb::getChambId,current.getId()).ne(CareEventOrderChamb::getStatus,"3");
-        current.setServeCount(this.careEventOrderChambService.count(queryWrapper2));
+        current.setServeCount(this.keeperInfoApiService.getServeCount(current.getId()));
 
         //老人列表
-        List<OlderVO> olderVOList = new ArrayList<>();
-        QueryWrapper<CareDevice> queryWrapper0 = new QueryWrapper<>();
-        queryWrapper0.lambda().eq(CareDevice::getChambId,current.getId());
-        List<CareDevice> listDev = this.careDeviceService.list(queryWrapper0);
-        if(CollUtil.isNotEmpty(listDev)){
-            listDev.forEach(item -> {
-                QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId,item.getHouseId());
-                List<CareHouseOlderRel> listRel = careHouseOlderRelService.list(queryWrapper);
-                if(CollUtil.isNotEmpty(listRel)) {
-                    listRel.forEach(i->{
-                        CareOlder careOlder = this.careOlderService.getById(i.getOlderId());
-                        OlderVO olderVO = new OlderVO();
-                        BeanUtil.copyProperties(careOlder,olderVO);
-                        olderVOList.add(olderVO);
-                    });
-                }
-            });
-        }
+        List<OlderVO> olderVOList =  keeperInfoApiService.getOlderList(current.getId());
         if(CollUtil.isNotEmpty(olderVOList)){
             current.setOlderVOList(olderVOList);
         }

src/main/java/com/care/keeper/service/KeeperInfoApiService.java

@@ -0,0 +1,67 @@
+package com.care.keeper.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.care.common.entity.*;
+
+import com.care.common.service.*;
+
+import com.care.keeper.vo.OlderVO;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/7
+ * @Desc:
+ */
+@Slf4j
+@Service
+public class KeeperInfoApiService {
+    @Resource
+    private CareDeviceService careDeviceService;
+    @Resource
+    private CareHouseOlderRelService careHouseOlderRelService;
+    @Resource
+    private CareOlderService careOlderService;
+    @Resource
+    private CareEventOrderChambService careEventOrderChambService;
+
+    public Integer getServeCount(Long chambId){
+        QueryWrapper<CareEventOrderChamb> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareEventOrderChamb::getChambId,chambId).ne(CareEventOrderChamb::getStatus,"3");
+        return  this.careEventOrderChambService.count(queryWrapper);
+    }
+
+    public List<OlderVO> getOlderList(Long chambId){
+        List<OlderVO> olderVOList = new ArrayList<>();
+        QueryWrapper<CareDevice> queryWrapper0 = new QueryWrapper<>();
+        queryWrapper0.lambda().eq(CareDevice::getChambId,chambId);
+        List<CareDevice> listDev = this.careDeviceService.list(queryWrapper0);
+        if(CollUtil.isNotEmpty(listDev)){
+            listDev.forEach(item -> {
+                QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId,item.getHouseId());
+                List<CareHouseOlderRel> listRel = careHouseOlderRelService.list(queryWrapper);
+                if(CollUtil.isNotEmpty(listRel)) {
+                    listRel.forEach(i->{
+                        CareOlder careOlder = this.careOlderService.getById(i.getOlderId());
+                        OlderVO olderVO = new OlderVO();
+                        BeanUtil.copyProperties(careOlder,olderVO);
+                        olderVOList.add(olderVO);
+                    });
+                }
+            });
+        }
+        return olderVOList;
+    }
+}

src/main/java/com/care/keeper/service/KeeperApiService.java

@@ -33,26 +33,16 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class KeeperApiService {
+public class KeeperOrderApiService {
     @Resource
     private CareDeviceService careDeviceService;
     @Resource
-    private CareMemberInfoService careMemberInfoService;
-    @Resource
     private CareHouseContactService careHouseContactService;
     @Resource
     private CareEventOrderService careEventOrderService;
     @Resource
     private CareEventOrderHandleHisService careEventOrderHandleHisService;
     @Resource
-    private FileUploadService fileUploadService;
-    @Resource
-    private CareHouseService careHouseService;
-    @Resource
-    private CareOrganizationService careOrganizationService;
-    @Resource
-    private CareStationService careStationService;
-    @Resource
     private CareSysUserService careSysUserService;
     @Resource
     private CareEventOrderChambService careEventOrderChambService;
@@ -75,6 +65,7 @@ public class KeeperApiService {
         return this.careSysUserService.queryOlderCountByChambId(keeperInfoVO.getId());
     }
 
+
     /**
      * 待处理的工单
      *
@@ -213,7 +204,7 @@ public class KeeperApiService {
     }
 
     /**
-     * 查询老人列表
+     * 查询工单对应的老人列表
      * @param orderId
      * @return
      */