频安管家

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.care.bms.service.BmsEventOrderService;
 import com.care.common.entity.CareEventOrderChamb;
 import com.care.common.enums.CallResultEnum;
-import com.care.common.vo.event.*;
+import com.care.common.vo.order.*;
 import com.care.common.annotation.Permission;
 import com.care.common.enums.OrderStatusEnum;
 import com.care.common.exception.BDException;

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

@@ -18,7 +18,7 @@ import com.care.common.exception.BDException;
 import com.care.common.service.*;
 import com.care.common.vo.PageReqVO;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.event.*;
+import com.care.common.vo.order.*;
 import com.care.common.vo.outcall.CcCallResultVO;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;

src/main/java/com/care/client/controller/EventApiController.java

@@ -1,31 +1,15 @@
 package com.care.client.controller;
 
-import com.alibaba.excel.EasyExcelFactory;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.BmsEventOrderService;
 import com.care.client.service.PinanbaoService;
-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.Result;
-import com.care.common.util.WebPageUtils;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.event.*;
-import com.care.common.vo.outcall.CcCallResultVO;
+import com.care.common.vo.order.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedInputStream;
 import java.util.List;
 
 /**

src/main/java/com/care/client/service/PinanbaoService.java

@@ -14,8 +14,8 @@ import com.care.common.enums.RelationTypeEnum;
 import com.care.common.exception.BDException;
 import com.care.common.service.*;
 import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.event.EventOrderVO;
-import com.care.common.vo.event.OrderHandleHisVO;
+import com.care.common.vo.order.EventOrderVO;
+import com.care.common.vo.order.OrderHandleHisVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;

src/main/java/com/care/common/mapper/CareEventOrderChambMapper.java

@@ -2,9 +2,9 @@ package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.common.entity.CareEventOrder;
 import com.care.common.entity.CareEventOrderChamb;
-import com.care.common.vo.event.ChambEventOrderVO;
+import com.care.common.vo.order.ChambEventOrderCountVO;
+import com.care.common.vo.order.ChambEventOrderVO;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -39,4 +39,11 @@ public interface CareEventOrderChambMapper extends BaseMapper<CareEventOrderCham
      * @return
      */
     IPage<ChambEventOrderVO>  queryDoneEventByChambId(IPage<ChambEventOrderVO> page,@Param("chambId") Long chambId);
+
+    /**
+     * 管家的工单统计
+     * @param chambId
+     * @return
+     */
+    ChambEventOrderCountVO getOrderCountByChambId(@Param("chambId") Long chambId);
 }

src/main/java/com/care/common/mapper/CareEventOrderMapper.java

@@ -2,7 +2,7 @@ package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareEventOrder;
-import com.care.common.vo.event.EventStaVO;
+import com.care.common.vo.order.EventStaVO;
 import org.apache.ibatis.annotations.Param;
 
 

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

@@ -2,12 +2,10 @@ package com.care.common.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.entity.CareEventOrderChamb;
 import com.care.common.vo.PageReqVO;
-import com.care.common.vo.event.ChambEventOrderVO;
-import com.care.common.vo.event.EventOrderVO;
-import org.apache.ibatis.annotations.Param;
+import com.care.common.vo.order.ChambEventOrderCountVO;
+import com.care.common.vo.order.ChambEventOrderVO;
 
 /**
  * 管家工单(CareEventOrderChamb)表服务接口
@@ -39,4 +37,11 @@ public interface CareEventOrderChambService extends IService<CareEventOrderChamb
      * @return
      */
     IPage<ChambEventOrderVO>  queryDoneEventByChambId(PageReqVO pageReqVo,Long chambId);
+    /**
+     * 管家工单统计
+     * @param chambId
+     * @return
+     */
+
+    ChambEventOrderCountVO getOrderCountByChambId(Long chambId);
 }

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

@@ -2,8 +2,7 @@ package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareEventOrder;
-import com.care.common.vo.event.EventStaVO;
-import org.apache.ibatis.annotations.Param;
+import com.care.common.vo.order.EventStaVO;
 
 /**
  * 事件定单表(CareEventOrder)表服务接口

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

@@ -9,7 +9,8 @@ import com.care.common.enums.ChambOrderStatusEnum;
 import com.care.common.mapper.CareEventOrderChambMapper;
 import com.care.common.service.CareEventOrderChambService;
 import com.care.common.vo.PageReqVO;
-import com.care.common.vo.event.ChambEventOrderVO;
+import com.care.common.vo.order.ChambEventOrderCountVO;
+import com.care.common.vo.order.ChambEventOrderVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -77,4 +78,14 @@ public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderCh
         }
         return pageRes;
     }
+
+    /**
+     * 管家工单统计
+     * @param chambId
+     * @return
+     */
+    @Override
+    public ChambEventOrderCountVO getOrderCountByChambId(Long chambId){
+        return  this.baseMapper.getOrderCountByChambId(chambId);
+    }
 }

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

@@ -9,7 +9,7 @@ import com.care.common.entity.*;
 import com.care.common.enums.*;
 import com.care.common.mapper.CareEventOrderMapper;
 import com.care.common.service.*;
-import com.care.common.vo.event.EventStaVO;
+import com.care.common.vo.order.EventStaVO;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,14 +1,9 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
-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 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;

src/main/java/com/care/common/vo/order/ChambEventOrderCountVO.java

@@ -0,0 +1,21 @@
+package com.care.common.vo.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/12
+ * @Desc:
+ */
+@Data
+@ApiModel(value = "管家工单统计", description = "")
+public class ChambEventOrderCountVO {
+    @ApiModelProperty("未处理数量")
+    private Integer  todoCount;
+    @ApiModelProperty("处理中数量")
+    private Integer doingCount;
+    @ApiModelProperty("已完成数量")
+    private  Integer doneCount;
+}

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

@@ -1,14 +1,10 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 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 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;

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

@@ -1,4 +1,4 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,9 +1,7 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.care.common.entity.CareHouse;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 事件-紧急联系人/管家状态(CareEventOrderContactStatus)实体类

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

@@ -1,7 +1,6 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

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

@@ -1,14 +1,10 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 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 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;

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

@@ -1,7 +1,6 @@
-package com.care.common.vo.event;
+package com.care.common.vo.order;
 
 import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -6,7 +6,7 @@ import com.care.common.service.FileUploadService;
 import com.care.common.util.PageResult;
 import com.care.common.util.Result;
 import com.care.common.vo.PageReqVO;
-import com.care.common.vo.event.*;
+import com.care.common.vo.order.*;
 import com.care.keeper.service.KeeperApiService;
 import com.care.keeper.service.KeeperPassportService;
 import com.care.keeper.vo.HouseContactVO;
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -126,36 +125,6 @@ public class KeeperEventApiController {
         return  Result.success("申请成功！");
     }
 
-    @GetMapping("/getKeeperStatus")
-    @ApiOperation(tags = {"事件处理"},value = "获取管家当前的状态进度条")
-    public Result<List<Map<String,Object>>> getKeeperStatus(@RequestParam("chambOrderId") Long chambOrderId){
-        List<Map<String,Object>> datas = new ArrayList<>();
-        Map<String,Object> map1 = new HashMap<>();
-        map1.put("code",1);
-        map1.put("color","blue");
-        datas.add(map1);
-        Map<String,Object> map2 = new HashMap<>();
-        map2.put("code",2);
-        map2.put("color","blue");
-        datas.add(map2);
-        Map<String,Object> map3 = new HashMap<>();
-        map3.put("code",3);
-        map3.put("color","blue");
-        datas.add(map3);
-        ChambEventOrderVO orderVO = this.keeperApiService.getChambOrder(chambOrderId);
-        if (orderVO!=null ){
-            if (orderVO.getDaodaTime()!=null && orderVO.getLikaiTime()==null){
-                datas.get(0).put("color","red");
-                datas.get(1).put("color","red");
-            }else if (orderVO.getDaodaTime()!=null && orderVO.getLikaiTime()!=null){
-                datas.get(0).put("color","red");
-                datas.get(1).put("color","red");
-                datas.get(2).put("color","red");
-            }
-        }
-        return  Result.success("查询成功！",datas);
-    }
-
     @PostMapping("/daoda")
     @ApiOperation(tags = {"事件处理"},value = "到达确认")
     public Result<Object> daoDaConfirm(@RequestParam("chambOrderId") Long chambOrderId){
@@ -169,7 +138,7 @@ public class KeeperEventApiController {
 
     @PostMapping("/likai")
     @ApiOperation(tags = {"事件处理"},value = "离开确认")
-    public Result<Object> liKaiConfirm(@RequestParam("chambOrderId") Long chambOrderId,@RequestParam("remark") String remark,@RequestParam("chambOrderId") String scenePic){
+    public Result<Object> liKaiConfirm(@RequestParam("chambOrderId") Long chambOrderId,@RequestParam("remark") String remark,@RequestParam("scenePic") String scenePic){
         if (this.keeperApiService.liKaiConfirm(chambOrderId,remark,scenePic)){
             return  Result.success("离开确认成功！");
         }else{
@@ -193,8 +162,38 @@ public class KeeperEventApiController {
     @PostMapping(value = "/img/upload", headers="content-type=multipart/form-data",produces = "application/json;charset=UTF-8")
     public Result<String> imgUpload( @ApiParam(value="图片",required=true) MultipartFile file,
                                          @RequestHeader(name = "token") String token) {
-            KeeperInfoVO current = this.keeperPassportService.checkToken(token);
+        KeeperInfoVO current = this.keeperPassportService.checkToken(token);
             String url = fileUploadService.upload(file,"order");
             return  Result.success("上传成功！",url);
     }
+
+    @GetMapping("/getKeeperStatus")
+    @ApiOperation(tags = {"事件处理"},value = "获取管家当前的状态 0:未到达 1 到达、服务中  2 离开")
+    public Result<Integer> getKeeperStatus(@RequestParam("chambOrderId") Long chambOrderId){
+        Integer status = 0;
+        ChambEventOrderVO orderVO = this.keeperApiService.getChambOrder(chambOrderId);
+        if (orderVO!=null ){
+            if (orderVO.getDaodaTime()!=null && orderVO.getLikaiTime()==null){
+                status = 1;
+            }else if (orderVO.getDaodaTime()!=null && orderVO.getLikaiTime()!=null){
+                status = 2 ;
+            }
+        }
+        return  Result.success("查询成功！",status);
+    }
+
+
+    @GetMapping("/getFuwuCount")
+    @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));
+    }
+
+    @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()));
+    }
 }

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

@@ -6,8 +6,6 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.care.client.vo.MemberInfoVO;
 import com.care.common.cache.RedisKeyConstant;
 import com.care.common.cache.RedisUtil;
 import com.care.common.entity.*;
@@ -15,17 +13,13 @@ import com.care.common.enums.*;
 import com.care.common.exception.BDException;
 import com.care.common.service.*;
 import com.care.common.vo.PageReqVO;
-import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.event.*;
-import com.care.keeper.vo.DeviceMonitorVO;
+import com.care.common.vo.order.*;
 import com.care.keeper.vo.HouseContactVO;
 import com.care.keeper.vo.KeeperInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -335,4 +329,13 @@ public class KeeperApiService {
         }
         return result;
     }
+
+    /**
+     * 管家工单统计
+     * @param chambId
+     * @return
+     */
+    public ChambEventOrderCountVO getOrderCountByChambId(Long chambId){
+        return  this.careEventOrderChambService.getOrderCountByChambId(chambId);
+    }
 }

src/main/resources/mybatis/CareEventOrderChambMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.care.common.mapper.CareEventOrderChambMapper">
 
-    <select id="queryTodoEventByChambId" resultType="com.care.common.vo.event.ChambEventOrderVO">
+    <select id="queryTodoEventByChambId" resultType="com.care.common.vo.order.ChambEventOrderVO">
         select
             ceoc.*,
             ceo.title
@@ -16,7 +16,7 @@
         order by ceo.create_time asc
     </select>
 
-    <select id="queryDoingEventByChambId" resultType="com.care.common.vo.event.ChambEventOrderVO">
+    <select id="queryDoingEventByChambId" resultType="com.care.common.vo.order.ChambEventOrderVO">
         select
             ceoc.*,
             ceo.title
@@ -30,7 +30,7 @@
         order by ceo.create_time asc
     </select>
 
-    <select id="queryDoneEventByChambId" resultType="com.care.common.vo.event.ChambEventOrderVO">
+    <select id="queryDoneEventByChambId" resultType="com.care.common.vo.order.ChambEventOrderVO">
         select
             ceoc.*,
             ceo.title
@@ -43,4 +43,30 @@
         order by ceo.create_time asc
     </select>
 
+    <select id="getOrderCountByChambId" resultType="com.care.common.vo.order.ChambEventOrderCountVO">
+        select
+
+			(select
+           count(1)
+			from care_event_order_chamb ceoc left join care_event_order ceo on ceo.id = ceoc.order_id
+			where
+			   ( ceo.status = '0' or ceo.status = '1')
+            and ceoc.status = 0
+            and ceoc.chamb_id = #{chambId} ) todoCount,
+
+				(select
+           count(1)
+			from care_event_order_chamb ceoc left join care_event_order ceo on ceo.id = ceoc.order_id
+			where
+			   ( ceo.status = '0' or ceo.status = '1')
+            and ceoc.status = 1
+            and ceoc.chamb_id = #{chambId} ) doingCount,
+
+			(select
+           count(1)
+			from care_event_order_chamb ceoc left join care_event_order ceo on ceo.id = ceoc.order_id
+			where
+			  ceoc.status = 2 and ceoc.chamb_id = #{chambId} )  doneCount
+    </select>
+
 </mapper>

src/main/resources/mybatis/CareEventOrderMapper.xml

@@ -2,7 +2,7 @@
 <!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="statOrder" resultType="com.care.common.vo.event.EventStaVO">
+    <select id="statOrder" resultType="com.care.common.vo.order.EventStaVO">
         select
             count(1) as allCount,
             count(if(status='0',1,null)) as notDoCount,
@@ -19,7 +19,7 @@
         </where>
     </select>
 
-    <select id="queryOrderOlderList" resultType="com.care.common.vo.event.OrderOlderVO">
+    <select id="queryOrderOlderList" resultType="com.care.common.vo.order.OrderOlderVO">
         select
             co.*,
             case when (select count(1) from cc_call_result ccr where ccr.house_id=co.house_id and ccr.phone = co.phone)>=1