未处理事件

src/main/java/com/care/bigscreen/controller/CommonController.java

@@ -3,7 +3,7 @@ package com.care.bigscreen.controller;
 import com.care.bigscreen.service.BigScreenService;
 import com.care.common.annotation.Permission;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.service.CommonService;
+import com.care.bms.service.CommonService;
 import com.care.common.util.Result;
 import com.care.common.util.WebPageUtils;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/care/bms/controller/EventHandleController.java

@@ -0,0 +1,144 @@
+package com.care.bms.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.care.bms.service.CareEventOrderService;
+import com.care.common.annotation.Permission;
+import com.care.common.enums.OrderStatusEnum;
+import com.care.common.exception.BDException;
+import com.care.common.util.PageResult;
+import com.care.common.util.WebPageUtils;
+import com.care.common.vo.PageReqVO;
+import com.care.common.vo.UserLogindConvertVO;
+import com.care.common.vo.event.CareEventOrderVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/26
+ * @Desc:
+ */
+@RestController
+@Api(value = "EventHandleController", tags = { "事件处理" })
+@Slf4j
+@RequestMapping("/bms/event")
+@Permission
+public class EventHandleController {
+
+    @Autowired
+    private CareEventOrderService careEventOrderService;
+
+
+    /**
+     *未处理事件查询 分页
+     * @param request
+     * @param pageReqVo
+     * @return
+     */
+    @GetMapping("/not-handle/list")
+    @ApiOperation(tags = {"未处理事件"},value = "未处理事件查询-分页")
+    public PageResult<List<CareEventOrderVO>> listNotHandle(HttpServletRequest request,@RequestHeader(value = "token") String token,
+                                                            PageReqVO pageReqVo){
+        try {
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<CareEventOrderVO> pageResponse = this.careEventOrderService.listEvent(OrderStatusEnum.TODO.getValue(), null,loginUser ,pageReqVo);
+            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
+        }catch (BDException e) {
+            log.error("未处理事件查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("事件处理: 未处理事件查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+    @GetMapping("/my-handle/list")
+    @ApiOperation(tags = {"我的处理事件"},value = "我的处理事件查询 分页")
+    public PageResult<List<CareEventOrderVO>> listMyHandle(HttpServletRequest request,@RequestHeader(value = "token") String token,
+                                                           @RequestParam(value = "status", required = false) String status,
+                                                           @RequestParam(value = "olderName", required = false) String olderName,
+                                                            PageReqVO pageReqVo){
+        try {
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<CareEventOrderVO> pageResponse = this.careEventOrderService.listEvent4MyDo(status, olderName,loginUser ,pageReqVo);
+            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
+        }catch (BDException e) {
+            log.error("我的处理事件查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("事件处理: 未处理事件查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+
+    @GetMapping("/list")
+    @ApiOperation(tags = {"事件查询"},value = "事件查询 分页")
+    public PageResult<List<CareEventOrderVO>> list(HttpServletRequest request,
+                                                           @RequestParam(value = "status", required = false) String status,
+                                                           @RequestParam(value = "olderName", required = false) String olderName,
+                                                           PageReqVO pageReqVo){
+        try {
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<CareEventOrderVO> pageResponse = this.careEventOrderService.listEvent(status, olderName,loginUser ,pageReqVo);
+            return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
+        }catch (BDException e) {
+            log.error("我的处理事件查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("事件处理: 未处理事件查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+
+    //TODO 老人基本信息查询-事件ID
+
+    //TODO 事件统计
+
+    //TODO 某个事件处理记录查询 - 事件ID
+   /* *//**
+     * 复制线路
+     * @param mapAddReqVO
+     * @return
+     *//*
+    @PostMapping("/copyLine")
+    @ApiOperation(tags = {"定单管理"},value = "复制线路")
+    public Result<RimsLineResVO> copyLine(@RequestHeader("Authorization") String authorization, @Validated @RequestBody RimsLineOrderMapAddReqVO mapAddReqVO, BindingResult bindingResult){
+        if(bindingResult.hasErrors()){
+            return Result.error(bindingResult.getFieldErrors().get(0).getDefaultMessage());
+        }
+        try {
+            UserDTO userDTO = this.sysUserService.queryUserInfo(authorization,null);
+            RimsLine line = this.rimsLineService.copyLine(mapAddReqVO.getLineId(),userDTO);
+            RimsLineResVO vo = null;
+            if(line!=null){
+                mapAddReqVO.setLineId(line.getId());
+                this.rimsLineOrderMapService.insertLineOrderMap(mapAddReqVO);
+                vo = new RimsLineResVO();
+                BeanUtils.copyProperties(line,vo);
+            }
+            return  Result.success("复制成功",vo);
+        } catch (Exception e) {
+            log.warn("线路管理:复制线路出现异常",e);
+            return  Result.error("复制线路失败");
+        }
+    }*/
+    //todo 紧急联系人和管家查询 - 事件ID
+
+    //todo 呼叫： 事件ID、呼叫人、呼叫角色
+
+    //TODO 发送短信： 事件ID、接收人ID
+
+    //TODO 联系人 状态设置：  事件ID、联系人ID、状态
+
+    //TODO 完成工单： 事件工单ID
+
+
+}

src/main/java/com/care/bms/controller/LoginController.java

@@ -5,7 +5,7 @@ import com.care.bms.params.UserLoginParams;
 import com.care.common.constant.Constants;
 import com.care.common.exception.BDException;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.service.CareSysUserService;
+import com.care.bms.service.CareSysUserService;
 import com.care.common.util.JwtUtils;
 import com.care.common.util.Result;
 import com.care.common.util.ResultCode;
@@ -43,7 +43,7 @@ public class LoginController {
             if (loginUser == null) {
                 return Result.error("未找到相关用户");
             }
-
+            //todo ： 放入到 redis 中
             Map<String,Object> dataMap = new HashMap<>(2);
             dataMap.put("token",JwtUtils.generalToken(loginUser));
             dataMap.put("user",loginUser);
@@ -72,4 +72,5 @@ public class LoginController {
         }
         return Result.error("解析失败");
     }
+    //TODO 退出
 }

src/main/java/com/care/common/service/CareChamberlainOlderRelService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareChamberlainOlderRel;

src/main/java/com/care/common/service/CareDeviceService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareDevice;

src/main/java/com/care/common/service/CareEventOrderContactStatusService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareEventOrderContactStatus;

src/main/java/com/care/common/service/CareEventOrderHandleHisService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareEventOrderHandleHis;

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

@@ -0,0 +1,37 @@
+package com.care.bms.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareEventOrder;
+import com.care.common.vo.PageReqVO;
+import com.care.common.vo.UserLogindConvertVO;
+import com.care.common.vo.event.CareEventOrderVO;
+
+/**
+ * 事件定单表(CareEventOrder)表服务接口
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:29
+ */
+public interface CareEventOrderService extends IService<CareEventOrder> {
+
+    /**
+     * 事件查询
+     * @param orderStatus
+     * @param olderName
+     * @param loginUser
+     * @param pageReqVo
+     * @return
+     */
+    IPage<CareEventOrderVO> listEvent(String orderStatus, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo);
+
+    /**
+     * 我的处理事件 - 坐席
+     * @param orderStatus
+     * @param olderName
+     * @param loginUser
+     * @param pageReqVo
+     * @return
+     */
+    IPage<CareEventOrderVO> listEvent4MyDo(String orderStatus, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo);
+}

src/main/java/com/care/common/service/CareOlderContactService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOlderContact;

src/main/java/com/care/common/service/CareOlderDeviceRelService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOlderDeviceRel;

src/main/java/com/care/common/service/CareOlderService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOlder;

src/main/java/com/care/common/service/CareOrganizationService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOrganization;

src/main/java/com/care/common/service/CareStationService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareStation;

src/main/java/com/care/common/service/CareSysUserService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareSysUser;

src/main/java/com/care/common/service/CommonService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.care.common.entity.SysDimCode;
 

src/main/java/com/care/common/service/SysDimCodeService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.SysDimCode;

src/main/java/com/care/common/service/SysDimTypeService.java

@@ -1,4 +1,4 @@
-package com.care.common.service;
+package com.care.bms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.SysDimType;

src/main/java/com/care/common/service/impl/CareChamberlainOlderRelServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareChamberlainOlderRel;
 import com.care.common.mapper.CareChamberlainOlderRelMapper;
-import com.care.common.service.CareChamberlainOlderRelService;
+import com.care.bms.service.CareChamberlainOlderRelService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareDeviceServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareDevice;
 import com.care.common.mapper.CareDeviceMapper;
-import com.care.common.service.CareDeviceService;
+import com.care.bms.service.CareDeviceService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareEventOrderContactStatusServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareEventOrderContactStatus;
 import com.care.common.mapper.CareEventOrderContactStatusMapper;
-import com.care.common.service.CareEventOrderContactStatusService;
+import com.care.bms.service.CareEventOrderContactStatusService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareEventOrderHandleHisServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareEventOrderHandleHis;
 import com.care.common.mapper.CareEventOrderHandleHisMapper;
-import com.care.common.service.CareEventOrderHandleHisService;
+import com.care.bms.service.CareEventOrderHandleHisService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/bms/service/impl/CareEventOrderServiceImpl.java

@@ -0,0 +1,110 @@
+package com.care.bms.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.bms.service.CareEventOrderService;
+import com.care.common.entity.CareEventOrder;
+import com.care.common.enums.OrderStatusEnum;
+import com.care.common.enums.OrderTypeEnum;
+import com.care.common.mapper.CareEventOrderMapper;
+import com.care.common.vo.PageReqVO;
+import com.care.common.vo.UserLogindConvertVO;
+import com.care.common.vo.event.CareEventOrderVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 事件定单表(CareEventOrder)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:29
+ */
+@Service
+public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper, CareEventOrder> implements CareEventOrderService {
+
+    /**
+     * 工单查询
+     * @param orderStatus
+     * @param olderName
+     * @param loginUser
+     * @param pageReqVo
+     * @return
+     */
+    @Override
+    public IPage<CareEventOrderVO> listEvent(String orderStatus, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+        IPage<CareEventOrder> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
+        QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(StrUtil.isNotEmpty(orderStatus),CareEventOrder::getStatus, orderStatus)
+                .like(StrUtil.isNotEmpty(olderName),CareEventOrder::getOlderName,olderName)
+                .eq(CareEventOrder::getOrgId,loginUser.getOrgId())
+                .eq(loginUser.getStationId()!=null,CareEventOrder::getStationId,loginUser.getStationId())
+                .orderByAsc(CareEventOrder::getCreateTime);
+        /*if ("asc".equalsIgnoreCase(pageReqVo.getOrderBy())){
+            queryWrapper.lambda().orderByAsc(pageReqVo.getOrderField()!=null,pageReqVo.getOrderField());
+        }else{
+            queryWrapper.orderByDesc(pageReqVo.getOrderField()!=null,pageReqVo.getOrderField());
+        }*/
+
+
+        IPage<CareEventOrder> pageRes = this.page(page, queryWrapper);
+        IPage<CareEventOrderVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+        if(CollUtil.isNotEmpty(pageRes.getRecords())){
+            List<CareEventOrderVO> list = new ArrayList<>();
+            pageRes.getRecords().forEach(item -> {
+                CareEventOrderVO  resVO = new CareEventOrderVO();
+                BeanUtils.copyProperties(item,resVO);
+                resVO.setOrderTypeName(OrderTypeEnum.getCodeToName(item.getOrderType()));
+                resVO.setStatusName(OrderStatusEnum.getCodeToName(item.getStatus()));
+                list.add(resVO);
+            });
+            results.setRecords(list);
+        }
+        return results;
+    }
+
+    /**
+     * 我的处理事件 - 坐席
+     *
+     * @param orderStatus
+     * @param olderName
+     * @param loginUser
+     * @param pageReqVo
+     * @return
+     */
+    @Override
+    public IPage<CareEventOrderVO> listEvent4MyDo(String orderStatus, String olderName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+        IPage<CareEventOrder> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
+        QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(StrUtil.isNotEmpty(orderStatus),CareEventOrder::getStatus, orderStatus)
+                .like(StrUtil.isNotEmpty(olderName),CareEventOrder::getOlderName,olderName)
+                .eq(CareEventOrder::getOrgId,loginUser.getOrgId())
+                .eq(CareEventOrder::getSeatId,loginUser.getId())
+                .orderByAsc(CareEventOrder::getModifyTime);;
+       /* if ("asc".equalsIgnoreCase(pageReqVo.getOrderBy())){
+            queryWrapper.orderByAsc(pageReqVo.getOrderField()!=null,pageReqVo.getOrderField());
+        }else{
+            queryWrapper.orderByDesc(pageReqVo.getOrderField()!=null,pageReqVo.getOrderField());
+        }*/
+        IPage<CareEventOrder> pageRes = this.page(page, queryWrapper);
+        IPage<CareEventOrderVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+        if(CollUtil.isNotEmpty(pageRes.getRecords())){
+            List<CareEventOrderVO> list = new ArrayList<>();
+            pageRes.getRecords().forEach(item -> {
+                CareEventOrderVO  resVO = new CareEventOrderVO();
+                BeanUtils.copyProperties(item,resVO);
+                resVO.setOrderTypeName(OrderTypeEnum.getCodeToName(item.getOrderType()));
+                resVO.setStatusName(OrderStatusEnum.getCodeToName(item.getStatus()));
+                list.add(resVO);
+            });
+            results.setRecords(list);
+        }
+        return results;
+    }
+}

src/main/java/com/care/common/service/impl/CareOlderContactServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOlderContact;
 import com.care.common.mapper.CareOlderContactMapper;
-import com.care.common.service.CareOlderContactService;
+import com.care.bms.service.CareOlderContactService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareOlderDeviceRelServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOlderDeviceRel;
 import com.care.common.mapper.CareOlderDeviceRelMapper;
-import com.care.common.service.CareOlderDeviceRelService;
+import com.care.bms.service.CareOlderDeviceRelService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareOlderServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOlder;
 import com.care.common.mapper.CareOlderMapper;
-import com.care.common.service.CareOlderService;
+import com.care.bms.service.CareOlderService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareOrganizationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOrganization;
 import com.care.common.mapper.CareOrganizationMapper;
-import com.care.common.service.CareOrganizationService;
+import com.care.bms.service.CareOrganizationService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareStationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareStation;
 import com.care.common.mapper.CareStationMapper;
-import com.care.common.service.CareStationService;
+import com.care.bms.service.CareStationService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/CareSysUserServiceImpl.java

@@ -1,4 +1,4 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,8 +8,8 @@ import com.care.common.entity.CareSysUser;
 import com.care.common.exception.BDException;
 import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.mapper.CareSysUserMapper;
-import com.care.common.service.CareOrganizationService;
-import com.care.common.service.CareSysUserService;
+import com.care.bms.service.CareOrganizationService;
+import com.care.bms.service.CareSysUserService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.stereotype.Service;
 

src/main/java/com/care/common/service/impl/CommonServiceImpl.java

@@ -1,11 +1,11 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.care.common.entity.SysDimCode;
-import com.care.common.service.CommonService;
-import com.care.common.service.SysDimCodeService;
+import com.care.bms.service.CommonService;
+import com.care.bms.service.SysDimCodeService;
 import com.google.common.collect.Maps;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

src/main/java/com/care/common/service/impl/SysDimCodeServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.SysDimCode;
 import com.care.common.mapper.SysDimCodeMapper;
-import com.care.common.service.SysDimCodeService;
+import com.care.bms.service.SysDimCodeService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/service/impl/SysDimTypeServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.common.service.impl;
+package com.care.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.SysDimType;
 import com.care.common.mapper.SysDimTypeMapper;
-import com.care.common.service.SysDimTypeService;
+import com.care.bms.service.SysDimTypeService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/common/cache/RedisKeyConstant.java

@@ -5,8 +5,8 @@ import lombok.Data;
 /**
  * 描述：
  *
- * @autho：wenskys
- * @create 2020/5/11 0:55
+ * @autho：java
+ * @create 2021/5/25 0:55
  **/
 @Data
 public class RedisKeyConstant {
@@ -19,9 +19,13 @@ public class RedisKeyConstant {
     public static final String LOGIN_INFO = "LOGIN";
     public static final int LOGIN_INFO_TIME = 3600 * 24 * 2;
 
-    // 后台登录信息 2days
+    // 后台登录信息 6 小时
     public static final String BACK_LOGIN_INFO = "BACK:LOGIN";
-    public static final int BACK_LOGIN_INFO_TIME = 3600 * 24 * 2;
+    public static final int BACK_LOGIN_INFO_TIME = 3600 * 24;
+
+    // 后台登录信息 6 小时
+    public static final String SEAT_LOGIN_INFO = "SEAT:LOGIN";
+    public static final int SEAT_LOGIN_INFO_TIME = 3600 * 2;
 
     // 绑定手机号短信验证码 5min
     public static final String V_CODE_BIND_MSG = "V_CODE:MSG";

src/main/java/com/care/common/config/RedisConfig.java

@@ -0,0 +1,39 @@
+package com.care.common.config;
+
+import com.care.common.cache.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    @Autowired
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory);
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
+        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+
+
+        return redisTemplate;
+    }
+
+    @Bean(name = "redisUtil")
+    @Autowired
+    public RedisUtil redisUtil(RedisTemplate<String, Object> redisTemplate) {
+        RedisUtil redisUtil = new RedisUtil();
+        redisUtil.setRedisTemplate(redisTemplate);
+        return redisUtil;
+    }
+
+}

src/main/java/com/care/common/entity/CareEventOrder.java

@@ -17,7 +17,7 @@ import java.util.Date;
  * 事件定单表(CareEventOrder)实体类
  *
  * @author makejava
- * @since 2021-05-21 00:08:29
+ * @since 2021-05-27 23:33:24
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_event_order")
 @ApiModel(value = "事件定单表", description = "")
 public class CareEventOrder implements Serializable {
-    private static final long serialVersionUID = -78566992201198077L;
+    private static final long serialVersionUID = -76796386405624927L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -37,22 +37,37 @@ public class CareEventOrder implements Serializable {
     private Long orgId;
 
 
+    @ApiModelProperty("机构名称")
+    @TableField("ORG_NAME")
+    private String orgName;
+
+
     @ApiModelProperty("服务站ID")
     @TableField("STATION_ID")
     private Long stationId;
 
 
+    @ApiModelProperty("服务站名称")
+    @TableField("STATION_NAME")
+    private String stationName;
+
+
     @ApiModelProperty("被监护人ID")
     @TableField("OLDER_ID")
     private Long olderId;
 
 
+    @ApiModelProperty("被监护人姓名")
+    @TableField("OLDER_NAME")
+    private String olderName;
+
+
     @ApiModelProperty("工单标题")
     @TableField("TITLE")
     private String title;
 
 
-    @ApiModelProperty("工单分类： 1：跌倒 2：久滞 3坠床 4主动呼叫 5室外呼叫")
+    @ApiModelProperty("工单分类： 1：跌倒 2：久滞 3坠床 4主动呼叫 5户外呼叫")
     @TableField("ORDER_TYPE")
     private String orderType;
 
@@ -67,9 +82,14 @@ public class CareEventOrder implements Serializable {
     private Date createTime;
 
 
-    @ApiModelProperty("修改人ID")
-    @TableField("MODIFY_USER")
-    private Long modifyUser;
+    @ApiModelProperty("坐席ID")
+    @TableField("SEAT_ID")
+    private Long seatId;
+
+
+    @ApiModelProperty("坐席姓名")
+    @TableField("SEAT_NAME")
+    private String seatName;
 
 
     @ApiModelProperty("modifyTime")
@@ -77,4 +97,14 @@ public class CareEventOrder implements Serializable {
     private Date modifyTime;
 
 
+    @ApiModelProperty("归档时间")
+    @TableField("FILING_TIME")
+    private Date filingTime;
+
+
+    @ApiModelProperty("完成时间")
+    @TableField("COMPLETE_TIME")
+    private Date completeTime;
+
+
 }

src/main/java/com/care/common/entity/CareEventOrderContactStatus.java

@@ -57,7 +57,7 @@ public class CareEventOrderContactStatus implements Serializable {
     private Long contactId;
 
 
-    @ApiModelProperty("状态：1联系超时,2赶往现场,3:到达 4:已获门锁权限 ")
+    @ApiModelProperty("状态：1未联系,2未接通,3:已赶往 4:已到达 5已获取钥匙 ")
     @TableField("STATUS")
     private String status;
 

src/main/java/com/care/common/entity/CareEventOrderHandleHis.java

@@ -58,21 +58,16 @@ public class CareEventOrderHandleHis implements Serializable {
 
 
     @ApiModelProperty("处理人ID")
-    @TableField("HANDLOR_ID")
-    private Long handlorId;
+    @TableField("SEAT_ID")
+    private Long seatId;
 
 
     @ApiModelProperty("处理人姓名")
-    @TableField("HANDLOR_NAME")
-    private String handlorName;
+    @TableField("SEAT_NAME")
+    private String seatName;
 
 
-    @ApiModelProperty("相关照片")
-    @TableField("RELATED_PIC")
-    private String relatedPic;
-
-
-    @ApiModelProperty("createTime")
+     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")
     private Date createTime;
 

src/main/java/com/care/common/enums/OlderStatusEnum.java

@@ -0,0 +1,53 @@
+package com.care.common.enums;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * @Author:java
+ * @Date: 2021/05/27
+ */
+public enum OlderStatusEnum {
+    /**
+     *
+     */
+    ZHENGCHANG("10","正常"),
+    LIKAI_FANGJIAN("11","离开房间"),
+    JIUZHI("21","久滞"),
+    DIEDAO("22",""),
+    ZHUICHUANG("23","坠床"),
+    ZHUDONGHUJIAO("31","4主动呼叫"),
+    HUWAIHUJIAO("32","户外呼叫");
+    private String value;
+    private String name;
+    OlderStatusEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public String getValue() {
+        return value;
+    }
+
+    public static String getCodeToName(String code){
+        if (StrUtil.isEmpty(code)){
+            return null;
+        }
+        if (ZHENGCHANG.getValue().equals(code)){
+            return  ZHENGCHANG.name;
+        }else if (LIKAI_FANGJIAN.getValue().equals(code)){
+            return  LIKAI_FANGJIAN.name;
+        }else if (DIEDAO.getValue().equals(code)){
+            return  DIEDAO.name;
+        }else if (JIUZHI.getValue().equals(code)){
+            return JIUZHI.name;
+        }else if (ZHUICHUANG.getValue().equals(code)){
+            return ZHUICHUANG.name;
+        }else if (ZHUDONGHUJIAO.getValue().equals(code)){
+            return ZHUDONGHUJIAO.name;
+        }else if (HUWAIHUJIAO.getValue().equals(code)){
+            return HUWAIHUJIAO.name;
+        }
+
+        return null;
+    }
+}

src/main/java/com/care/common/enums/OrderStatusEnum.java

@@ -0,0 +1,48 @@
+package com.care.common.enums;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * @Author:java
+ * @Date: 2021/05/27
+ */
+public enum OrderStatusEnum {
+
+    /**
+     *
+     */
+    TODO("0","未处理"),
+    DOING("1","处理中"),
+    CANCEL("2","已完成"),
+    DONE("3","主动取消"),
+    FILING("4","已归档");
+    private String value;
+    private String name;
+    OrderStatusEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public String getValue() {
+        return value;
+    }
+
+    public static String getCodeToName(String code){
+        if (StrUtil.isEmpty(code)){
+            return null;
+        }
+        if (TODO.getValue().equals(code)){
+            return  TODO.name;
+        }else if (DOING.getValue().equals(code)){
+            return DOING.name;
+        }else if (CANCEL.getValue().equals(code)){
+            return CANCEL.name;
+        }else if (DONE.getValue().equals(code)){
+            return DONE.name;
+        }else if (FILING.getValue().equals(code)){
+            return FILING.name;
+        }
+
+        return null;
+    }
+}

src/main/java/com/care/common/enums/OrderTypeEnum.java

@@ -0,0 +1,48 @@
+package com.care.common.enums;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * @Author:java
+ * @Date: 2021/05/27
+ */
+public enum OrderTypeEnum {
+
+    /**
+     * 1：跌倒 2：久滞 3坠床 4主动呼叫 5户外呼叫
+     */
+    DIEDAO("21","跌倒"),
+    JIUZHI("22","久滞"),
+    ZHUICHUANG("23","坠床"),
+    ZHUDONGHUJIAO("31","主动呼叫"),
+    HUWAIHUJIAO("32","户外呼叫");
+    private String value;
+    private String name;
+    OrderTypeEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public String getValue() {
+        return value;
+    }
+
+    public static String getCodeToName(String code){
+        if (StrUtil.isEmpty(code)){
+            return null;
+        }
+        if (DIEDAO.getValue().equals(code)){
+            return  DIEDAO.name;
+        }else if (JIUZHI.getValue().equals(code)){
+            return JIUZHI.name;
+        }else if (ZHUICHUANG.getValue().equals(code)){
+            return ZHUICHUANG.name;
+        }else if (ZHUDONGHUJIAO.getValue().equals(code)){
+            return ZHUDONGHUJIAO.name;
+        }else if (HUWAIHUJIAO.getValue().equals(code)){
+            return HUWAIHUJIAO.name;
+        }
+
+        return null;
+    }
+}

src/main/java/com/care/common/interceptor/ControllerInterceptor.java

@@ -5,6 +5,7 @@ import com.care.common.annotation.LogModule;
 import com.care.common.annotation.LoginedUser;
 import com.care.common.annotation.Permission;
 import com.care.common.constant.Constants;
+import com.care.common.util.PageResult;
 import com.care.common.util.Result;
 import com.care.common.util.ResultCode;
 import com.care.common.util.WebPageUtils;
@@ -112,7 +113,7 @@ public class ControllerInterceptor {
                 if (isLoginRequired(pjp.getTarget().getClass(), method)) {
                     logger.debug("请求异常: 该接口需要登录后进行操作. 请先登录", methodName, System.currentTimeMillis() - beginTime);
                     logger.debug("请求结束，方法：{} -> 耗时：{}ms", methodName, System.currentTimeMillis() - beginTime);
-                    return new Result(ResultCode.NO_LOGINED, "该操作需要登录.",null);
+                    return new PageResult(ResultCode.NO_LOGINED, "该操作需要登录.",null);
                 }
             }
             /**
@@ -156,7 +157,7 @@ public class ControllerInterceptor {
             }
         } catch (Throwable e) {
             logger.error("exception: ", e);
-            result = new Result(ResultCode.UNKNOWN, StrUtil.isNotBlank(e.getMessage()) ? e.getMessage() : "请求服务器出现异常, 请稍后重试.",null);
+            result = new PageResult(ResultCode.UNKNOWN, StrUtil.isNotBlank(e.getMessage()) ? e.getMessage() : "请求服务器出现异常, 请稍后重试.",null);
         }
         if (result instanceof Result) {
             logger.debug("请求结束，方法：{} -> 耗时：{}ms", methodName, System.currentTimeMillis() - beginTime);

src/main/java/com/care/common/service/CareEventOrderService.java

@@ -1,14 +0,0 @@
-package com.care.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.care.common.entity.CareEventOrder;
-
-/**
- * 事件定单表(CareEventOrder)表服务接口
- *
- * @author makejava
- * @since 2021-05-21 00:08:29
- */
-public interface CareEventOrderService extends IService<CareEventOrder> {
-
-}

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -1,18 +0,0 @@
-package com.care.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.care.common.entity.CareEventOrder;
-import com.care.common.mapper.CareEventOrderMapper;
-import com.care.common.service.CareEventOrderService;
-import org.springframework.stereotype.Service;
-
-/**
- * 事件定单表(CareEventOrder)表服务实现类
- *
- * @author makejava
- * @since 2021-05-21 00:08:29
- */
-@Service
-public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper, CareEventOrder> implements CareEventOrderService {
-
-}

src/main/java/com/care/common/util/JwtUtils.java

@@ -8,10 +8,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.crypto.SecretKey;

src/main/java/com/care/common/vo/PageReqVO.java

@@ -19,6 +19,9 @@ public class PageReqVO {
 
     @ApiModelProperty(value = "数量")
     private Integer pageSize;
+    private String orderField;
+
+    private String orderBy;
 
     public PageReqVO(){
         this.current = 1;

src/main/java/com/care/common/vo/PageResVO.java

@@ -1,10 +1,13 @@
 package com.care.common.vo;
 
+import lombok.Data;
+
 /**
  * 与页面交互的分页数据类
  * @author little
  * @since 2021-01-02
  */
+@Data
 public class PageResVO {
     /**
      * 当前页
@@ -27,37 +30,4 @@ public class PageResVO {
         this.pageSize = pageSize;
         this.total = total;
     }
-
-    public long getCurrent() {
-        return current;
-    }
-
-    public void setCurrent(long current) {
-        this.current = current;
-    }
-
-    public long getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(long pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public long getTotal() {
-        return total;
-    }
-
-    public void setTotal(long total) {
-        this.total = total;
-    }
-
-    @Override
-    public String toString() {
-        return "Page{" +
-                "current=" + current +
-                ", pageSize=" + pageSize +
-                ", total=" + total +
-                '}';
-    }
 }

src/main/java/com/care/common/vo/UserLogindConvertVO.java

@@ -24,7 +24,7 @@ public class UserLogindConvertVO {
     private String orgName;
 
 
-    @ApiModelProperty("服务站ID，角色未坐席时，该字段可能未空")
+    @ApiModelProperty("服务站ID，角色为坐席时，该字段可能未空")
     private Long stationId;
     @ApiModelProperty("机构名称")
     private String stationName;

src/main/java/com/care/common/vo/event/CareEventOrderVO.java

@@ -0,0 +1,94 @@
+package com.care.common.vo.event;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 事件定单表(CareEventOrder)实体类
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:29
+ */
+
+@Data
+public class CareEventOrderVO implements Serializable {
+    private static final long serialVersionUID = -78566992201198077L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("机构ID")
+    private Long orgId;
+
+
+    @ApiModelProperty("机构名称")
+    private String orgName;
+
+
+    @ApiModelProperty("服务站ID")
+    private Long stationId;
+
+
+    @ApiModelProperty("服务站名称")
+    private String stationName;
+
+
+    @ApiModelProperty("被监护人ID")
+    private Long olderId;
+
+
+    @ApiModelProperty("被监护人姓名")
+    private String olderName;
+
+
+    @ApiModelProperty("工单标题")
+    private String title;
+
+
+    @ApiModelProperty("工单分类： 1：跌倒 2：久滞 3坠床 4主动呼叫 5户外呼叫")
+    private String orderType;
+    private String orderTypeName;
+
+
+    @ApiModelProperty("状态：0未处理，1处理中，2已完成，3主动取消，4已归档")
+    private String status;
+    private String statusName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+
+    @ApiModelProperty("坐席ID")
+    private Long seatId;
+
+
+    @ApiModelProperty("坐席姓名")
+    private String seatName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("modifyTime")
+    private Date modifyTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("归档时间")
+    private Date filingTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("完成时间")
+    private Date completeTime;
+
+
+}

src/main/resources/mybatis/CareEventOrderMapper.xml

@@ -1,6 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.care.common.mapper.CareEventOrderMapper">
-   
+   <select id="selectBigScreenStatistics" resultType="com.care.common.entity.CareEventOrder">
+        SELECT
+        sum(older_amount) olderAmount,
+        sum(older_60_80_amount) older6080Amount,
+        convert(sum(older_60_80_amount)/sum(older_amount),decimal(20,2)) older6080Rate,
+        sum(older_80_above_amount) older80AboveAmount,
+        convert(sum(older_80_above_amount)/sum(older_amount),decimal(20,2)) older80AboveRate,
+        sum(alone_living_amount) aloneLivingAmount,
+        convert(sum(alone_living_amount)/sum(older_amount),decimal(20,2)) aloneLivingRate,
+        sum(no_alone_living_amount) noAloneLivingAmount,
+        convert(sum(no_alone_living_amount)/sum(older_amount),decimal(20,2)) noAloneLivingRate,
+        sum(concentrate_living_amount) concentrateLivingAmount,
+        convert(sum(concentrate_living_amount)/sum(older_amount),decimal(20,2)) concentrateLivingRate,
+        sum(other_living_amount) otherLivingAmount,
+        convert(sum(other_living_amount)/sum(older_amount),decimal(20,2)) otherLivingRate,
+        sum(one_level_amount) oneLevelAmount,
+        sum(two_level_amount) twoLevelAmount,
+        sum(three_level_amount) threeLevelAmount,
+        sum(chamberlain_amount) chamberlainAmount,
+        convert(sum(older_amount)/sum(chamberlain_amount),decimal(20,2)) serveAmountAvg,
+        sum(serve_amount) serveAmount,
+        sum(device_amount) deviceAmount,
+        convert(sum(indoor_online_amount)/(sum(indoor_online_amount) + sum(indoor_offline_amount)),decimal(20,2)) indoorOnlineRate,
+        sum(indoor_online_amount) indoorOnlineAmount,
+        sum(indoor_offline_amount) indoorOfflineAmount,
+        convert(sum(outdoor_online_amount)/(sum(outdoor_online_amount) + sum(outdoor_offline_amount)),decimal(20,2)) outdoorOnlineRate,
+        sum(outdoor_online_amount) outdoorOnlineAmount,
+        sum(outdoor_offline_amount) outdoorOfflineAmount,
+        sum(rt_event_amount) rtEventAmount,
+        sum(rt_fall_amount) rtFallAmount,
+        sum(rt_stagnation_amount) rtStagnationAmount,
+        sum(rt_falling_bed_amount) rtFallingBedAmount,
+        sum(rt_active_call_amount) rtActiveCallAmount,
+        sum(rt_outdoors_call_amount) rtOutdoorsCallAmount,
+        sum(his_event_amount) hisEventAmount,
+        sum(his_fall_amount) hisFallAmount,
+        sum(his_stagnation_amount) hisStagnationAmount,
+        sum(his_falling_bed_amount) hisFallingBedAmount,
+        sum(his_active_call_amount) hisActiveCallAmount,
+        sum(his_outdoors_call_amount) hisOutdoorsCallAmount,
+        sum(seats_amount) seatsAmount,
+        convert(sum(seats_online_duration)/3600,decimal(20,2)) seatsOnlineDuration
+        FROM st_station t
+        <where>
+            1 = 1
+            <if test="stationId != null and stationId != ''">
+                AND t.station_id = #{stationId}
+            </if>
+            <if test="orgId != null and orgId != ''">
+                AND t.org_id = #{orgId}
+            </if>
+        </where>
+    </select>
 
 </mapper>