初始化

pom.xml

@@ -3,11 +3,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.care</groupId>
-    <artifactId>care-server</artifactId>
+    <groupId>com.iden</groupId>
+    <artifactId>iden-server</artifactId>
 
     <version>1.0-RELEASE</version>
-    <name>care</name>
+    <name>iden</name>
 
 
     <!--父项目依赖-->

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

@@ -1,573 +0,0 @@
-package com.care.bigscreen.controller;
-
-
-import cn.hutool.core.collection.CollUtil;
-import com.care.bigscreen.service.BigScreenService;
-import com.care.bigscreen.vo.*;
-
-import com.care.common.enums.OlderLiveTypeEnum;
-import com.care.common.vo.PageResVO;
-import com.care.common.util.PageResult;
-import com.care.common.util.PageUtil;
-import com.care.common.util.Result;
-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 java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @author javadoc
- * @version 1.0
- * @description 大屏控制器
- * @date
- */
-@Slf4j
-@RestController
-@RequestMapping("/bms/bigscreen")
-public class BigScreenController {
-
-    @Autowired
-    private BigScreenService bigScreenService;
-
-    /////////////////////////////////////////////////////////运营商大屏////////////////////////////////////////////////////
-    /**
-     * 运营商大屏统计查询
-     */
-    @ApiOperation(value = "运营商大屏统计查询", notes = "运营商大屏统计查询")
-    @GetMapping("/selectBigScreenStatisticsByOp")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息")
-    })
-    public Result<OpBigScreenStatisticsVO> selectBigScreenStatisticsByOp(@RequestHeader("token") String token) {
-        try {
-            OpBigScreenStatisticsVO opBigScreenStatisticsVO =  bigScreenService.selectBigScreenStatisticsByOp(null);
-            return Result.success(opBigScreenStatisticsVO);
-        } catch (Exception e) {
-           log.error("运营商大屏统计查询出现异常",e);
-            return Result.error("系统错误，运营商大屏统计查询失败");
-        }
-    }
-
-
-    /**
-     * 运营商大屏的站点统计查询
-     */
-    @ApiOperation(value = "运营商大屏的站点统计查询", notes = "运营商大屏的站点统计查询")
-    @GetMapping("/selectOpBigScreenStatisticsByStation")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<OpBigScreenStatisticsVO> selectOpBigScreenStatisticsByStation(@RequestHeader("token") String token, Long stationId) {
-        try {
-            OpBigScreenStatisticsVO opBigScreenStatisticsVO =  bigScreenService.selectBigScreenStatisticsByOp(stationId);
-            return Result.success(opBigScreenStatisticsVO);
-        } catch (Exception e) {
-            log.error("运营商大屏的站点统计查询出现异常",e);
-            return Result.error("系统错误，运营商大屏的站点统计查询失败");
-        }
-    }
-
-    /**
-     * 运营商大屏的根据经纬度查询统计值
-     */
-    @ApiOperation(value = "运营商大屏的根据经纬度查询统计值", notes = "运营商大屏的根据经纬度查询统计值")
-    @GetMapping("/selectOpBigScreenStatisticsByLongitudeLatitude")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "longitudeLeftUp", value = "左上经度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "latitudeLeftUp", value = "左上维度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "longitudeRightDown", value = "右下经度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "latitudeRightDown", value = "右下维度", dataTypeClass = String.class,required = true)
-            }
-    )
-    public Result<OpBigScreenStatisticsVO> selectOpBigScreenStatisticsByLongitudeLatitude(@RequestHeader("token") String token, String longitudeLeftUp, String latitudeLeftUp, String longitudeRightDown, String latitudeRightDown) {
-        try {
-            OpBigScreenStatisticsVO opBigScreenStatisticsVO =  bigScreenService.selectOpBigScreenStatisticsByLongitudeLatitude(longitudeLeftUp,latitudeLeftUp,longitudeRightDown,latitudeRightDown);
-            return Result.success(opBigScreenStatisticsVO);
-        } catch (Exception e) {
-            log.error("运营商大屏或机构大屏的根据经纬度查询统计值出现异常",e);
-            return Result.error("系统错误，运营商大屏或机构大屏的根据经纬度查询统计值失败");
-        }
-    }
-
-    /**
-     * 运营商大屏的站点列表查询
-     */
-    @ApiOperation(value = "运营商大屏的站点列表查询", notes = "运营商大屏的站点列表查询")
-    @GetMapping("/selectOpBigScreenStationList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息")
-            }
-    )
-    public Result<List<BigScreenStationVO>> selectOpBigScreenStationList(@RequestHeader("token") String token) {
-        try {
-            List<BigScreenStationVO> bigScreenStationVOList =  bigScreenService.selectBigScreenStationList(null);
-            return Result.success(bigScreenStationVOList);
-        } catch (Exception e) {
-            log.error("运营商大屏的站点列表查询出现异常",e);
-            return Result.error("系统错误，运营商大屏的站点列表查询失败");
-        }
-    }
-
-    /////////////////////////////////////////////////////////机构大屏////////////////////////////////////////////////////
-    /**
-     * 机构大屏统计查询
-     */
-    @ApiOperation(value = "机构大屏统计查询", notes = "机构大屏统计查询")
-    @GetMapping("/selectBigScreenStatisticsByOrg")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<OrgBigScreenStatisticsVO> selectBigScreenStatisticsByOrg(@RequestHeader("token") String token, Long orgId) {
-        try {
-            OrgBigScreenStatisticsVO orgBigScreenStatisticsVO =  bigScreenService.selectBigScreenStatisticsByOrg(null,orgId);
-            return Result.success(orgBigScreenStatisticsVO);
-        } catch (Exception e) {
-            log.error("机构大屏统计查询异常",e);
-            return Result.error("系统错误，机构大屏统计查询失败");
-        }
-    }
-    /**
-     * 机构大屏的站点统计查询
-     */
-    @ApiOperation(value = "机构大屏的站点统计查询", notes = "机构大屏的站点统计查询")
-    @GetMapping("/selectOrgBigScreenStatisticsByStation")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<OrgBigScreenStatisticsVO> selectOrgBigScreenStatisticsByStation(@RequestHeader("token") String token, Long stationId) {
-        try {
-            OrgBigScreenStatisticsVO orgBigScreenStatisticsVO =  bigScreenService.selectBigScreenStatisticsByOrg(stationId,null);
-            return Result.success(orgBigScreenStatisticsVO);
-        } catch (Exception e) {
-            log.error("运营商大屏或机构大屏的站点统计查询出现异常",e);
-            return Result.error("系统错误，运营商大屏或机构大屏的站点统计查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的根据经纬度查询统计值
-     */
-    @ApiOperation(value = "机构大屏的根据经纬度查询统计值", notes = "机构大屏的根据经纬度查询统计值")
-    @GetMapping("/selectOrgBigScreenStatisticsByLongitudeLatitude")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "longitudeLeftUp", value = "左上经度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "latitudeLeftUp", value = "左上维度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "longitudeRightDown", value = "右下经度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "latitudeRightDown", value = "右下维度", dataTypeClass = String.class,required = true),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<OrgBigScreenStatisticsVO> selectOrgBigScreenStatisticsByLongitudeLatitude(@RequestHeader("token") String token, String longitudeLeftUp, String latitudeLeftUp, String longitudeRightDown, String latitudeRightDown, Long orgId) {
-        try {
-            OrgBigScreenStatisticsVO orgBigScreenStatisticsVO =  bigScreenService.selectOrgBigScreenStatisticsByLongitudeLatitude(longitudeLeftUp,latitudeLeftUp,longitudeRightDown,latitudeRightDown,orgId);
-            return Result.success(orgBigScreenStatisticsVO);
-        } catch (Exception e) {
-            log.error("机构大屏的根据经纬度查询统计值出现异常",e);
-            return Result.error("系统错误，机构大屏的根据经纬度查询统计值失败");
-        }
-    }
-    /**
-     * 机构大屏的站点列表查询
-     */
-    @ApiOperation(value = "机构大屏的站点列表查询", notes = "机构大屏的站点列表查询")
-    @GetMapping("/selectOrgBigScreenStationList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<List<BigScreenStationVO>> selectOrgBigScreenStationList(@RequestHeader("token") String token,Long orgId) {
-        try {
-            List<BigScreenStationVO> bigScreenStationVOList =  bigScreenService.selectBigScreenStationList(orgId);
-            return Result.success(bigScreenStationVOList);
-        } catch (Exception e) {
-            log.error("机构大屏的站点列表查询出现异常",e);
-            return Result.error("系统错误，机构大屏的站点列表查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的进行中的安全事件列表查询
-     */
-    @ApiOperation(value = "机构大屏的进行中的安全事件列表查询", notes = "机构大屏的进行中的安全事件列表查询")
-    @GetMapping("/selectOrgBigScreenRtEventList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<List<BigScreenEventVO>> selectOrgBigScreenRtEventList(@RequestHeader("token") String token,Long orgId) {
-        try {
-            List<BigScreenEventVO> bigScreenEventVOList =  bigScreenService.selectBigScreenRtEventList(orgId,null);
-            return Result.success(bigScreenEventVOList);
-        } catch (Exception e) {
-            log.error("机构大屏的进行中的安全事件列表查询出现异常",e);
-            return Result.error("系统错误，机构大屏的进行中的安全事件列表查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的设备列表查询
-     */
-    @ApiOperation(value = "机构大屏的设备列表查询", notes = "机构大屏的设备列表查询")
-    @GetMapping("/selectOrgBigScreenDeviceList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true),
-                    @ApiImplicitParam(name = "stationId", value = "服务站ID", dataTypeClass = Long.class,required = false),
-                    @ApiImplicitParam(name = "status", value = "状态：1在线；2：离线", dataTypeClass = String.class,required = false)
-            }
-    )
-    public Result<List<BigScreenDeviceVO>> selectOrgBigScreenDeviceList(@RequestHeader("token") String token,Long orgId,Long stationId,String status) {
-        try {
-            List<BigScreenDeviceVO> bigScreenDeviceVOList =  bigScreenService.selectOrgBigScreenDeviceList(orgId,stationId,status);
-            return Result.success(bigScreenDeviceVOList);
-        } catch (Exception e) {
-            log.error("机构大屏的设备列表查询出现异常",e);
-            return Result.error("系统错误，机构大屏的设备列表查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的年龄与性别分布查询
-     */
-    @ApiOperation(value = "机构大屏的年龄与性别分布查询  --三期新增", notes = "机构大屏的年龄与性别分布查询  --三期新增")
-    @GetMapping("/selectOrgBigScreenAgeSexList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<List<BigScreenAgeSexVO>> selectOrgBigScreenAgeSexList(@RequestHeader("token") String token, Long orgId) {
-        try {
-            List<BigScreenAgeSexVO> result = new ArrayList<>();
-            List<BigScreenAgeSexVO> bigScreenAgeSexVOList =  bigScreenService.selectOrgBigScreenAgeSexList(orgId);
-            if(CollUtil.isNotEmpty(bigScreenAgeSexVOList)){
-                BigScreenAgeSexVO vo40_down = new BigScreenAgeSexVO();
-                vo40_down.setAgeInterval("40以下");
-                BigScreenAgeSexVO vo41_50 = new BigScreenAgeSexVO();
-                vo41_50.setAgeInterval("41-50");
-                BigScreenAgeSexVO vo51_60 = new BigScreenAgeSexVO();
-                vo51_60.setAgeInterval("51-60");
-                BigScreenAgeSexVO vo61_70 = new BigScreenAgeSexVO();
-                vo61_70.setAgeInterval("61-70");
-                BigScreenAgeSexVO vo71_80 = new BigScreenAgeSexVO();
-                vo71_80.setAgeInterval("71-80");
-                BigScreenAgeSexVO vo80_up = new BigScreenAgeSexVO();
-                vo80_up.setAgeInterval("80以上");
-
-                for (BigScreenAgeSexVO vo : bigScreenAgeSexVOList) {
-                    if(vo.getAge().intValue() <= 40){
-                       vo40_down.setManNum(vo40_down.getManNum() + vo.getManNum());
-                       vo40_down.setWomanNum(vo40_down.getWomanNum() + vo.getWomanNum());
-                    } else if(vo.getAge().intValue() >= 41 &&  vo.getAge().intValue() <= 50){
-                        vo41_50.setManNum(vo41_50.getManNum() + vo.getManNum());
-                        vo41_50.setWomanNum(vo41_50.getWomanNum() + vo.getWomanNum());
-                    } else if(vo.getAge().intValue() >= 51 &&  vo.getAge().intValue() <= 60){
-                        vo51_60.setManNum(vo51_60.getManNum() + vo.getManNum());
-                        vo51_60.setWomanNum(vo51_60.getWomanNum() + vo.getWomanNum());
-                    } else if(vo.getAge().intValue() >= 61 &&  vo.getAge().intValue() <= 70){
-                        vo61_70.setManNum(vo61_70.getManNum() + vo.getManNum());
-                        vo61_70.setWomanNum(vo61_70.getWomanNum() + vo.getWomanNum());
-                    } else if(vo.getAge().intValue() >= 71 &&  vo.getAge().intValue() <= 80){
-                        vo71_80.setManNum(vo71_80.getManNum() + vo.getManNum());
-                        vo71_80.setWomanNum(vo71_80.getWomanNum() + vo.getWomanNum());
-                    } else if( vo.getAge().intValue() >= 80){
-                        vo80_up.setManNum(vo80_up.getManNum() + vo.getManNum());
-                        vo80_up.setWomanNum(vo80_up.getWomanNum() + vo.getWomanNum());
-                    }
-                }
-                result.add(vo40_down);
-                result.add(vo41_50);
-                result.add(vo51_60);
-                result.add(vo61_70);
-                result.add(vo71_80);
-                result.add(vo80_up);
-            }
-            return Result.success(result);
-        } catch (Exception e) {
-            log.error("机构大屏的年龄与性别分布查询出现异常",e);
-            return Result.error("系统错误，机构大屏的年龄与性别分布查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的居住类型比例查询
-     */
-    @ApiOperation(value = "机构大屏的居住类型比例查询  --三期新增", notes = "机构大屏的居住类型比例查询  --三期新增")
-    @GetMapping("/selectOrgBigScreenLiveTypeRateList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<List<BigScreenLiveTypeVO>> selectOrgBigScreenLiveTypeRateList(@RequestHeader("token") String token, Long orgId) {
-        try {
-            List<BigScreenLiveTypeVO> list =  bigScreenService.selectOrgBigScreenLiveTypeRateList(orgId);
-            if(CollUtil.isNotEmpty(list)){
-                for(BigScreenLiveTypeVO vo : list){
-                    vo.setLiveTypeName(OlderLiveTypeEnum.getCodeToName(vo.getLiveType()));
-                }
-            }
-            return Result.success(list);
-        } catch (Exception e) {
-            log.error("机构大屏的居住类型比例查询出现异常",e);
-            return Result.error("系统错误，机构大屏的居住类型比例查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的上报事件趋势查询
-     */
-    @ApiOperation(value = "机构大屏的上报事件趋势查询  --三期新增", notes = "机构大屏的上报事件趋势查询  --三期新增")
-    @GetMapping("/selectOrgBigScreenEventTrendList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<List<BigScreenEnventTrendVO>> selectOrgBigScreenEventTrendList(@RequestHeader("token") String token, Long orgId) {
-        try {
-            List<BigScreenEnventTrendVO> list =  bigScreenService.selectOrgBigScreenEventTrendList(orgId);
-
-            return Result.success(list);
-        } catch (Exception e) {
-            log.error("机构大屏的居住类型比例查询出现异常",e);
-            return Result.error("系统错误，机构大屏的居住类型比例查询失败");
-        }
-    }
-
-    /**
-     * 机构大屏的事件数量查询
-     */
-    @ApiOperation(value = "机构大屏的事件数量查询  --三期新增", notes = "机构大屏的事件数量查询  --三期新增")
-    @GetMapping("/selectOrgBigScreenEventCount")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "orgId", value = "机构ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<BigScreenEnventCountVO> selectOrgBigScreenEventCount(@RequestHeader("token") String token, Long orgId) {
-        try {
-            BigScreenEnventCountVO vo =  bigScreenService.selectOrgBigScreenEventCount(orgId);
-
-            return Result.success(vo);
-        } catch (Exception e) {
-            log.error("机构大屏的居住类型比例查询出现异常",e);
-            return Result.error("系统错误，机构大屏的居住类型比例查询失败");
-        }
-    }
-
-    /////////////////////////////////////////////////////////服务站大屏////////////////////////////////////////////////////
-    /**
-     * 服务站大屏的站点统计查询
-     */
-    @ApiOperation(value = "服务站大屏的站点统计查询", notes = "服务站大屏的站点统计查询")
-    @GetMapping("/selectStationBigScreenStatisticsByStation")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<StationBigScreenStatisticsVO> selectStationBigScreenStatisticsByStation(@RequestHeader("token") String token, Long stationId) {
-        try {
-            StationBigScreenStatisticsVO stationBigScreenStatisticsVO =  bigScreenService.selectStationBigScreenStatisticsByStation(stationId);
-            return Result.success(stationBigScreenStatisticsVO);
-        } catch (Exception e) {
-            log.error("服务站大屏的站点统计查询出现异常",e);
-            return Result.error("系统错误，服务站大屏的站点统计查询失败");
-        }
-    }
-
-
-    /**
-     * 服务站大屏的告警用户列表查询
-     */
-    @ApiOperation(value = "服务站大屏的告警用户列表查询", notes = "服务站大屏的告警用户列表查询")
-    @GetMapping("/selectBigScreenAlarmOlderList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true),
-                    @ApiImplicitParam(name = "olderName", value = "被监护人姓名", dataTypeClass = String.class,required = false)
-            }
-    )
-    public Result<List<BigScreenAlarmOlderVO>> selectBigScreenAlarmOlderList(@RequestHeader("token") String token,Long stationId,String olderName) {
-        try {
-            List<BigScreenAlarmOlderVO> bigScreenAlarmOlderVOList =  bigScreenService.selectBigScreenAlarmOlderList(stationId,olderName);
-            return Result.success(bigScreenAlarmOlderVOList);
-        } catch (Exception e) {
-            log.error("告警用户列表查询出现异常",e);
-            return Result.error("系统错误，告警用户列表查询失败");
-        }
-    }
-
-
-    /**
-     * 服务站大屏的被监控人详细查询
-     */
-    @ApiOperation(value = "服务站大屏的被监控人详细查询", notes = "服务站大屏的被监控人详细查询")
-    @GetMapping("/selectStationBigScreenOlderDetail")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "olderId", value = "被监护人ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<BigScreenOlderDetailVO> selectStationBigScreenOlderDetail(@RequestHeader("token") String token,Long olderId) {
-        try {
-            BigScreenOlderDetailVO bigScreenOlderDetailVO =  bigScreenService.selectStationBigScreenOlderDetail(olderId);
-            return Result.success(bigScreenOlderDetailVO);
-        } catch (Exception e) {
-            log.error("服务站大屏的被监控人详细查询出现异常",e);
-            return Result.error("系统错误，服务站大屏的被监控人详细查询失败");
-        }
-    }
-
-    /**
-     * 服务站大屏的安全事件总计查询
-     */
-    @ApiOperation(value = "服务站大屏的安全事件总计查询", notes = "服务站大屏的安全事件总计查询")
-    @GetMapping("/selectStationBigScreenEventTotal")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<BigScreenEventTotalVO> selectStationBigScreenEventTotal(@RequestHeader("token") String token,Long stationId) {
-        try {
-            BigScreenEventTotalVO bigScreenEventTotalVO =  bigScreenService.selectStationBigScreenEventTotal(stationId);
-            return Result.success(bigScreenEventTotalVO);
-        } catch (Exception e) {
-            log.error("服务站大屏的安全事件总计查询出现异常",e);
-            return Result.error("系统错误，服务站大屏的安全事件总计查询失败");
-        }
-    }
-
-    /**
-     * 服务站大屏的实时安全事件列表查询
-     */
-    @ApiOperation(value = "服务站大屏的实时安全事件列表查询", notes = "服务站大屏的实时安全事件列表查询")
-    @GetMapping("/selectBigScreenRtEventList")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<List<BigScreenEventVO>> selectBigScreenRtEventList(@RequestHeader("token") String token,Long stationId) {
-        try {
-            List<BigScreenEventVO> bigScreenEventVOList =  bigScreenService.selectBigScreenRtEventList(null,stationId);
-            return Result.success(bigScreenEventVOList);
-        } catch (Exception e) {
-            log.error("服务站大屏的实时安全事件列表查询出现异常",e);
-            return Result.error("系统错误，服务站大屏的实时安全事件列表查询失败");
-        }
-    }
-
-    /**
-     * 服务站大屏的已完成安全事件列表分页查询
-     */
-    @ApiOperation(value = "服务站大屏的已完成安全事件列表分页查询", notes = "服务站大屏的已完成安全事件列表分页查询")
-    @GetMapping("/selectBigScreenHisEventListByPage")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public PageResult<List<BigScreenEventVO>> selectBigScreenHisEventListByPage(@RequestHeader("token") String token,Long stationId, PageResVO page) {
-        try {
-            PageUtil<BigScreenEventVO> bigScreenEventVOListByPage =  bigScreenService.selectBigScreenHisEventListByPage(stationId,page);
-            return  PageResult.success(
-                    "查询成功",bigScreenEventVOListByPage.getListT(),
-                    bigScreenEventVOListByPage.getCurrent(),
-                    bigScreenEventVOListByPage.getPageSize(),
-                    bigScreenEventVOListByPage.getTotal());
-        } catch (Exception e) {
-            log.error("服务站大屏的已完成安全事件列表分页查询出现异常",e);
-            return PageResult.error("系统错误，服务站大屏的已完成安全事件列表分页查询失败");
-        }
-    }
-
-    /**
-     * 服务站大屏的用户卡片总计查询
-     */
-    @ApiOperation(value = "服务站大屏的用户卡片总计查询", notes = "服务站大屏的用户卡片总计查询")
-    @GetMapping("/selectStationBigScreenOlderCardTotal")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "olderName", value = "被监护人姓名", dataTypeClass = String.class,required = false),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true)
-            }
-    )
-    public Result<BigScreenOlderCardTotalVO> selectStationBigScreenOlderCardTotal(@RequestHeader("token") String token,Long stationId,String olderName) {
-        try {
-            BigScreenOlderCardTotalVO bigScreenOlderCardTotalVO =  bigScreenService.selectStationBigScreenOlderCardTotal(stationId,olderName);
-            return Result.success(bigScreenOlderCardTotalVO);
-        } catch (Exception e) {
-            log.error("服务站大屏的用户卡片总计查询出现异常",e);
-            return Result.error("系统错误，服务站大屏的用户卡片总计查询失败");
-        }
-    }
-
-    /**
-     * 服务站大屏的用户卡片列表分页查询
-     */
-    @ApiOperation(value = "服务站大屏的用户卡片列表分页查询", notes = "服务站大屏的用户卡片列表分页查询")
-    @GetMapping("/selectBigScreenOlderCardListByPage")
-    @ApiImplicitParams(
-            {
-                    @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-                    @ApiImplicitParam(name = "stationId", value = "站点ID", dataTypeClass = Long.class,required = true),
-                    @ApiImplicitParam(name = "olderName", value = "被监护人姓名", dataTypeClass = String.class,required = false),
-                    @ApiImplicitParam(name = "isAlarm", value = "是告警：1，不是告警（全部）：0", dataTypeClass = String.class,required = false)
-            }
-    )
-    public PageResult<List<BigScreenOlderDetailVO>> selectBigScreenOlderCardListByPage(@RequestHeader("token") String token,Long stationId,String olderName,String isAlarm, PageResVO page) {
-        try {
-            PageUtil<BigScreenOlderDetailVO> bigScreenOlderDetailVOList =  bigScreenService.selectBigScreenOlderCardListByPage(stationId,olderName,isAlarm,page);
-            return  PageResult.success(
-                    "查询成功",bigScreenOlderDetailVOList.getListT(),
-                    bigScreenOlderDetailVOList.getCurrent(),
-                    bigScreenOlderDetailVOList.getPageSize(),
-                    bigScreenOlderDetailVOList.getTotal());
-        } catch (Exception e) {
-            log.error("服务站大屏的用户卡片列表分页查询出现异常",e);
-            return PageResult.error("系统错误，服务站大屏的用户卡片列表分页查询失败");
-        }
-    }
-}

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

@@ -1,62 +0,0 @@
-package com.care.bigscreen.controller;
-
-import com.care.bigscreen.service.BigScreenService;
-import com.care.common.annotation.Permission;
-import com.care.common.service.CommonService;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.util.Result;
-import com.care.common.util.WebPageUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * @author javadoc
- * @version 1.0
- * @description 系统设置-字典管理模块-前端控制器
- * @date
- */
-@Slf4j
-@RestController
-@RequestMapping("/bms/system/common")
-public class CommonController {
-
-    @Autowired
-    CommonService commonService;
-    @Autowired
-    BigScreenService bigScreenService;
-//    /**
-//     * 字典：字段查重（字典选项代码）
-//     * 作用：添加或修改时对必须唯一的字段进行查重
-//     *
-//     * @param typeCode 收集需要查重的字段参数
-//     * @return 返回0表示字段没有重复，非零表示有重复
-//     */
-//    @GetMapping("/convertedCodeName")
-//    @Permission
-//    public Result<Object> convertedCodeName(@RequestHeader("token") String token, @RequestParam("typeCode") String typeCode, @RequestParam("value") String value, HttpServletRequest request) {
-//        try {
-//            UserLogindConvertVO user = WebPageUtils.getCurrentLoginedUser(request);
-//                return Result.success("成功",user);
-//        } catch (Exception e) {
-//            return Result.error("系统错误，查询失败");
-//        }
-//    }
-    @GetMapping("/pushEvent")
-    public Result<Object> pushEvent(@RequestParam("orgId") Long orgId,@RequestParam("stationId") Long stationId,@RequestParam(value = "orderId") Long orderId) {
-        try {
-            bigScreenService.pushRtEventFlag(orgId,stationId,orderId.toString(),"bigscreenRefresh");
-            bigScreenService.pushRtEventFlag(orgId,stationId,orderId.toString(),"orderAdd");
-            bigScreenService.pushRtEventFlag(orgId,stationId,orderId.toString(),"orderUpdate");
-            bigScreenService.pushRtEventFlag(orgId,stationId,orderId.toString(),"orderHandle");
-            return Result.success("成功");
-        } catch (Exception e) {
-            log.error("convertedCodeName: ",e);
-            return Result.error("系统错误，推送失败");
-        }
-    }
-
-}

src/main/java/com/care/bigscreen/entity/StOrganization.java

@@ -1,69 +0,0 @@
-package com.care.bigscreen.entity;
-
-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;
-
-/**
- * 机构统计表实体类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("st_organization")
-@ApiModel(value = "StOrganization对象")
-public class StOrganization implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "机构ID")
-    @TableField("org_id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "服务站总数")
-    @TableField("station_amount")
-    private Long stationAmount;
-
-    @ApiModelProperty(value = "坐席总人数")
-    @TableField("seats_amount")
-    private Long seatsAmount;
-
-    @ApiModelProperty(value = "坐席总在线时长(秒)")
-    @TableField("seats_online_duration")
-    private Long seatsOnlineDuration;
-
-
-    @ApiModelProperty(value = "坐席当前在线人数")
-    @TableField("seats_curr_online_amount")
-    private Long seatsCurrOnlineAmount;
-
-    @ApiModelProperty(value = "坐席接打分钟数")
-    @TableField("seats_call_min_amount")
-    private Long seatsCallMinAmount;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

src/main/java/com/care/bigscreen/entity/StStation.java

@@ -1,186 +0,0 @@
-package com.care.bigscreen.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-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.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 站点统计表实体类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("st_station")
-@ApiModel(value = "StStation对象")
-public class StStation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "站点ID")
-    @TableField("station_id")
-    private Long stationId;
-
-    @ApiModelProperty(value = "站点名称")
-    @TableField("station_name")
-    private String stationName;
-
-    @ApiModelProperty(value = "机构ID")
-    @TableField("org_id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "用户数")
-    @TableField("older_amount")
-    private Long olderAmount;
-
-    @ApiModelProperty(value = "60至80岁用户数")
-    @TableField("older_60_80_amount")
-    private Long older6080Amount;
-
-    @ApiModelProperty(value = "80岁以上用户数")
-    @TableField("older_80_above_amount")
-    private Long older80AboveAmount;
-
-    @ApiModelProperty(value = "独居人数")
-    @TableField("alone_living_amount")
-    private Long aloneLivingAmount;
-
-    @ApiModelProperty(value = "非独居人数")
-    @TableField("no_alone_living_amount")
-    private Long noAloneLivingAmount;
-
-    @ApiModelProperty(value = "集中居住人数")
-    @TableField("concentrate_living_amount")
-    private Long concentrateLivingAmount;
-
-    @ApiModelProperty(value = "其他居住人数")
-    @TableField("other_living_amount")
-    private Long otherLivingAmount;
-
-    @ApiModelProperty(value = "一级守护人数")
-    @TableField("one_level_amount")
-    private Long oneLevelAmount;
-
-    @ApiModelProperty(value = "二级守护人数")
-    @TableField("two_level_amount")
-    private Long twoLevelAmount;
-
-    @ApiModelProperty(value = "三级守护人数")
-    @TableField("three_level_amount")
-    private Long threeLevelAmount;
-
-    @ApiModelProperty(value = "安全管家总人数")
-    @TableField("chamberlain_amount")
-    private Long chamberlainAmount;
-
-    @ApiModelProperty(value = "服务中管家人数")
-    @TableField("chamberlain_in_service_amount")
-    private Long chamberlainInServiceAmount;
-
-    @ApiModelProperty(value = "累计服务总人次")
-    @TableField("serve_amount")
-    private Long serveAmount;
-
-    @ApiModelProperty(value = "今天服务人次")
-    @TableField("serve_today_amount")
-    private Long serveTodayAmount;
-
-    @ApiModelProperty(value = "设备总数")
-    @TableField("device_amount")
-    private Long deviceAmount;
-
-    @ApiModelProperty(value = "室内在线总数")
-    @TableField("indoor_online_amount")
-    private Long indoorOnlineAmount;
-
-    @ApiModelProperty(value = "室内离线总数")
-    @TableField("indoor_offline_amount")
-    private Long indoorOfflineAmount;
-
-    @ApiModelProperty(value = "户外在线总数")
-    @TableField("outdoor_online_amount")
-    private Long outdoorOnlineAmount;
-
-    @ApiModelProperty(value = "户外离线总数")
-    @TableField("outdoor_offline_amount")
-    private Long outdoorOfflineAmount;
-
-    @ApiModelProperty(value = "实时安全事件数")
-    @TableField("rt_event_amount")
-    private Long rtEventAmount;
-
-    @ApiModelProperty(value = "实时_跌倒事件数")
-    @TableField("rt_fall_amount")
-    private Long rtFallAmount;
-
-    @ApiModelProperty(value = "实时_久滞事件数")
-    @TableField("rt_stagnation_amount")
-    private Long rtStagnationAmount;
-
-    @ApiModelProperty(value = "实时_坠床事件数")
-    @TableField("rt_falling_bed_amount")
-    private Long rtFallingBedAmount;
-
-    @ApiModelProperty(value = "实时_主动呼叫事件数")
-    @TableField("rt_active_call_amount")
-    private Long rtActiveCallAmount;
-
-    @ApiModelProperty(value = "实时_户外呼叫事件数")
-    @TableField("rt_outdoors_call_amount")
-    private Long rtOutdoorsCallAmount;
-
-    @ApiModelProperty(value = "历史安全事件数")
-    @TableField("his_event_amount")
-    private Long hisEventAmount;
-
-    @ApiModelProperty(value = "历史_跌倒事件数")
-    @TableField("his_fall_amount")
-    private Long hisFallAmount;
-
-    @ApiModelProperty(value = "历史_久滞事件数")
-    @TableField("his_stagnation_amount")
-    private Long hisStagnationAmount;
-
-    @ApiModelProperty(value = "历史_坠床事件数")
-    @TableField("his_falling_bed_amount")
-    private Long hisFallingBedAmount;
-
-    @ApiModelProperty(value = "历史_主动呼叫事件数")
-    @TableField("his_active_call_amount")
-    private Long hisActiveCallAmount;
-
-    @ApiModelProperty(value = "历史_户外呼叫事件数")
-    @TableField("his_outdoors_call_amount")
-    private Long hisOutdoorsCallAmount;
-
-    @ApiModelProperty(value = "经度")
-    @TableField("longitude")
-    private BigDecimal longitude;
-
-    @ApiModelProperty(value = "纬度")
-    @TableField("latitude")
-    private BigDecimal latitude;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

src/main/java/com/care/bigscreen/mapper/BigSreenMapper.java

@@ -1,135 +0,0 @@
-package com.care.bigscreen.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.care.bigscreen.entity.StStation;
-import com.care.bigscreen.vo.*;
-import com.care.common.util.PageUtil;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * @author stw
- * @version 1.0
- * @description 站点统计表DAO层接口
- * @date 2021/05/20/19:41
- */
-public interface BigSreenMapper extends BaseMapper<StStation> {
-
-    /**
-     * 运营商大屏统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    OpBigScreenStatisticsVO selectBigScreenStatisticsByOp(@Param("stationId") Long stationId);
-
-    /**
-     * 运营商大屏统计查询
-     * @return 根据经纬度范围搜索符合条件的大屏统计数据
-     */
-    OpBigScreenStatisticsVO selectOpBigScreenStatisticsByLongitudeLatitude(@Param("longitudeLeftUp") String longitudeLeftUp, @Param("latitudeLeftUp") String latitudeLeftUp, @Param("longitudeRightDown") String longitudeRightDown, @Param("latitudeRightDown")String latitudeRightDown);
-
-
-
-    /**
-     * 机构大屏统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    OrgBigScreenStatisticsVO selectBigScreenStatisticsByOrg(@Param("stationId") Long stationId, @Param("orgId") Long orgId);
-
-
-    /**
-     * 大屏统计查询（机构汇总表查询）
-     * @return 搜索符合条件的大屏统计数据
-     */
-    BigScreenOrgVO selectBigScreenOrgStatistics(@Param("orgId") Long orgId);
-
-    /**
-     * 大屏统计查询
-     * @return 根据经纬度范围搜索符合条件的大屏统计数据
-     */
-    OrgBigScreenStatisticsVO selectOrgBigScreenStatisticsByLongitudeLatitude(@Param("longitudeLeftUp") String longitudeLeftUp, @Param("latitudeLeftUp") String latitudeLeftUp, @Param("longitudeRightDown") String longitudeRightDown, @Param("latitudeRightDown")String latitudeRightDown, @Param("orgId") Long orgId);
-
-    /**
-     * 站点列表查询
-     */
-    List<BigScreenStationVO> selectBigScreenStationList(@Param("orgId") Long orgId);
-
-    /**
-     * 服务站大屏的站点统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    StationBigScreenStatisticsVO selectStationBigScreenStatisticsByStation(@Param("stationId") Long stationId);
-
-    /**
-     * 告警用户列表查询
-     */
-    List<BigScreenAlarmOlderVO> selectBigScreenAlarmOlderList(@Param("stationId") Long stationId,@Param("olderName") String olderName);
-
-    /**
-     * 服务站大屏的被监控人详细查询
-     */
-    BigScreenOlderDetailVO selectStationBigScreenOlderDetail(@Param("olderId") Long olderId);
-
-    /**
-     * 服务站大屏的事件总计查询
-     */
-    BigScreenEventTotalVO selectStationBigScreenEventTotal(@Param("stationId") Long stationId);
-
-    /**
-     * 机构大屏或服务站大屏的实时安全事件列表查询
-     */
-    List<BigScreenEventVO> selectBigScreenRtEventList(@Param("orgId") Long orgId, @Param("stationId") Long stationId);
-
-    /**
-     * 机构大屏的设备列表查询
-     */
-    List<BigScreenDeviceVO> selectOrgBigScreenDeviceList(@Param("orgId") Long orgId, @Param("stationId") Long stationId, @Param("status") String status);
-
-    /**
-     * 机构大屏的年龄性别列表查询
-     */
-    List<BigScreenAgeSexVO> selectOrgBigScreenAgeSexList(@Param("orgId") Long orgId);
-
-    /**
-     * 机构大屏的居住类型比例列表查询
-     */
-    List<BigScreenLiveTypeVO> selectOrgBigScreenLiveTypeRateList(@Param("orgId") Long orgId);
-
-    /**
-     * 机构大屏的事件趋势列表查询
-     */
-    List<BigScreenEnventTrendVO> selectOrgBigScreenEventTrendList(@Param("orgId") Long orgId);
-
-    /**
-     * 机构大屏的事件数量查询
-     */
-    BigScreenEnventCountVO selectOrgBigScreenEventCount(@Param("orgId") Long orgId);
-
-    /**
-     * 服务站大屏的已完成安全事件总记录数
-     */
-    Integer selectBigScreenHisEventListByCount(@Param("stationId") Long stationId);
-    /**
-     * 服务站大屏的已完成安全事件列表分页查询
-     */
-    List<BigScreenEventVO> selectBigScreenHisEventListByPage(@Param("stationId") Long stationId, @Param("pageUtil") PageUtil<BigScreenEventVO> pageUtil);
-
-
-    /**
-     * 服务站大屏的告警用户卡片列表总记录数
-     */
-    BigScreenOlderCardTotalVO selectStationBigScreenOlderCardTotal(@Param("stationId") Long stationId,@Param("olderName") String olderName);
-
-    /**
-     * 服务站大屏的用户卡片列表总记录数
-     */
-    Integer selectBigScreenOlderCardListByCount(@Param("stationId") Long stationId, @Param("olderName") String olderName,@Param("isAlarm") String isAlarm);
-
-    /**
-     * 服务站大屏的用户卡片列表分页查询
-     */
-    List<BigScreenOlderDetailVO> selectBigScreenOlderCardListByPage(@Param("stationId") Long stationId,@Param("olderName") String olderName,@Param("isAlarm") String isAlarm, @Param("pageUtil") PageUtil<BigScreenOlderDetailVO> pageUtil);
-
-
-}

src/main/java/com/care/bigscreen/mapper/StOrganizationMapper.java

@@ -1,23 +0,0 @@
-package com.care.bigscreen.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.care.bigscreen.entity.StOrganization;
-
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * 机构统计表(st_organization)表数据库访问层
- *
- * @author makejava
- * @since 2021-05-21 00:08:32
- */
-public interface StOrganizationMapper extends BaseMapper<StOrganization> {
-    /**
-     * 站点统计列表查询
-     */
-    List<StOrganization> selectStOrganizationList();
-
-}

src/main/java/com/care/bigscreen/mapper/StStationMapper.java

@@ -1,22 +0,0 @@
-package com.care.bigscreen.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.care.bigscreen.entity.StStation;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * 站点统计表(st_station)表数据库访问层
- *
- * @author makejava
- * @since 2021-05-21 00:08:32
- */
-public interface StStationMapper extends BaseMapper<StStation> {
-    /**
-     * 站点统计列表查询
-     */
-    List<StStation> selectStStationList();
-
-}

src/main/java/com/care/bigscreen/schedule/BigScreenSchedule.java

@@ -1,40 +0,0 @@
-package com.care.bigscreen.schedule;
-
-
-
-
-
-import com.care.bigscreen.service.BigScreenService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-
-
-/** 大屏统计调度
- * @author stw
- * @version 2.7.0.0 创建于 2021/7/16
- **/
-@Configuration
-@EnableScheduling
-@EnableAsync
-public class BigScreenSchedule {
-
-    @Autowired
-    private BigScreenService bigScreenService;
-
-
-    /**
-     * 1 分钟调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeStatistics() {
-        bigScreenService.exeStatistics();
-    }
-
-}

src/main/java/com/care/bigscreen/service/BigScreenService.java

@@ -1,124 +0,0 @@
-package com.care.bigscreen.service;
-
-import com.care.bigscreen.vo.*;
-import com.care.common.vo.PageResVO;
-import com.care.common.util.PageUtil;
-
-import java.io.IOException;
-import java.util.List;
-
-
-/**
- * @author stw
- * @version 1.0
- * @description 站点统计表接口实现类
- * @date 2021/05/20/19:41
- */
-public interface BigScreenService {
-    /**
-     * 运营商大屏统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    OpBigScreenStatisticsVO selectBigScreenStatisticsByOp(Long stationId);
-
-    /**
-     * 运营商大屏根据经纬度统计查询
-     * @return 根据经纬度范围搜索符合条件的大屏统计数据
-     */
-    OpBigScreenStatisticsVO selectOpBigScreenStatisticsByLongitudeLatitude(String longitudeLeftUp, String latitudeLeftUp, String longitudeRightDown, String latitudeRightDown);
-
-    /**
-     * 机构大屏统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    OrgBigScreenStatisticsVO selectBigScreenStatisticsByOrg(Long stationId, Long orgId);
-
-
-    /**
-     * 运营商大屏根据经纬度统计查询
-     * @return 根据经纬度范围搜索符合条件的大屏统计数据
-     */
-    OrgBigScreenStatisticsVO selectOrgBigScreenStatisticsByLongitudeLatitude(String longitudeLeftUp, String latitudeLeftUp, String longitudeRightDown, String latitudeRightDown, Long orgId);
-
-    /**
-     * 站点列表查询
-     */
-    List<BigScreenStationVO> selectBigScreenStationList(Long orgId);
-
-
-    /**
-     * 服务站大屏的站点统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    StationBigScreenStatisticsVO selectStationBigScreenStatisticsByStation(Long stationId);
-
-    /**
-     * 告警用户列表查询
-     */
-    List<BigScreenAlarmOlderVO> selectBigScreenAlarmOlderList(Long stationId,String olderName);
-
-    /**
-     * 服务站大屏的被监控人详细查询
-     */
-    BigScreenOlderDetailVO selectStationBigScreenOlderDetail(Long olderId);
-
-    /**
-     * 服务站大屏的事件总计查询
-     */
-    BigScreenEventTotalVO selectStationBigScreenEventTotal(Long stationId);
-
-    /**
-     * 机构大屏或服务站大屏的实时安全事件列表查询
-     */
-    List<BigScreenEventVO> selectBigScreenRtEventList(Long orgId, Long stationId);
-
-    /**
-     * 机构大屏的设备列表查询
-     */
-    List<BigScreenDeviceVO> selectOrgBigScreenDeviceList(Long orgId, Long stationId,String status);
-
-    /**
-     * 机构大屏的年龄性别分布列表查询
-     */
-    List<BigScreenAgeSexVO> selectOrgBigScreenAgeSexList(Long orgId);
-
-    /**
-     * 机构大屏的居住类型比例列表查询
-     */
-    List<BigScreenLiveTypeVO> selectOrgBigScreenLiveTypeRateList(Long orgId);
-
-    /**
-     * 机构大屏的事件趋势列表查询
-     */
-    List<BigScreenEnventTrendVO> selectOrgBigScreenEventTrendList(Long orgId);
-    /**
-     * 机构大屏的事件数量查询
-     */
-    BigScreenEnventCountVO selectOrgBigScreenEventCount(Long orgId);
-
-    /**
-     * 服务站大屏的已完成安全事件列表分页查询
-     */
-    PageUtil<BigScreenEventVO> selectBigScreenHisEventListByPage(Long stationId, PageResVO page);
-
-    /**
-     * 服务站大屏的用户卡片总计查询
-     */
-    BigScreenOlderCardTotalVO selectStationBigScreenOlderCardTotal(Long stationId,String olderName);
-
-    /**
-     * 服务站大屏的用户卡片列表分页查询
-     */
-    PageUtil<BigScreenOlderDetailVO> selectBigScreenOlderCardListByPage(Long stationId, String olderName,String isAlarm, PageResVO page);
-
-    /**
-     * 调用websocket推送实时事件标识给前端
-     */
-    void pushRtEventFlag(Long orgId,Long stationId,String orderId,String flag);
-
-
-    /**
-     * 进行统计
-     */
-    void exeStatistics();
-}

src/main/java/com/care/bigscreen/service/impl/BigScreenServiceImpl.java

@@ -1,328 +0,0 @@
-package com.care.bigscreen.service.impl;
-
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.care.bigscreen.entity.StOrganization;
-import com.care.bigscreen.entity.StStation;
-import com.care.bigscreen.mapper.BigSreenMapper;
-import com.care.bigscreen.mapper.StOrganizationMapper;
-import com.care.bigscreen.mapper.StStationMapper;
-import com.care.bigscreen.service.BigScreenService;
-import com.care.bigscreen.vo.*;
-import com.care.bms.websocket.StationWebSocketEndpoint;
-import com.care.bms.websocket.WebSocketEndpoint;
-import com.care.common.enums.OrderTypeEnum;
-import com.care.common.service.CareStationService;
-import com.care.common.util.DomainEquals;
-import com.care.common.vo.PageResVO;
-import com.care.common.util.PageUtil;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * @author stw
- * @version 1.0
- * @description 站点统计表接口实现类
- * @date 2021/05/20/19:41
- */
-@Service
-public class BigScreenServiceImpl implements BigScreenService {
-    private static final Logger logger = LogManager.getLogger(BigScreenServiceImpl.class);
-
-    @Autowired
-    private BigSreenMapper bigSreenMapper;
-
-    @Autowired
-    private CareStationService careStationService;
-
-    @Autowired
-    private StStationMapper stStationMapper;
-
-    @Autowired
-    private StOrganizationMapper stOrganizationMapper;
-
-    /**
-     * 运营商大屏统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    @Override
-    public OpBigScreenStatisticsVO selectBigScreenStatisticsByOp(Long stationId){
-        OpBigScreenStatisticsVO opBigScreenStatisticsVO =  bigSreenMapper.selectBigScreenStatisticsByOp(stationId);
-        BigScreenOrgVO bigScreenOrgVO = null;
-        if(stationId == null){ //运营商大屏
-            bigScreenOrgVO =  bigSreenMapper.selectBigScreenOrgStatistics(null);
-        } else { //站点查询
-            bigScreenOrgVO =  bigSreenMapper.selectBigScreenOrgStatistics(careStationService.getById(stationId).getOrgId());
-        }
-
-        opBigScreenStatisticsVO.setSeatsAmount(bigScreenOrgVO.getSeatsAmount());
-        opBigScreenStatisticsVO.setSeatsOnlineDuration(bigScreenOrgVO.getSeatsOnlineDuration());
-        return opBigScreenStatisticsVO;
-    }
-
-
-    /**
-     * 运营商大屏统计查询
-     * @return 根据经纬度范围搜索符合条件的大屏统计数据
-     */
-    @Override
-    public OpBigScreenStatisticsVO selectOpBigScreenStatisticsByLongitudeLatitude(String longitudeLeftUp, String latitudeLeftUp, String longitudeRightDown, String latitudeRightDown) {
-        return bigSreenMapper.selectOpBigScreenStatisticsByLongitudeLatitude(longitudeLeftUp,latitudeLeftUp,longitudeRightDown,latitudeRightDown);
-    }
-
-    /**
-     * 机构大屏统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    @Override
-    public OrgBigScreenStatisticsVO selectBigScreenStatisticsByOrg(Long stationId, Long orgId){
-        OrgBigScreenStatisticsVO orgBigScreenStatisticsVO =  bigSreenMapper.selectBigScreenStatisticsByOrg(stationId,orgId);
-        BigScreenOrgVO bigScreenOrgVO = null;
-        if(stationId == null){ //机构大屏
-            bigScreenOrgVO =  bigSreenMapper.selectBigScreenOrgStatistics(orgId);
-        } else { //站点查询
-            bigScreenOrgVO =  bigSreenMapper.selectBigScreenOrgStatistics(careStationService.getById(stationId).getOrgId());
-        }
-
-        orgBigScreenStatisticsVO.setStationAmount(bigScreenOrgVO.getStationAmount());
-
-        return orgBigScreenStatisticsVO;
-    }
-
-    /**
-     * 机构大屏统计查询
-     * @return 根据经纬度范围搜索符合条件的大屏统计数据
-     */
-    @Override
-    public OrgBigScreenStatisticsVO selectOrgBigScreenStatisticsByLongitudeLatitude(String longitudeLeftUp, String latitudeLeftUp, String longitudeRightDown, String latitudeRightDown, Long orgId) {
-        return bigSreenMapper.selectOrgBigScreenStatisticsByLongitudeLatitude(longitudeLeftUp,latitudeLeftUp,longitudeRightDown,latitudeRightDown,orgId);
-    }
-
-    /**
-     * 站点列表查询
-     */
-    @Override
-    public List<BigScreenStationVO> selectBigScreenStationList(Long orgId) {
-        return bigSreenMapper.selectBigScreenStationList(orgId);
-    }
-
-    /**
-     * 服务站大屏的站点统计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    @Override
-    public StationBigScreenStatisticsVO selectStationBigScreenStatisticsByStation(Long stationId){
-        return bigSreenMapper.selectStationBigScreenStatisticsByStation(stationId);
-    }
-
-    /**
-     * 告警用户列表查询
-     */
-    @Override
-    public List<BigScreenAlarmOlderVO> selectBigScreenAlarmOlderList(Long stationId, String olderName){
-        return bigSreenMapper.selectBigScreenAlarmOlderList(stationId, olderName);
-    }
-
-    /**
-     * 服务站大屏的被监控人详细查询
-     */
-    @Override
-    public BigScreenOlderDetailVO selectStationBigScreenOlderDetail(Long olderId) {
-        return bigSreenMapper.selectStationBigScreenOlderDetail(olderId);
-    }
-
-
-    /**
-     * 服务站大屏的安全事件总计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    @Override
-    public BigScreenEventTotalVO selectStationBigScreenEventTotal(Long stationId){
-        return bigSreenMapper.selectStationBigScreenEventTotal(stationId);
-    }
-
-    /**
-     * 机构大屏或服务站大屏的实时安全事件列表查询
-     */
-    @Override
-    public List<BigScreenEventVO> selectBigScreenRtEventList(Long orgId ,Long stationId) {
-        List<BigScreenEventVO> list = bigSreenMapper.selectBigScreenRtEventList(orgId, stationId);
-        if (CollUtil.isNotEmpty(list)){
-            list.forEach(item ->{
-                item.setEventType(OrderTypeEnum.getCodeToName(item.getEventType()));
-            });
-        }
-        return list;
-    }
-
-    /**
-     * 机构大屏的设备列表查询
-     */
-    @Override
-    public List<BigScreenDeviceVO> selectOrgBigScreenDeviceList(Long orgId, Long stationId,String status) {
-        return bigSreenMapper.selectOrgBigScreenDeviceList(orgId, stationId,status);
-    }
-
-    @Override
-    public List<BigScreenAgeSexVO> selectOrgBigScreenAgeSexList(Long orgId) {
-        return bigSreenMapper.selectOrgBigScreenAgeSexList(orgId);
-    }
-    /**
-     * 机构大屏的居住类型比例列表查询
-     */
-    @Override
-    public List<BigScreenLiveTypeVO> selectOrgBigScreenLiveTypeRateList(Long orgId){
-        return bigSreenMapper.selectOrgBigScreenLiveTypeRateList(orgId);
-    }
-
-    /**
-     * 机构大屏的事件趋势列表查询
-     */
-    @Override
-    public List<BigScreenEnventTrendVO> selectOrgBigScreenEventTrendList(Long orgId){
-        return bigSreenMapper.selectOrgBigScreenEventTrendList(orgId);
-    }
-    /**
-     * 机构大屏的事件数量查询
-     */
-    @Override
-    public BigScreenEnventCountVO selectOrgBigScreenEventCount(Long orgId){
-        return bigSreenMapper.selectOrgBigScreenEventCount(orgId);
-    }
-    /**
-     * 服务站大屏的已完成安全事件列表分页查询
-     */
-    @Override
-    public PageUtil<BigScreenEventVO> selectBigScreenHisEventListByPage(Long stationId, PageResVO page) {
-
-        //1、创建一个分页工具对象（然后对分页数据进行整理）
-        PageUtil<BigScreenEventVO> pageUtil = new PageUtil<>();
-        //2、更新当前页面大小
-        pageUtil.setPageSize(page.getPageSize());
-        //3、获取多条件查询总记录数
-        pageUtil.setTotal(bigSreenMapper.selectBigScreenHisEventListByCount(stationId));
-        //4、更新当前页码（此时页码将不会再发生越界问题）
-        pageUtil.setCurrent(page.getCurrent());
-        List<BigScreenEventVO> bigScreenEventVOList = bigSreenMapper.selectBigScreenHisEventListByPage(stationId, pageUtil);
-        pageUtil.setListT(bigScreenEventVOList);
-        return pageUtil;
-
-    }
-
-    /**
-     * 服务站大屏的用户卡片总计查询
-     * @return 搜索符合条件的大屏统计数据
-     */
-    @Override
-    public BigScreenOlderCardTotalVO selectStationBigScreenOlderCardTotal(Long stationId,String olderName){
-        return bigSreenMapper.selectStationBigScreenOlderCardTotal(stationId,olderName);
-    }
-
-    /**
-     * 服务站大屏的用户卡片列表分页查询
-     */
-    @Override
-    public PageUtil<BigScreenOlderDetailVO> selectBigScreenOlderCardListByPage(Long stationId, String olderName,String isAlarm, PageResVO page) {
-        //1、创建一个分页工具对象（然后对分页数据进行整理）
-        PageUtil<BigScreenOlderDetailVO> pageUtil = new PageUtil<>();
-        //2、更新当前页面大小
-        pageUtil.setPageSize(page.getPageSize());
-        //3、获取多条件查询总记录数
-        pageUtil.setTotal(bigSreenMapper.selectBigScreenOlderCardListByCount(stationId,olderName,isAlarm));
-        //4、更新当前页码（此时页码将不会再发生越界问题）
-        pageUtil.setCurrent(page.getCurrent());
-        List<BigScreenOlderDetailVO> bigScreenOlderDetailVOList = bigSreenMapper.selectBigScreenOlderCardListByPage(stationId,olderName,isAlarm, pageUtil);
-        pageUtil.setListT(bigScreenOlderDetailVOList);
-        return pageUtil;
-    }
-
-    /**
-     * 调用websocket推送实时事件标识给前端
-     */
-    @Override
-    public void pushRtEventFlag(Long orgId,Long stationId,String orderId, String flag){
-        try {
-            //触发统计
-            exeStatistics();
-            if("bigscreenRefresh".equals(flag)) {
-                StationWebSocketEndpoint.sendMessage(stationId!=null?String.valueOf(stationId):"", "rt_event_happen");
-            } else if("orderAdd".equals(flag)) {
-                WebSocketEndpoint.sendMessage(orgId,stationId,"rt_event_add_happen@" + orderId);
-            } else if("orderUpdate".equals(flag)){
-                WebSocketEndpoint.sendMessage(orgId,stationId,"rt_event_update_happen@" + orderId);
-            } else if("orderHandle".equals(flag)){
-                WebSocketEndpoint.sendMessage(orgId,stationId,"rt_event_handle_happen@" + orderId);
-            }
-
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * 进行统计
-     */
-    @Override
-    public void exeStatistics(){
-        try {
-            List<StStation> stStationList = stStationMapper.selectStStationList();
-            for(StStation stStation : stStationList) {
-                QueryWrapper<StStation> queryWrapper = new QueryWrapper<>();
-                //查询表中是否存在
-                queryWrapper.lambda().eq(StStation::getStationId, stStation.getStationId());
-                StStation stStationDb = stStationMapper.selectOne(queryWrapper);
-                if (stStationDb == null) { //插入
-                    Date now = new Date();
-                    stStation.setCreateTime(now);
-                    stStation.setModifyTime(now);
-                    stStationMapper.insert(stStation);
-                } else { //更新
-                    stStation.setCreateTime(stStationDb.getCreateTime());
-                    stStation.setModifyTime(stStationDb.getModifyTime());
-                    stStation.setId(stStationDb.getId());
-                    //其余属性不一样的就更新
-                    if (!DomainEquals.domainEquals(stStation,stStationDb)){
-                        Date now = new Date();
-                        stStation.setModifyTime(now);
-                        stStationMapper.updateById(stStation);
-                    }
-                }
-            }
-
-            List<StOrganization> stOrganizationList = stOrganizationMapper.selectStOrganizationList();
-            for(StOrganization stOrganization : stOrganizationList) {
-                QueryWrapper<StOrganization> queryWrapper = new QueryWrapper<>();
-                //查询表中是否存在
-                queryWrapper.lambda().eq(StOrganization::getOrgId, stOrganization.getOrgId());
-                StOrganization stOrganizationDb = stOrganizationMapper.selectOne(queryWrapper);
-                if (stOrganizationDb == null) { //插入
-                    Date now = new Date();
-                    stOrganization.setCreateTime(now);
-                    stOrganization.setModifyTime(now);
-                    stOrganizationMapper.insert(stOrganization);
-                } else { //更新
-                    stOrganization.setCreateTime(stOrganizationDb.getCreateTime());
-                    stOrganization.setModifyTime(stOrganizationDb.getModifyTime());
-                    stOrganization.setId(stOrganizationDb.getId());
-                    //其余属性不一样的就更新
-                    if (!DomainEquals.domainEquals(stOrganization,stOrganizationDb)) {
-                        Date now = new Date();
-                        stOrganization.setModifyTime(now);
-                        stOrganizationMapper.updateById(stOrganization);
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            logger.error("统计计算出错：{}", e.getMessage());
-        }
-    }
-}

src/main/java/com/care/bigscreen/vo/BigScreenAgeSexVO.java

@@ -1,33 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏年龄性别响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏年龄性别响应类", description = "大屏年龄性别响应类")
-public class BigScreenAgeSexVO {
-
-    @ApiModelProperty(value = "年龄")
-    private BigDecimal age;
-
-    @ApiModelProperty(value = "年龄")
-    private String ageInterval ;
-
-    @ApiModelProperty(value = "男数量")
-    private Integer manNum = 0;
-
-    @ApiModelProperty(value = "女数量")
-    private Integer womanNum = 0;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenAlarmOlderVO.java

@@ -1,36 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 站点大屏告警被监护人响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "站点大屏告警被监护人响应类", description = "站点大屏告警被监护人响应类")
-public class BigScreenAlarmOlderVO {
-
-
-    @ApiModelProperty("被监护人ID")
-    private Long olderId;
-
-    @ApiModelProperty("姓名-被监护人状态")
-    private String nameOlderStatus;
-
-    @ApiModelProperty("事件状态,0未处理，1处理中")
-    private String eventStatus;
-
-    @ApiModelProperty("事件状态名称")
-    private String eventStatusName;
-}

src/main/java/com/care/bigscreen/vo/BigScreenDeviceVO.java

@@ -1,36 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏设备响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏设备响应类", description = "大屏设备响应类")
-public class BigScreenDeviceVO {
-
-
-    @ApiModelProperty(value = "设备名称")
-    private String deviceName;
-
-    @ApiModelProperty(value = "经度")
-    private BigDecimal longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private BigDecimal latitude;
-
-    @ApiModelProperty(value = "状态：1在线；2：离线")
-    private Integer status;
-
-    @ApiModelProperty(value = "地址")
-    private String deviceAddr;
-}

src/main/java/com/care/bigscreen/vo/BigScreenEnventCountVO.java

@@ -1,24 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 大屏事件数量响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏事件数量响应类", description = "大屏事件数量响应类")
-public class BigScreenEnventCountVO {
-
-    @ApiModelProperty(value = "今日上报事件数量")
-    private String todayCount;
-    @ApiModelProperty(value = "累计上报事件数量")
-    private Integer total;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenEnventTrendVO.java

@@ -1,26 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏事件趋势响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏事件趋势响应类", description = "大屏事件趋势响应类")
-public class BigScreenEnventTrendVO {
-
-    @ApiModelProperty(value = "日期")
-    private String dataDate;
-    @ApiModelProperty(value = "数量")
-    private Integer number;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenEventTotalVO.java

@@ -1,25 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 服务站大屏事件总计响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "服务站大屏事件总计响应类", description = "服务站大屏事件总计响应类")
-public class BigScreenEventTotalVO {
-
-    @ApiModelProperty(value = "实时事件数")
-    private Long rtEventAmount;
-
-    @ApiModelProperty(value = "已完成事件数")
-    private Long hisEventAmount;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenEventVO.java

@@ -1,31 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 站点大屏安全事件响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "站点大屏安全事件响应类", description = "站点大屏安全事件响应类")
-public class BigScreenEventVO {
-
-
-    @ApiModelProperty("安全事件名称")
-    private String title;
-
-    @ApiModelProperty("时间")
-    private String createTime;
-
-    @ApiModelProperty("处理状态")
-    private String status;
-
-    @ApiModelProperty("事件类型")
-    private String eventType;
-}

src/main/java/com/care/bigscreen/vo/BigScreenLiveTypeVO.java

@@ -1,30 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏居住类型比例响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏居住类型比例响应类", description = "大屏居住类型比例响应类")
-public class BigScreenLiveTypeVO {
-
-    @ApiModelProperty(value = "居住类别：1：独居 2：非独居 3：集中居住 4：其他")
-    private String liveType;
-    @ApiModelProperty(value = "居住类别：1：独居 2：非独居 3：集中居住 4：其他")
-    private String liveTypeName;
-    @ApiModelProperty(value = "数量")
-    private Integer num;
-    @ApiModelProperty(value = "比率")
-    private BigDecimal rate;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenOlderCardTotalVO.java

@@ -1,26 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-
-/**
- * 服务站大屏用户卡片总计响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "服务站大屏用户卡片总计响应类", description = "服务站大屏用户卡片总计响应类")
-public class BigScreenOlderCardTotalVO {
-
-    @ApiModelProperty(value = "全部用户数")
-    private Long allOlderAmount;
-
-    @ApiModelProperty(value = "紧急事件用户数")
-    private Long alarmOlderAmount;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenOlderDetailVO.java

@@ -1,70 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-
-/**
- * 站点大屏被监护人详情响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "站点大屏被监护人详情响应类", description = "站点大屏被监护人详情响应类")
-public class BigScreenOlderDetailVO {
-
-    @ApiModelProperty("被监护人ID")
-    private Long olderId;
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-    @ApiModelProperty("性别：M：男 W：女")
-    private String gender;
-
-    @ApiModelProperty("年龄")
-    private Integer age;
-
-    @ApiModelProperty("居住类别：1：独居 2：非独居 3：集中居住 4：其他")
-    private String liveType;
-
-    @ApiModelProperty("床号或者门牌号")
-    private String bedNumber;
-
-    @ApiModelProperty("安全级别： 1 ：一级 2：二级 3: 三级")
-    private String safeLevel;
-
-    @ApiModelProperty("钥匙托管类型： 1 ：电子 2：机械 0：未托管")
-    private String keyEscrowType;
-
-    @ApiModelProperty("呼吸频率")
-    private Integer breathRate;
-
-    @ApiModelProperty("心跳频率")
-    private Integer heartRate;
-
-    @ApiModelProperty("地址")
-    private String addr;
-
-    @ApiModelProperty("电话")
-    private String phone;
-
-    @ApiModelProperty("是否有户外设备，Y：有，N：没有")
-    private String hasOurDoorDevice;
-
-    @ApiModelProperty("被监护人状态")
-    private String olderStatus;
-
-    @ApiModelProperty("被监护人的事件状态")
-    private String olderEventStatus;
-
-    @ApiModelProperty("紧急联系人列表")
-    private List<BigSreenOlderContactVO>  olderContactList;
-
-}

src/main/java/com/care/bigscreen/vo/BigScreenOrgVO.java

@@ -1,36 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏机构响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏机构响应类", description = "大屏机构响应类")
-public class BigScreenOrgVO {
-
-
-    @ApiModelProperty(value = "服务站总数")
-    private Long stationAmount;
-
-    @ApiModelProperty(value = "坐席总人数")
-    private Long seatsAmount;
-
-    @ApiModelProperty(value = "坐席总在线时长(小时)")
-    private BigDecimal seatsOnlineDuration;
-
-    @ApiModelProperty(value = "坐席当前在线人数")
-    private Long seatsCurrOnlineAmount;
-
-    @ApiModelProperty(value = "坐席累计接打分钟数")
-    private BigDecimal seatsCallMinAmount;
-}

src/main/java/com/care/bigscreen/vo/BigScreenStationVO.java

@@ -1,56 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏站点响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "大屏站点响应类", description = "大屏站点响应类")
-public class BigScreenStationVO {
-
-    @ApiModelProperty(value = "站点ID")
-    private Long stationId;
-
-    @ApiModelProperty(value = "服务站名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "机构ID")
-    private Long orgId;
-
-    @ApiModelProperty(value = "经度")
-    private BigDecimal longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private BigDecimal latitude;
-
-    @ApiModelProperty(value = "负责人")
-    private String director;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "地址")
-    private String addr;
-
-    @ApiModelProperty(value = "用户数")
-    private Long olderAmount;
-
-    @ApiModelProperty(value = "安全事件数")
-    private Long eventAmount;
-
-    @ApiModelProperty(value = "管家人数")
-    private Long chamberlainAmount;
-
-    @ApiModelProperty(value = "设备数量")
-    private Long deviceAmount;
-}

src/main/java/com/care/bigscreen/vo/BigSreenOlderContactVO.java

@@ -1,43 +0,0 @@
-package com.care.bigscreen.vo;
-
-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;
-
-/**
- * 被监护人紧急联系人(BigSreenOlderContactVO)实体类
- *
- * @author makejava
- * @since 2021-05-21 00:08:19
- */
-
-@Data
-@ApiModel(value = "被监护人紧急联系人", description = "")
-public class BigSreenOlderContactVO {
-
-    @ApiModelProperty("ID")
-    private Long contactId;
-
-    @ApiModelProperty("姓名")
-    private String contactName;
-
-
-    @ApiModelProperty("电话")
-    private String contactPhone;
-
-
-    @ApiModelProperty("关系类别：1:亲属  2：邻居")
-    private String relationType;
-
-
-
-}

src/main/java/com/care/bigscreen/vo/OpBigScreenStatisticsVO.java

@@ -1,142 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 运营商大屏统计响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "运营商大屏统计响应类", description = "运营商大屏统计响应类")
-public class OpBigScreenStatisticsVO {
-
-    @ApiModelProperty(value = "用户数")
-    private Long olderAmount;
-
-    @ApiModelProperty(value = "60至80岁用户数")
-    private Long older6080Amount;
-
-    @ApiModelProperty(value = "60至80岁用户数占比")
-    private BigDecimal older6080Rate;
-
-    @ApiModelProperty(value = "80岁以上用户数")
-    private Long older80AboveAmount;
-
-    @ApiModelProperty(value = "80岁以上用户数占比")
-    private BigDecimal older80AboveRate;
-
-    @ApiModelProperty(value = "独居人数")
-    private Long aloneLivingAmount;
-
-    @ApiModelProperty(value = "独居人数占比")
-    private BigDecimal aloneLivingRate;
-
-    @ApiModelProperty(value = "非独居人数")
-    private Long noAloneLivingAmount;
-
-    @ApiModelProperty(value = "非独居人数占比")
-    private BigDecimal noAloneLivingRate;
-
-    @ApiModelProperty(value = "集中居住人数")
-    private Long concentrateLivingAmount;
-
-    @ApiModelProperty(value = "集中居住人数占比")
-    private BigDecimal concentrateLivingRate;
-
-    @ApiModelProperty(value = "其他居住人数")
-    private Long otherLivingAmount;
-
-    @ApiModelProperty(value = "其他居住人数占比")
-    private BigDecimal otherLivingRate;
-
-    @ApiModelProperty(value = "一级守护人数")
-    private Long oneLevelAmount;
-
-    @ApiModelProperty(value = "二级守护人数")
-    private Long twoLevelAmount;
-
-    @ApiModelProperty(value = "三级守护人数")
-    private Long threeLevelAmount;
-
-    @ApiModelProperty(value = "安全管家总人数")
-    private Long chamberlainAmount;
-
-    @ApiModelProperty(value = "平均每人服务用户数")
-    private BigDecimal serveAmountAvg;
-
-    @ApiModelProperty(value = "累计服务总人次")
-    private Long serveAmount;
-
-    @ApiModelProperty(value = "设备总数")
-    private Long deviceAmount;
-
-    @ApiModelProperty(value = "室内在线总数")
-    private Long indoorOnlineAmount;
-
-    @ApiModelProperty(value = "室内在线占比")
-    private BigDecimal indoorOnlineRate;
-
-    @ApiModelProperty(value = "室内离线总数")
-    private Long indoorOfflineAmount;
-
-    @ApiModelProperty(value = "户外在线总数")
-    private Long outdoorOnlineAmount;
-
-    @ApiModelProperty(value = "户外在线占比")
-    private BigDecimal outdoorOnlineRate;
-
-    @ApiModelProperty(value = "户外离线总数")
-    private Long outdoorOfflineAmount;
-
-    @ApiModelProperty(value = "实时安全事件数")
-    private Long rtEventAmount;
-
-    @ApiModelProperty(value = "实时_跌倒事件数")
-    private Long rtFallAmount;
-
-    @ApiModelProperty(value = "实时_久滞事件数")
-    private Long rtStagnationAmount;
-
-    @ApiModelProperty(value = "实时_坠床事件数")
-    private Long rtFallingBedAmount;
-
-    @ApiModelProperty(value = "实时_主动呼叫事件数")
-    private Long rtActiveCallAmount;
-
-    @ApiModelProperty(value = "实时_户外呼叫事件数")
-    private Long rtOutdoorsCallAmount;
-
-    @ApiModelProperty(value = "历史安全事件数")
-    private Long hisEventAmount;
-
-    @ApiModelProperty(value = "历史_跌倒事件数")
-    private Long hisFallAmount;
-
-    @ApiModelProperty(value = "历史_久滞事件数")
-    private Long hisStagnationAmount;
-
-    @ApiModelProperty(value = "历史_坠床事件数")
-    private Long hisFallingBedAmount;
-
-    @ApiModelProperty(value = "历史_主动呼叫事件数")
-    private Long hisActiveCallAmount;
-
-    @ApiModelProperty(value = "历史_户外呼叫事件数")
-    private Long hisOutdoorsCallAmount;
-
-    @ApiModelProperty(value = "坐席总人数")
-    private Long seatsAmount;
-
-    @ApiModelProperty(value = "坐席总在线时长(小时)")
-    private BigDecimal seatsOnlineDuration;
-
-
-}

src/main/java/com/care/bigscreen/vo/OrgBigScreenStatisticsVO.java

@@ -1,76 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 机构大屏统计响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "机构大屏统计响应类", description = "机构大屏统计响应类")
-public class OrgBigScreenStatisticsVO {
-
-
-    @ApiModelProperty(value = "安全管家总人数")
-    private Long chamberlainAmount;
-
-    @ApiModelProperty(value = "服务中人数")
-    private Long chamberlainInServiceAmount;
-
-    @ApiModelProperty(value = "累计服务总人次")
-    private Long serveAmount;
-
-    @ApiModelProperty(value = "服务站总数")
-    private Long stationAmount;
-
-    @ApiModelProperty(value = "设备总数")
-    private Long deviceAmount;
-
-    @ApiModelProperty(value = "设备在线总数")
-    private Long deviceOnlineAmount;
-
-    @ApiModelProperty(value = "设备离线总数")
-    private Long deviceOfflineAmount;
-
-    @ApiModelProperty(value = "实时安全事件数")
-    private Long rtEventAmount;
-
-    @ApiModelProperty(value = "跌倒事件数")
-    private Long fallAmount;
-
-    @ApiModelProperty(value = "跌倒事件数占比")
-    private BigDecimal fallRate;
-
-    @ApiModelProperty(value = "久滞事件数")
-    private Long stagnationAmount;
-
-    @ApiModelProperty(value = "久滞事件数占比")
-    private BigDecimal stagnationRate;
-
-    @ApiModelProperty(value = "坠床事件数")
-    private Long fallingBedAmount;
-
-    @ApiModelProperty(value = "坠床事件数占比")
-    private BigDecimal fallingBedRate;
-
-    @ApiModelProperty(value = "主动呼叫事件数")
-    private Long activeCallAmount;
-
-    @ApiModelProperty(value = "主动呼叫事件数占比")
-    private BigDecimal activeCallRate;
-
-    @ApiModelProperty(value = "户外呼叫事件数")
-    private Long outdoorsCallAmount;
-
-    @ApiModelProperty(value = "户外呼叫事件数占比")
-    private BigDecimal outdoorsCallRate;
-
-}

src/main/java/com/care/bigscreen/vo/StationBigScreenStatisticsVO.java

@@ -1,48 +0,0 @@
-package com.care.bigscreen.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-/**
- * 大屏统计响应类
- *
- * @author stw
- * @since 2021-05-20
- */
-@Data
-@ApiModel(value = "站点大屏统计响应类", description = "站点大屏统计响应类")
-public class StationBigScreenStatisticsVO {
-    @ApiModelProperty(value = "站点ID")
-    private Long stationId;
-
-    @ApiModelProperty(value = "服务站名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "用户数")
-    private Long olderAmount;
-
-    @ApiModelProperty(value = "安全管家总人数")
-    private Long chamberlainAmount;
-
-    @ApiModelProperty(value = "累计服务人次")
-    private Long serveAmount;
-
-    @ApiModelProperty(value = "今天服务人次")
-    private Long serveTodayAmount;
-
-    @ApiModelProperty(value = "坐席总人数")
-    private Long seatsAmount;
-
-    @ApiModelProperty(value = "坐席当前在线人数")
-    private Long seatsCurrOnlineAmount;
-
-    @ApiModelProperty(value = "坐席累计接打分钟数")
-    private BigDecimal seatsCallMinAmount;
-
-
-}

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

@@ -1,153 +0,0 @@
-package com.care.bms.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.DeviceService;
-import com.care.common.annotation.Permission;
-import com.care.common.entity.CareDevice;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareDeviceService;
-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.device.DeviceVO;
-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 javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "DeviceController", tags = { "设备管理" })
-@Slf4j
-@RequestMapping("/bms/Device")
-@Permission
-public class DeviceController {
-
-    @Autowired
-    private DeviceService deviceService;
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "设备列表分页--二期修改")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "stationId", value = "服务站ID"),
-            @ApiImplicitParam(paramType = "query", name = "devCode", value = "设备编码"),
-            @ApiImplicitParam(paramType = "query", name = "activeStatus", value = "激活状态"),
-            @ApiImplicitParam(paramType = "query", name = "chambName", value = "关联管家"),
-            @ApiImplicitParam(paramType = "query", name = "status", value = "状态"),
-            @ApiImplicitParam(paramType = "query", name = "houseAddr", value = "地址"),
-            @ApiImplicitParam(paramType = "query", name = "chambId", value = "管家ID"),
-            @ApiImplicitParam(paramType = "query", name = "memberId", value = "用户ID"),
-            @ApiImplicitParam(paramType = "query", name = "orgId", value = "机构ID"),
-    })
-    public PageResult<List<DeviceVO>> listDevice(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                 @RequestParam(value = "stationId", required = false) Long stationId,
-                                                 @RequestParam(value = "devCode", required = false) String devCode,
-                                                 @RequestParam(value = "activeStatus", required = false) String activeStatus,
-                                                 @RequestParam(value = "chambName", required = false) String chambName,
-                                                 @RequestParam(value = "status", required = false) String status,
-                                                 @RequestParam(value = "houseAddr", required = false) String houseAddr,
-                                                 @RequestParam(value = "chambId", required = false) Long chambId,
-                                                 @RequestParam(value = "memberId", required = false) Long memberId,
-                                                 @RequestParam(value = "orgId", required = false) Long orgId,
-                                                 PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<DeviceVO> pageResponse = this.deviceService.listDevice(stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,orgId,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( "获取列表失败");
-        }
-    }
-
-
-//    @PostMapping("/add")
-//    @ApiOperation(value = "新增设备")
-//    public Result<Object> addDevice(HttpServletRequest request,@RequestHeader("token") String token,
-//                                       @RequestBody DeviceVO vo){
-//        try {
-//            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-//            this.deviceService.createDevice(vo,loginUser);
-//            return  Result.success("新增成功！");
-//        }catch (BDException e) {
-//            log.error("新增设备-出现异常",e);
-//            return Result.error(e.getMessage());
-//        } catch (Exception e) {
-//            log.error("设备管理: 新增设备出现异常",e);
-//            return Result.error("新增失败！");
-//        }
-//    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "更新设备--二期修改")
-    public Result<Object> update(HttpServletRequest request,@RequestHeader("token") String token,
-                                   @RequestBody DeviceVO vo){
-        try {
-            this.deviceService.updateDevice(vo);
-            return  Result.success("修改成功！");
-        }catch (BDException e) {
-            log.error("修改设备-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备管理: 修改设备出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-
-    @GetMapping("/getDeviceInfo/{deviceId}")
-    @ApiOperation(value = "详情--二期修改")
-    public Result<DeviceVO> getDeviceInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("deviceId") Long deviceId){
-        DeviceVO orderInfo = this.deviceService.getDevById(deviceId);
-        return  Result.success("查询成功！",orderInfo);
-    }
-
-    @PostMapping("/del/{deviceId}")
-    @ApiOperation(value = "删除设备")
-    public Result<Object> delete(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @PathVariable("deviceId") Long deviceId){
-        try {
-            this.deviceService.deleteById(deviceId);
-            return  Result.success("删除成功！");
-        } catch (Exception e) {
-            log.error("设备管理: 删除出现异常",e);
-            return Result.error("删除失败！");
-        }
-    }
-
-    @GetMapping("/synDev")
-    @ApiOperation(value = "同步设备 -- 四期新增")
-    public Result<Object> synDev(@RequestHeader("token") String token,
-            @RequestParam(value = "companyId", required =  true) String companyId) {
-        try {
-            deviceService.synDev(companyId);
-            return  Result.success("同步成功！");
-        }catch (BDException e) {
-            log.error("同步设备-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备管理: 同步设备出现异常",e);
-            return Result.error("同步设备失败！");
-        }
-    }
-
-}

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

@@ -1,55 +0,0 @@
-package com.care.bms.controller;
-
-
-
-import com.care.bms.service.DimCodeService;
-import com.care.common.util.Result;
-import com.care.common.vo.DimCodeVO;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-/**
- * @author
- * @version 1.0.0 创建于 2019-12-04
- **/
-@RestController
-@Slf4j
-public class DimController {
-
-    @Resource
-    private DimCodeService dimCodeService;
-
-
-    @ApiOperation(tags = {"编码管理"}, value = "根据编码类型查询编码项全部列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
-            @ApiImplicitParam(name = "typeCode", value = "编码类型，纬度类型表type",
-                    dataType = "String", paramType = "query",
-                    required = true)
-    })
-    @GetMapping(value = "/dict/queryDictItemsByType", produces = "application/json;charset=utf-8")
-    public Result<List<DimCodeVO>> queryDictItemsByType(
-            @RequestHeader(name = "token", required = true) String token,
-            @RequestParam(name = "typeCode", required = true) String typeCode
-            ) {
-        try {
-
-            List<DimCodeVO> list = this.dimCodeService.queryDimCodeByType(typeCode);
-            return Result.success(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return Result.error( "获取列表失败");
-        }
-    }
-
-}

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

@@ -1,418 +0,0 @@
-package com.care.bms.controller;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bigscreen.service.BigScreenService;
-import com.care.bms.service.BmsEventOrderService;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.entity.CareEventOrderChamb;
-import com.care.common.enums.CallResultEnum;
-import com.care.common.service.CareEventOrderChambService;
-import com.care.common.vo.order.*;
-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.outcall.CcCallResultVO;
-import com.google.common.collect.Maps;
-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 javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "EventHandleController", tags = { "事件处理" })
-@Slf4j
-@RequestMapping("/bms/event")
-@Permission
-public class EventHandleController {
-
-    @Autowired
-    private BmsEventOrderService bmsEventOrderService;
-    @Resource
-    private BigScreenService bigScreenService;
-    @Resource
-    private CareEventOrderChambService careEventOrderChambService;
-
-    /**
-     *未处理事件查询
-     * @param request
-     * @return
-     */
-    @GetMapping("/not-handle/list")
-    @ApiOperation(tags = {"未处理事件"},value = "未处理事件查询")
-    public Result<List<EventOrderVO>> listNotHandle(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            List<EventOrderVO> datas = this.bmsEventOrderService.listTodoOrder(OrderStatusEnum.TODO.getValue(), null,loginUser);
-            return PageResult.success(datas);
-        }catch (BDException e) {
-            log.error("未处理事件查询列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("事件处理: 未处理事件查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-
-    /**
-     *未处理事件数量查询
-     * @param request
-     * @return
-     */
-    @GetMapping("/not-handle/getCount")
-    @ApiOperation(tags = {"未处理事件"},value = "未处理事件数量查询  --二期新增")
-    public Result<Integer> getNotHandleCount(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            Integer count = this.bmsEventOrderService.getTodoOrderCount(OrderStatusEnum.TODO.getValue(), null,loginUser);
-            return Result.success(count);
-        }catch (BDException e) {
-            log.error("未处理事件数量查询出现异常",e);
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("事件处理: 未处理事件数量查询出现异常",e);
-            return Result.error( "获取未处理事件数量失败");
-        }
-    }
-
-    @GetMapping("/my-handle/list")
-    @ApiOperation(tags = {"我的处理事件"},value = "我的处理事件查询 分页  --二期修改")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "header", name = "status", value = "状态"),
-            @ApiImplicitParam(paramType = "query", name = "status", value = "状态"),
-            @ApiImplicitParam(paramType = "query", name = "title", value = "工单标题"),
-            @ApiImplicitParam(paramType = "query", name = "olderName", value = "老人姓名"),
-    })
-    public PageResult<List<EventOrderVO>> listMyHandle(HttpServletRequest request,@RequestHeader(value = "token") String token,
-                                                           @RequestParam(value = "status", required = false) String status,
-                                                           @RequestParam(value = "title", required = false) String title,
-                                                           @RequestParam(value = "olderName", required = false) String olderName,
-                                                            PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent4MyDo(status, title, 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( "获取列表失败");
-        }
-    }
-
-    /**
-     *历史告警查询
-     * @param request
-     * @return
-     */
-    @GetMapping("/my-handle/listHisWarn")
-    @ApiOperation(tags = {"我的处理事件"},value = "历史告警查询 -- 二期新增")
-    public Result<List<OrderHandleHisVO>> listHisWarn(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                  @RequestParam(value = "orderId", required = true) Long orderId){
-        try {
-            List<OrderHandleHisVO> datas = this.bmsEventOrderService.listHisWarn(orderId);
-            return PageResult.success(datas);
-        }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<EventOrderVO>> list(HttpServletRequest request,
-                                               @RequestParam(value = "status", required = false) String status,
-                                               @RequestParam(value = "type", required = false) String type,
-                                               @RequestParam(value = "title", required = false) String title,
-                                               @RequestParam(value = "olderName", required = false) String olderName,
-                                               @RequestParam(value = "chambId", required = false) String chambId,
-                                               @RequestParam(value = "deviceCode", required = false) String deviceCode,
-                                               PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEvent(status, type, title, olderName, chambId, deviceCode, 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("/listByChamb")
-    @ApiOperation(tags = {"事件查询"},value = "事件查询 分页")
-    public PageResult<List<EventOrderVO>> listByChamb(HttpServletRequest request,
-                                               @RequestParam(value = "status", required = false) String status,
-                                               @RequestParam(value = "chambId", required = false) String chambId,
-                                               PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEventByChamb(status, chambId, 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("/listByDevice")
-    @ApiOperation(tags = {"事件查询"},value = "事件查询 分页")
-    public PageResult<List<EventOrderVO>> listByDevice(HttpServletRequest request,
-                                                      @RequestParam(value = "status", required = false) String status,
-                                                      @RequestParam(value = "deviceCode", required = false) String deviceCode,
-                                                      PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<EventOrderVO> pageResponse = this.bmsEventOrderService.listEventByDevice(status, deviceCode, 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( "获取列表失败");
-        }
-    }
-
-    /**
-     *近期处理事件(处理中事件)
-     * @param request
-     * @return
-     */
-    @GetMapping("/recent-handle/list")
-    @ApiOperation(tags = {"近期处理事件"},value = "近期处理事件（只有坐席能用）--二期新增")
-    public Result<List<EventOrderVO>> listRecentHandle(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            List<EventOrderVO> datas = this.bmsEventOrderService.listRecentHandle(OrderStatusEnum.DOING.getValue(),loginUser);
-            return PageResult.success(datas);
-        }catch (BDException e) {
-            log.error("近期处理事件查询列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("事件处理: 近期处理事件查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-
-    @PostMapping("/receive/{orderId}")
-    @ApiOperation(tags = {"未处理事件"},value = "立即处理-领取工单")
-    public Result<Object> receiveOrder(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        this.bmsEventOrderService.receiveOrder(orderId,loginUser);
-        bigScreenService.pushRtEventFlag(loginUser.getOrgId(),loginUser.getStationId(),String.valueOf(orderId),"orderHandle");
-        return  Result.success("领取工单成功！");
-    }
-    @GetMapping("/getEventInfo/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "事件详情")
-    public Result<EventOrderVO> getEventInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        EventOrderVO orderInfo = this.bmsEventOrderService.getOrderInfo(orderId);
-        return  Result.success("查询成功！",orderInfo);
-    }
-
-    @GetMapping("/getChambList/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "主管家和改派管家列表查询  --二期新增")
-    public Result<List<ChamberlainVO>> getChambList(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        List<ChamberlainVO> older = this.bmsEventOrderService.queryChambList(orderId);
-        return  Result.success("查询成功！",older);
-    }
-
-    @GetMapping("/getOlderList/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "被监护人信息列表")
-    public Result<List<OrderOlderVO>> getOlderList(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        List<OrderOlderVO> older = this.bmsEventOrderService.queryOrderOlderList(orderId);
-        return  Result.success("查询成功！",older);
-    }
-
-    @GetMapping("/getChamberlain/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "事件定单管家查询")
-    public Result<CareEventOrderChamb> getChamberlain(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("orderId") Long orderId){
-        CareEventOrderChamb chamb = this.bmsEventOrderService.queryChamberlain(orderId);
-        return  Result.success("查询成功！",chamb);
-    }
-
-    @GetMapping("/queryDoHis/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "事件处理历史记录")
-    public Result<List<OrderHandleHisVO>> queryDoHis(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("orderId") Long orderId){
-        return  Result.success("查询成功！",this.bmsEventOrderService.queryOrderHandleHis(orderId));
-    }
-
-    @GetMapping("/queryContactList/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "跟事件相关的联系人列表")
-    public Result<Object> queryContactList(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        return  Result.success("查询成功！",this.bmsEventOrderService.queryContactList(orderId));
-    }
-
-    @PostMapping("/complete/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "完成工单")
-    public Result<Object> complete(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        this.bmsEventOrderService.complete(orderId,loginUser);
-        this.bmsEventOrderService.sendSmsToMemberAndLianxiren(orderId,"工单完成");
-        return  Result.success("操作成功！");
-    }
-
-    @PostMapping("/completeByIds/{ids}")
-    @ApiOperation(tags = {"事件处理"},value = "完成工单")
-    public Result<Object> completeByIds(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("ids") String ids){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        boolean execFlag = this.bmsEventOrderService.completeByIds(Arrays.asList(ids.split(",")), loginUser);
-        return execFlag ? Result.success("操作成功！") : Result.error();
-    }
-
-    @GetMapping("/keyAuth/list/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "钥匙申请列表")
-    public Result<List<OrderKeyApplyVO>> queryKeyAuthList(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("orderId") Long orderId){
-        return  Result.success("查询成功！",this.bmsEventOrderService.queryKeyAuthList(orderId));
-    }
-    @PostMapping("/key/auth/{applyId}")
-    @ApiOperation(tags = {"事件处理"},value = "钥匙授权")
-    public Result<Object> keyAuth(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("applyId") Long applyId){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        if (this.bmsEventOrderService.keyAuth(applyId,loginUser)) {
-            return  Result.success("钥匙授权成功！");
-        }else{
-            return  Result.error("钥匙授权失败！");
-        }
-    }
-    @PostMapping("/contact/updateStatus/{orderContactId}/{status}")
-    @ApiOperation(tags = {"事件处理"},value = "更新联系人状态")
-    public Result<Object> updateOrderContactStatus(HttpServletRequest request,@RequestHeader("token") String token,
-                                                   @PathVariable("orderContactId") Long orderContactId,
-                                                   @PathVariable("status") Integer status){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        if (this.bmsEventOrderService.updateOrderContactStatus(orderContactId,status,loginUser)) {
-            return  Result.success("更新成功！");
-        }else{
-            return  Result.error("更新失败！");
-        }
-
-    }
-    @GetMapping("/getSmsTemplate/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "查询要发送的短息内容")
-    public Result<String> getSmsTemplate( @PathVariable("orderId") Long orderId){
-        return  Result.success("查询成功！",this.bmsEventOrderService.getSmsTemplate(orderId));
-    }
-    @PostMapping("/sendSms/{orderContactId}")
-    @ApiOperation(tags = {"事件处理"},value = "发送短信")
-    public Result<Object> sendSms(HttpServletRequest request,@RequestHeader("token") String token,
-                                  @PathVariable("orderContactId") Long orderContactId){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        boolean flag = this.bmsEventOrderService.sendSmsToLianxiren(orderContactId);
-        if (flag){
-           return Result.success("发送短信成功！");
-        }else {
-            return  Result.error("发送短信失败！");
-        }
-
-    }
-    @GetMapping("/getCallRadio/{hisId}")
-    @ApiOperation(tags = {"事件处理"},value = "获取通话录音")
-    public Result<CcCallResultVO> getCallRadio(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("hisId") Long hisId){
-        CcCallResultVO ccCallResultVO = this.bmsEventOrderService.getCallRadio(hisId);
-        if (ccCallResultVO != null) {
-            return  Result.success("获取通话录音！");
-        }else{
-            return  Result.error("通话记录不存在！");
-        }
-    }
-    @GetMapping("/stat")
-    @ApiOperation(tags = {"事件查询"},value = "查询事件统计信息")
-    public Result<Object> stat(HttpServletRequest request,@RequestHeader("token") String token, @RequestParam(value = "chambId", required = false) Long chambId,
-                               @RequestParam(value = "deviceCode", required = false) String deviceCode){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        EventStaVO ccCallResultVO = this.bmsEventOrderService.statOrder(loginUser, chambId, deviceCode);
-        if (ccCallResultVO != null) {
-            return  Result.success("查询成功！",ccCallResultVO);
-        }else{
-            return  Result.error("查询失败！");
-        }
-    }
-
-    @GetMapping("/callResultCode")
-    @ApiOperation(tags = {"事件处理"},value = "呼叫结果编码")
-    public Result<List<Map<String,Object>>>getChamberlain(){
-        List<Map<String,Object>> datas = new ArrayList<>();
-        for (CallResultEnum callResultEnum : CallResultEnum.values()){
-            Map<String,Object> data = Maps.newHashMap();
-            data.put("name",callResultEnum.getName());
-            data.put("value",callResultEnum.getValue());
-            datas.add(data);
-        }
-        return  Result.success("查询成功！",datas);
-    }
-    @GetMapping("/getRealTimeMonitorUrl/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "获取实时监控URL")
-    public Result<String> getRealTimeMonitorUrl(HttpServletRequest request,@RequestHeader("token") String token, @PathVariable("orderId") Long orderId){
-        String url = this.bmsEventOrderService.getRealTimeMonitorUrl(orderId);
-        if (StrUtil.isNotEmpty(url)) {
-            return  Result.success("查询成功！",url);
-        }else{
-            return  Result.error("查询失败！");
-        }
-    }
-
-    @GetMapping("/getFreeKeeperList/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "获取空闲管家列表  --二期新增")
-    public Result<List<ChamberlainVO> > getFreeKeeperList(HttpServletRequest request,@RequestHeader("token") String token, @PathVariable("orderId") Long orderId){
-        List<ChamberlainVO> chamberlainVOList = this.bmsEventOrderService.getFreeChamberlainList(orderId);
-        if (CollUtil.isNotEmpty(chamberlainVOList)) {
-            return  Result.success("查询成功！",chamberlainVOList);
-        }else{
-            return  Result.error("没有空闲管家！");
-        }
-    }
-
-
-    @PostMapping("/assignKeeper/{orderId}/{chambId}")
-    @ApiOperation(tags = {"事件处理"},value = "指派管家  --二期新增")
-    public Result<Object> assignKeeper(HttpServletRequest request,@RequestHeader("token") String token,
-                                                   @PathVariable("orderId") Long orderId,
-                                                   @PathVariable("chambId") Long chambId){
-
-        if (this.bmsEventOrderService.updateCareEventOrderChamb(orderId,chambId)) {
-            return  Result.success("指派管家成功！");
-        }else{
-            return  Result.error("指派管家失败！");
-        }
-
-    }
-
-    @GetMapping("/getEventOrderChamb")
-    @ApiOperation(tags = {"事件处理"},value = "获取管家处理结果  -- 三期修改")
-    public Result<ChambEventOrderVO> getEventInfo(HttpServletRequest request, @RequestHeader("token") String token, @RequestParam("orderId") Long orderId, @RequestParam("chambId") Long chambId) {
-        ChambEventOrderVO chambEventOrderVO = this.careEventOrderChambService.getChambOrderByOrderIdAndChambId(orderId, chambId);
-        return  Result.success("查询成功！", chambEventOrderVO);
-    }
-}

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

@@ -1,135 +0,0 @@
-package com.care.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.HouseService;
-import com.care.common.annotation.Permission;
-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.device.HouseVO;
-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 javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "HouseController", tags = { "房屋管理---二期去除" })
-@Slf4j
-@RequestMapping("/bms/house")
-@Permission
-public class HouseController {
-
-    @Autowired
-    private HouseService houseService;
-
-    @GetMapping("/list")
-    @ApiOperation(value = "房屋列表分页")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "status", value = "状态"),
-            @ApiImplicitParam(paramType = "query", name = "addr", value = "地址"),
-            @ApiImplicitParam(paramType = "query", name = "stationId", value = "服务站ID"),
-    })
-    public PageResult<List<HouseVO>> listHouse(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                               @RequestParam(value = "status", required = false) String status,
-                                               @RequestParam(value = "addr", required = false) String addr,
-                                               @RequestParam(value = "stationId", required = false) Long stationId,
-                                               PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<HouseVO> pageResponse = this.houseService.listHouse(addr,stationId,status,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( "获取列表失败");
-        }
-    }
-
-
-    @PostMapping("/add")
-    @ApiOperation(value = "新增房屋")
-    public Result<Object> addHouse(HttpServletRequest request,@RequestHeader("token") String token,
-                                       @RequestBody HouseVO vo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            this.houseService.createHouse(vo,loginUser);
-            return  Result.success("新增成功！");
-        }catch (BDException e) {
-            log.error("新增房屋-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("房屋管理: 新增房屋出现异常",e);
-            return Result.error("新增失败！");
-        }
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "新增房屋")
-    public Result<Object> update(HttpServletRequest request,@RequestHeader("token") String token,
-                                   @RequestBody HouseVO vo){
-        try {
-            this.houseService.updateHouse(vo);
-            return  Result.success("修改成功！");
-        }catch (BDException e) {
-            log.error("修改房屋-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("房屋管理: 修改房屋出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-    @GetMapping("/getHouseInfo/{houseId}")
-    @ApiOperation(value = "详情")
-    public Result<HouseVO> getHouseInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("houseId") Long houseId){
-        HouseVO orderInfo = this.houseService.getHouseById(houseId);
-        return  Result.success("查询成功！",orderInfo);
-    }
-
-    @PostMapping("/del/{houseId}")
-    @ApiOperation(value = "新增房屋")
-    public Result<Object> delete(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @PathVariable("houseId") Long houseId){
-        try {
-            this.houseService.deleteById(houseId);
-            return  Result.success("删除成功！");
-        } catch (Exception e) {
-            log.error("房屋管理: 删除出现异常",e);
-            return Result.error("删除失败！");
-        }
-    }
-    /**
-     *服务站下拉列表
-     * @param request
-     * @return
-     */
-    @GetMapping("/list4Select")
-    @ApiOperation(tags = {"设备管理"},value = "某个服务站下的房屋下拉列表")
-    public Result<List<HouseVO>> listNotHandle(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                     @RequestParam(name = "stationId") Long stationId){
-        try {
-            List<HouseVO> datas = this.houseService.queryHouseListByStationId(stationId);
-            return Result.success(datas);
-        }catch (Exception e) {
-            log.error("某个服务站下的房屋下拉列表现异常",e);
-            return Result.error( "获取列表失败");
-        }
-    }
-
-}

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

@@ -1,134 +0,0 @@
-package com.care.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.BmsMemberInfoService;
-import com.care.common.annotation.Permission;
-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.memberinfo.MemberInfoVO;
-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 javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: stw
- * @Date: 2021/8/26
- * @Desc:
- */
-@RestController
-@Api(value = "MemberInfoController", tags = { "后台用户管理" })
-@Slf4j
-@RequestMapping("/bms/memberinfo")
-@Permission
-public class MemberInfoController {
-
-    @Autowired
-    private BmsMemberInfoService bmsMemberInfoService;
-
-
-    @GetMapping("/listMemberInfo")
-    @ApiOperation(value = "用户列表分页--二期新增")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "name", value = "用户名"),
-            @ApiImplicitParam(paramType = "query", name = "phone", value = "电话"),
-    })
-    public PageResult<List<MemberInfoVO>> listMemberInfo(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                         @RequestParam(value = "name", required = false) String name,
-                                                         @RequestParam(value = "phone", required = false) String phone,
-                                                         PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<MemberInfoVO> pageResponse = this.bmsMemberInfoService.listCareMemberInfo(loginUser, name,phone,pageReqVo);
-            if(pageResponse != null){
-                return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
-            } else {
-                return PageResult.error( "获取列表失败");
-            }
-
-        }catch (BDException e) {
-            log.error("用户列表查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("用户管理: 用户列表查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-
-
-//
-//    @PostMapping("/addMemberInfo")
-//    @ApiOperation(value = "新增用户")
-//    public Result<Object> addMemberInfo(@RequestHeader("token") String token,
-//                                   @RequestBody MemberInfoVO vo){
-//        try {
-//            this.bmsMemberInfoService.createCareMemberInfo(vo);
-//            return  Result.success("新增成功！");
-//        }catch (BDException e) {
-//            log.error("新增用户-出现异常",e);
-//            return Result.error(e.getMessage());
-//        } catch (Exception e) {
-//            log.error("用户管理: 新增用户出现异常",e);
-//            return Result.error("新增失败！");
-//        }
-//    }
-
-
-    @PostMapping("/updateMemberInfoStatus/{memberId}/{status}")
-    @ApiOperation(value = "修改用户状态，状态：0可用，1停用   --二期新增")
-    public Result<Object> updateMemberInfoStatus(@RequestHeader("token") String token,
-                                                 @PathVariable("memberId") Long memberId,
-                                                 @PathVariable("status") String status) {
-        if (this.bmsMemberInfoService.updateCareMemberInfoStatus(memberId, status)) {
-            return Result.success("更新成功！");
-        } else {
-            return Result.error("更新失败！");
-        }
-    }
-
-//    @PostMapping("/updateMemberInfo")
-//    @ApiOperation(value = "修改用户")
-//    public Result<Object> updateMemberInfo(@RequestHeader("token") String token,
-//                                 @RequestBody MemberInfoVO vo){
-//        try {
-//            this.bmsMemberInfoService.updateCareMemberInfo(vo);
-//            return  Result.success("修改成功！");
-//        }catch (BDException e) {
-//            log.error("修改用户-出现异常",e);
-//            return Result.error(e.getMessage());
-//        } catch (Exception e) {
-//            log.error("用户管理: 修改用户出现异常",e);
-//            return Result.error("修改失败！");
-//        }
-//    }
-
-//    @GetMapping("/getMemberInfoInfo/{memberId}")
-//    @ApiOperation(value = "用户详情")
-//    public Result<MemberInfoVO> getMemberInfoInfo(@RequestHeader("token") String token,@PathVariable("memberId") Long memberId){
-//        MemberInfoVO orderInfo = this.bmsMemberInfoService.getCareMemberInfoById(memberId);
-//        return  Result.success("查询成功！",orderInfo);
-//    }
-//
-//    @PostMapping("/deleteMemberInfo/{memberId}")
-//    @ApiOperation(value = "删除用户")
-//    public Result<Object> deleteMemberInfo(HttpServletRequest request,@RequestHeader("token") String token,
-//                                 @PathVariable("memberId") Long memberId){
-//        try {
-//            this.bmsMemberInfoService.deleteById(memberId);
-//            return  Result.success("删除成功！");
-//        } catch (Exception e) {
-//            log.error("用户管理: 删除出现异常",e);
-//            return Result.error("删除失败！");
-//        }
-//    }
-}

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

@@ -1,197 +0,0 @@
-package com.care.bms.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.OrganizationService;
-import com.care.common.annotation.Permission;
-import com.care.common.entity.CareSysUser;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareSysUserService;
-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.org.OrganizationVO;
-import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
-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.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "OrganizationController", tags = { "机构管理" })
-@Slf4j
-@RequestMapping("/bms/org")
-@Permission
-public class OrganizationController {
-
-    @Autowired
-    private OrganizationService organizationService;
-
-    @Resource
-    private CareSysUserService careSysUserService;
-    /**
-     *服务站下拉列表
-     * @param request
-     * @return
-     */
-    @GetMapping("/list4Select")
-    @ApiOperation(tags = {"机构管理","设备管理"},value = "机构下拉列表 ----四期新增")
-    public Result<List<OrganizationVO>> list4Select(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            List<OrganizationVO> datas = this.organizationService.queryOrgsForSelect(loginUser);
-            return Result.success(datas);
-        }catch (Exception e) {
-            log.error("机构管理: 机构下拉列表查询出现异常",e);
-            return Result.error( "获取列表失败");
-        }
-    }
-
-    @GetMapping("/listOrganization")
-    @ApiOperation(value = "机构列表分页  --四期新增")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "name", value = "机构名称"),
-            @ApiImplicitParam(paramType = "systemName", name = "systemName", value = "系统名称")
-    })
-    public PageResult<List<OrganizationVO>> listOrganization(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                             @RequestParam(value = "name", required = false) String name,
-                                                             @RequestParam(value = "systemName", required = false) String systemName,
-                                                             PageReqVO pageReqVo){
-        try {
-            IPage<OrganizationVO> pageResponse = this.organizationService.listOrganization(name,systemName,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("/synOrganization")
-    @ApiOperation(value = "同步机构 -- 四期新增")
-    public Result<Object> synOrganization(@RequestHeader("token") String token) {
-        try {
-            if (organizationService.synOrganization()){
-                return  Result.success("同步成功！");
-            } else {
-                return Result.error("同步失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("同步机构-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("同步机构: 同步机构出现异常",e);
-            return Result.error("同步失败！");
-        }
-    }
-
-
-    @ApiOperation(value = "修改机构 -logo图片上传 -- 四期新增")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "放在请求头中的令牌",
-                    dataType = "String", paramType = "header",
-                    required = true)
-    })
-    @CrossOrigin
-    @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) {
-        try {
-            String url = organizationService.upload(file);
-            return  Result.success("上传成功！",url);
-        } catch (BDException e) {
-            log.error("logo图片上传出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("机构管理: logo图片上传出现异常",e);
-            return Result.error("logo图片上传失败！");
-        }
-    }
-
-    @PostMapping("/updateOrganization")
-    @ApiOperation(value = "修改机构 --四期新增")
-    public Result<Object> updateOrganization(@RequestHeader("token") String token,
-                                        @RequestBody OrganizationVO vo){
-        try {
-            organizationService.updateOrganization(vo);
-            return Result.success("修改成功！");
-        }catch (BDException e) {
-            log.error("修改机构-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("机构管理: 修改机构出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-    @PostMapping("/invalidOrganization")
-    @ApiOperation(value = "启用停用机构（只设置id和validStatus（0启用，1停用）） --四期新增")
-    public Result<Object> invalidOrganization(@RequestHeader("token") String token,
-                                             @RequestBody OrganizationVO vo){
-        try {
-            organizationService.invalidOrganization(vo);
-            return Result.success("操作成功！");
-        }catch (BDException e) {
-            log.error("启用停用机构-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("机构管理: 启用停用机构出现异常",e);
-            return Result.error("启用停用机构失败！");
-        }
-    }
-
-    @GetMapping("/getOrganizationInfo/{organizationId}")
-    @ApiOperation(value = "机构详情  --四期新增")
-    public Result<OrganizationVO> getOrganizationInfo(@RequestHeader("token") String token,@PathVariable("organizationId") Long organizationId){
-        OrganizationVO vo = this.organizationService.getOrganizationInfo(organizationId);
-        if(vo != null){
-            return  Result.success("查询成功！",vo);
-        } else {
-            return  Result.error("查询失败！");
-        }
-
-    }
-
-    @PostMapping("/resetOrgAccountPassword/{orgAccountId}")
-    @ApiOperation(value = "重置密码 --四期新增")
-    public Result<Object> resetOrgAccountPassword(@RequestHeader("token") String token,
-                                                      @PathVariable("orgAccountId") Long orgAccountId){
-        try {
-            UpdateWrapper<CareSysUser> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().eq(CareSysUser::getId,orgAccountId)
-                    .set(CareSysUser::getPassword, DigestUtils.md5Hex("123456"))
-                    .set(CareSysUser::getModifyTime, new Date());
-            if (careSysUserService.update(updateWrapper)){
-                return  Result.success("重置成功！");
-            } else {
-                return  Result.error("重置失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("重置密码-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("机构管理: 重置密码出现异常",e);
-            return Result.error("重置密码失败！");
-        }
-    }
-
-
-}

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

@@ -1,144 +0,0 @@
-package com.care.bms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.BmsSysUserService;
-import com.care.common.annotation.Permission;
-import com.care.common.entity.CareSysUser;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareSysUserService;
-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.sysuser.SysUserVO;
-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.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "StationAccountController", tags = { "服务站账号管理" })
-@Slf4j
-@RequestMapping("/bms/sysuser")
-@Permission
-public class StationAccountController {
-
-    @Autowired
-    private BmsSysUserService bmsSysUserService;
-
-    @Autowired
-    private CareSysUserService careSysUserService;
-
-    @GetMapping("/listStationAccount")
-    @ApiOperation(value = "服务站账号列表分页  --四期新增")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "stationName", value = "服务站名称"),
-            @ApiImplicitParam(paramType = "query", name = "orgId", value = "机构ID")
-    })
-    public PageResult<List<SysUserVO>> listStationAccount(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                          @RequestParam(value = "stationName", required = false) String stationName,
-                                                          @RequestParam(value = "orgId", required = false) Long orgId,
-                                                          PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<SysUserVO> pageResponse = this.bmsSysUserService.listStationAccount(stationName,orgId,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( "获取列表失败");
-        }
-    }
-
-
-    @PostMapping("/addStationAccount")
-    @ApiOperation(value = "新增服务站账号 --四期新增")
-    public Result<Object> addStationAccount(HttpServletRequest request,@RequestHeader("token") String token,
-                                   @RequestBody SysUserVO vo){
-        try {
-
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            int flag = this.bmsSysUserService.createStationAccount(vo,loginUser);
-            if (flag == 1) {
-                return  Result.error("电话已存在！");
-            } else if (flag == 0) {
-                return  Result.success("新增成功！");
-            } else {
-                return  Result.error("新增失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("新增服务站账号-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("服务站账号管理: 新增服务站账号出现异常",e);
-            return Result.error("新增失败！");
-        }
-    }
-
-    @PostMapping("/updateStationAccount")
-    @ApiOperation(value = "修改服务站账号 （启用停用也用这个接口，只设置id和validStatus（0启用，1停用）） --四期新增")
-    public Result<Object> updateStationAccount(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @RequestBody SysUserVO vo){
-        try {
-            this.bmsSysUserService.updateStationAccount(vo);
-            return  Result.success("修改成功！");
-        }catch (BDException e) {
-            log.error("修改服务站账号-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("服务站账号管理: 修改服务站账号出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-
-    @PostMapping("/resetStationAccountPassword/{stationAccountId}")
-    @ApiOperation(value = "重置密码 --四期新增")
-    public Result<Object> resetStationAccountPassword(@RequestHeader("token") String token,
-            @PathVariable("stationAccountId") Long stationAccountId){
-        try {
-            UpdateWrapper<CareSysUser> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().eq(CareSysUser::getId,stationAccountId)
-                    .set(CareSysUser::getPassword, DigestUtils.md5Hex("123456"))
-                    .set(CareSysUser::getModifyTime, new Date());
-            if (careSysUserService.update(updateWrapper)){
-                return  Result.success("重置成功！");
-            } else {
-                return  Result.error("重置失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("重置密码-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("服务站账号管理: 重置密码出现异常",e);
-            return Result.error("重置密码失败！");
-        }
-    }
-
-    @GetMapping("/getStationAccountInfo/{stationAccountId}")
-    @ApiOperation(value = "服务站账号详情  --四期新增")
-    public Result<SysUserVO> getStationAccountInfo(@RequestHeader("token") String token, @PathVariable("stationAccountId") Long stationAccountId){
-        SysUserVO orderInfo = this.bmsSysUserService.getStationAccountById(stationAccountId);
-        return  Result.success("查询成功！",orderInfo);
-    }
-
-}

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

@@ -1,196 +0,0 @@
-package com.care.bms.controller;
-
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.DeviceService;
-import com.care.bms.service.StationService;
-import com.care.common.annotation.Permission;
-import com.care.common.entity.CareDevice;
-import com.care.common.entity.CareStation;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareDeviceService;
-import com.care.common.service.CareStationService;
-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.device.DeviceDistributeVO;
-import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.station.StationVO;
-import com.care.common.vo.station.StationVO;
-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 javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "StationController", tags = { "服务站管理" })
-@Slf4j
-@RequestMapping("/bms/station")
-@Permission
-public class StationController {
-
-    @Autowired
-    private StationService stationService;
-
-    @Resource
-    private CareStationService careStationService;
-
-    @Autowired
-    private DeviceService deviceService;
-    @Autowired
-    private CareDeviceService careDeviceService;
-
-
-    /**
-     *服务站下拉列表
-     * @param request
-     * @return
-     */
-    @GetMapping("/list4Select")
-    @ApiOperation(tags = {"房屋管理","设备管理"},value = "服务站下拉列表")
-    public Result<List<StationVO>> list4Select(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            List<StationVO> datas = this.stationService.queryStationsForSelect(loginUser);
-            return Result.success(datas);
-        }catch (Exception e) {
-            log.error("服务站管理: 服务站下拉列表查询出现异常",e);
-            return Result.error( "获取列表失败");
-        }
-    }
-
-    @PostMapping("/addStation")
-    @ApiOperation(value = "新增服务站 -- 四期新增")
-    public Result<Object> addStation(HttpServletRequest request,@RequestHeader("token") String token,
-                                     @RequestBody StationVO vo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            vo.setOrgId(loginUser.getOrgId());
-            Long id = stationService.addStation(vo);
-            return  Result.success("新增成功！",id);
-        }catch (BDException e) {
-            log.error("新增服务站-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("新增服务站: 新增服务站出现异常",e);
-            return Result.error("新增失败！");
-        }
-    }
-
-
-
-    @PostMapping("/updateStation")
-    @ApiOperation(value = "修改服务站 --四期新增")
-    public Result<Object> updateStation(@RequestHeader("token") String token,
-                                        @RequestBody StationVO vo){
-        try {
-            CareStation careStation = new CareStation();
-            BeanUtil.copyProperties(vo,careStation);
-            this.careStationService.updateById(careStation);
-            return  Result.success("修改成功！");
-        }catch (BDException e) {
-            log.error("修改服务站-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("服务站管理: 修改服务站出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-    @GetMapping("/getStationInfo/{stationId}")
-    @ApiOperation(value = "服务站详情  --四期新增")
-    public Result<StationVO> getStationInfo(@RequestHeader("token") String token,@PathVariable("stationId") Long stationId){
-        StationVO vo = this.stationService.getStationInfo(stationId);
-        if(vo !=null){
-            return  Result.success("查询成功！",vo);
-        } else {
-            return  Result.error("查询失败！");
-        }
-    }
-
-    @GetMapping("/listStation")
-    @ApiOperation(value = "服务站列表分页  --四期新增")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "name", value = "服务站名称"),
-            @ApiImplicitParam(paramType = "query", name = "orgId", value = "机构ID")
-    })
-    public PageResult<List<StationVO>> listStation(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                       @RequestParam(value = "name", required = false) String name,
-                                                       @RequestParam(value = "orgId", required = false) Long orgId,
-                                                       PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<StationVO> pageResponse = this.stationService.listStation(name,orgId,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("/listDeviceNonStation")
-    @ApiOperation(value = "查询站点为空的设备列表分页--四期期新增")
-    public PageResult<List<DeviceVO>> listDeviceNonStation(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                           PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<DeviceVO> pageResponse = this.deviceService.listDeviceNonStation(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( "获取列表失败");
-        }
-    }
-
-    @PostMapping("/distributeDevice")
-    @ApiOperation(value = "分配设备(对象list中只设置stationId和设备的id) --四期新增 ")
-    public Result<Object> distributeDevice( @RequestHeader("token") String token,
-                                            @RequestBody List<DeviceDistributeVO> vos) {
-        try {
-
-            if (CollUtil.isEmpty(vos)) {
-                return Result.error("分配设备列表不能为空！");
-            }
-            List<CareDevice> careDevices = new ArrayList<>();
-            for (DeviceDistributeVO vo : vos) {
-                CareDevice careDevice = new CareDevice();
-                BeanUtil.copyProperties(vo, careDevice);
-                careDevices.add(careDevice);
-            }
-
-            this.careDeviceService.updateBatchById(careDevices);
-
-            return Result.success("分配设备成功！");
-        } catch (BDException e) {
-            log.error("分配设备-出现异常", e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备管理: 分配设备出现异常", e);
-            return Result.error("分配设备失败！");
-        }
-    }
-}

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

@@ -1,166 +0,0 @@
-package com.care.bms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.service.BmsSysUserService;
-import com.care.common.annotation.Permission;
-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.device.DeviceVO;
-import com.care.common.vo.sysuser.SysUserVO;
-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.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-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 = "SysUserController", tags = { "后台管家管理" })
-@Slf4j
-@RequestMapping("/bms/sysuser")
-@Permission
-public class SysUserController {
-
-    @Autowired
-    private BmsSysUserService bmsSysUserService;
-
-    /**
-     *管家下拉列表
-     * @param request
-     * @return
-     */
-    @GetMapping("/listKeeper4Select")
-    @ApiOperation(value = "登陆人所属机构、服务站下的管家下拉列表")
-    public Result<List<SysUserVO>> listKeeper4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                 @RequestParam(name = "stationId", required = false) Long stationId){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            Long orgId = loginUser.getOrgId();
-            if (stationId==null){
-                stationId = loginUser.getStationId();
-            }
-
-            List<SysUserVO> datas = this.bmsSysUserService.queryKeeperListByStationId(orgId,stationId);
-            return Result.success(datas);
-        }catch (Exception e) {
-            log.error("某个服务站下的管家下拉列表出现异常",e);
-            return Result.error( "获取列表失败");
-        }
-    }
-
-
-    @GetMapping("/listKeeper")
-    @ApiOperation(value = "管家列表分页  --二期新增")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "name", value = "管家姓名"),
-            @ApiImplicitParam(paramType = "query", name = "phone", value = "电话"),
-            @ApiImplicitParam(paramType = "query", name = "stationId", value = "服务站ID"),
-    })
-    public PageResult<List<SysUserVO>> listKeeper(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                  @RequestParam(value = "name", required = false) String name,
-                                                  @RequestParam(value = "phone", required = false) String phone,
-                                                  @RequestParam(value = "stationId", required = false) Long stationId,
-                                                  PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<SysUserVO> pageResponse = this.bmsSysUserService.listCareSysUser(name,phone,stationId,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("/getKeeperFreeDev")
-    @ApiOperation(value = "获取没分配给管家的空闲设备列表 --二期新增")
-    public Result<List<DeviceVO>> getKeeperFreeDev(HttpServletRequest request, @RequestHeader("token") String token){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        List<DeviceVO> list = this.bmsSysUserService.getFreeDeviceVOList(loginUser);
-        return  Result.success("查询成功！",list);
-    }
-
-    @PostMapping("/addKeeper")
-    @ApiOperation(value = "新增管家 --二期新增")
-    public Result<Object> addKeeper(HttpServletRequest request,@RequestHeader("token") String token,
-                                   @RequestBody SysUserVO vo){
-        try {
-
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            String md5Password = DigestUtils.md5Hex("123456");
-            vo.setPassword(md5Password);
-            int flag = this.bmsSysUserService.createCareSysUser(vo,loginUser);
-            if (flag == 1) {
-                return  Result.error("电话已存在！");
-            } else if (flag == 0) {
-                return  Result.success("新增成功！");
-            } else {
-                return  Result.error("新增失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("新增管家-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("管家管理: 新增管家出现异常",e);
-            return Result.error("新增失败！");
-        }
-    }
-
-    @PostMapping("/updateKeeper")
-    @ApiOperation(value = "修改管家 --二期新增")
-    public Result<Object> updateKeeper(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @RequestBody SysUserVO vo){
-        try {
-            this.bmsSysUserService.updateCareSysUser(vo);
-            return  Result.success("修改成功！");
-        }catch (BDException e) {
-            log.error("修改管家-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("管家管理: 修改管家出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-    @GetMapping("/getKeeperInfo/{chambId}")
-    @ApiOperation(value = "管家详情  --二期新增")
-    public Result<SysUserVO> getKeeperInfo(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("chambId") Long chambId){
-        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        SysUserVO orderInfo = this.bmsSysUserService.getCareSysUserById(chambId,loginUser);
-        return  Result.success("查询成功！",orderInfo);
-    }
-
-    @PostMapping("/deleteKeeper/{chambId}")
-    @ApiOperation(value = "删除管家")
-    public Result<Object> deleteKeeper(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @PathVariable("chambId") Long chambId){
-        try {
-            if( this.bmsSysUserService.deleteById(chambId)){
-                return  Result.success("删除成功！");
-            } else {
-                return Result.error("管家被引用，删除失败！");
-            }
-
-        } catch (Exception e) {
-            log.error("管家管理: 删除出现异常",e);
-            return Result.error("删除失败！");
-        }
-    }
-}

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

@@ -1,61 +0,0 @@
-package com.care.bms.controller;
-
-import com.care.bms.service.BmsEventOrderService;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "TestController", tags = { "测试" })
-@Slf4j
-@RequestMapping("/bms")
-public class TestController {
-    @Resource
-    private RedisUtil redisUtil;
-    @Autowired
-    private BmsEventOrderService bmsEventOrderService;
-
-    @GetMapping("/event/testData")
-    @ApiOperation(tags = {"未处理事件"},value = "模拟生成定单数据")
-    public Result<Object> listMyHandle(){
-            this.bmsEventOrderService.insertTestData();
-            return Result.success("生成成功");
-    }
-
-    @GetMapping("/bms/switch/autoSms")
-    @ApiOperation(value = "自动发送短信")
-    public Result<Object> autoSmsSwitch(@RequestParam("flag") String flag){
-        if ("on".equals(flag)){
-            redisUtil.set(RedisKeyConstant.SWITCH_SMS,"on",60*60*24);
-        }else{
-            redisUtil.del(RedisKeyConstant.SWITCH_SMS);
-        }
-        return Result.success("生成成功",redisUtil.get(RedisKeyConstant.SWITCH_SMS));
-    }
-
-    @GetMapping("/bms/switch/autoVoice")
-    @ApiOperation(value = "自动发送语音通知")
-    public Result<Object> autoVoiceSwitch(@RequestParam("flag") String flag){
-        if ("on".equals(flag)){
-            redisUtil.set(RedisKeyConstant.SWITCH_VOICE,"on",60*60*24);
-        }else{
-            redisUtil.del(RedisKeyConstant.SWITCH_VOICE);
-        }
-        return Result.success("生成成功",redisUtil.get(RedisKeyConstant.SWITCH_VOICE));
-    }
-}

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

@@ -1,97 +0,0 @@
-package com.care.bms.controller;
-
-
-import com.care.bms.service.BmsEventOrderService;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.enums.ContactorStatusEnum;
-import com.care.common.util.JsonUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "VoiceCallbackController", tags = { "语音通知回调接口" })
-@Slf4j
-@RequestMapping("/bms")
-public class VoiceCallbackController {
-    @Resource
-    private RedisUtil redisUtil;
-    @Autowired
-    private BmsEventOrderService bmsEventOrderService;
-
-    @PostMapping("/voice/callback")
-    @ApiOperation(tags = {"语音通知回调接口"},value = "语音通知回调接口")
-    public Map<String,Object> callback(@RequestBody Map<String,Object> voicepromptCallback) {
-        try {
-            System.out.println("callback json == " + JsonUtil.toJson(voicepromptCallback));
-            Map voiceCallbackParams = (Map) voicepromptCallback.get("voiceprompt_callback");
-            if(voiceCallbackParams != null) {
-                String callId = (String) voiceCallbackParams.get("callid");
-                System.out.println("callback:callId==" + callId);
-                String orderId = (String) redisUtil.hget(RedisKeyConstant.VOICE_CALLBACK_INFO, callId);
-                System.out.println("callback:orderId==" + orderId);
-                String mobile = (String) voiceCallbackParams.get("mobile");
-                System.out.println("callback:mobile==" + mobile);
-                Integer status = null;
-                String result = (String) voiceCallbackParams.get("result");
-                if ("0".equals(result)) { //用户正常接听
-                    status = ContactorStatusEnum.YI_LIAN_XI.getValue();
-                } else if ("1".equals(result)) { //用户未接听
-                    status = ContactorStatusEnum.WEI_JIE_TONG.getValue();
-                } else { //呼叫异常
-                    status = ContactorStatusEnum.WEI_JIE_TONG.getValue();
-                }
-
-                bmsEventOrderService.updateOrderContactStatus4Callback(callId,Long.parseLong(orderId), mobile, status,"");
-
-                Map<String, Object> rtn = new HashMap<>();
-                rtn.put("result", 0);
-                rtn.put("errmsg", "OK");
-                return rtn;
-            } else {
-                voiceCallbackParams = (Map) voicepromptCallback.get("voice_failure_callback");
-                if(voiceCallbackParams != null){
-                    String callId = (String) voiceCallbackParams.get("callid");
-                    System.out.println("callback:failure callId==" + callId);
-                    String orderId = (String) redisUtil.hget(RedisKeyConstant.VOICE_CALLBACK_INFO, callId);
-                    System.out.println("callback:failure orderId==" + orderId);
-                    String mobile = (String) voiceCallbackParams.get("mobile");
-                    System.out.println("callback:failure mobile==" + mobile);
-                    String failureReason = (String) voiceCallbackParams.get("failure_reason");
-                    System.out.println("callback:failure failureReason==" + failureReason);
-
-                    Integer status =  ContactorStatusEnum.WEI_JIE_TONG.getValue();
-
-                    bmsEventOrderService.updateOrderContactStatus4Callback(callId,Long.parseLong(orderId), mobile, status,failureReason);
-
-                    Map<String, Object> rtn = new HashMap<>();
-                    rtn.put("result", 0);
-                    rtn.put("errmsg", "OK");
-                    return rtn;
-                } else {
-                    return null;
-                }
-
-            }
-
-        } catch (Exception e){
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-
-
-}

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

@@ -1,212 +0,0 @@
-package com.care.bms.service;
-
-import cn.hutool.core.bean.BeanUtil;
-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.care.common.entity.*;
-
-import com.care.common.service.*;
-import com.care.common.util.MyBeanUtils;
-import com.care.common.vo.PageReqVO;
-
-
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.memberinfo.MemberInfoVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 频安宝用户表(CareMemberInfo)表服务实现类
- *
- * @author makejava
- * @since 2021-05-21 00:08:38
- */
-@Service
-public class BmsMemberInfoService {
-
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-    @Resource
-    private CareDeviceService careDeviceService;
-
-    
-    /**
-     * 查询频安宝用户列表
-     * @return
-             */
-    public IPage<MemberInfoVO> listCareMemberInfo(UserLogindConvertVO loginUser, String name, String phone, PageReqVO pageReqVo) {
-            QueryWrapper<CareDevice> queryWrapper0 = new QueryWrapper<>();
-            queryWrapper0.lambda()
-                    .eq(CareDevice::getOrgId,loginUser.getOrgId())
-                    .eq(loginUser.getStationId()!=null,CareDevice::getStationId,loginUser.getStationId());
-            List<CareDevice> careDevices =  this.careDeviceService.list(queryWrapper0);
-            List<Long> memberIds = new ArrayList<>();
-            if(CollUtil.isNotEmpty(careDevices)){
-                careDevices.forEach(item ->{
-                    if(item.getMemberId() != null && item.getMemberId() != 0L){
-                        memberIds.add(item.getMemberId());
-                    }
-                });
-            }
-            if(CollUtil.isNotEmpty(memberIds)) {
-                IPage<CareMemberInfo> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-                QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareMemberInfo::getName,name)
-                        .like(StrUtil.isNotEmpty(phone),CareMemberInfo::getPhone,phone)
-                        .in(CareMemberInfo::getId,memberIds)
-                        .orderByAsc(CareMemberInfo::getName);
-
-                IPage<CareMemberInfo> pageRes = this.careMemberInfoService.page(page, queryWrapper);
-                IPage<MemberInfoVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-                if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                    List<MemberInfoVO> list = new ArrayList<>();
-                    pageRes.getRecords().forEach(item -> {
-                        MemberInfoVO  resVO = new MemberInfoVO();
-                        BeanUtils.copyProperties(item,resVO);
-                        //服务设备数量
-                        QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.lambda().eq(CareDevice::getMemberId,resVO.getId())
-                        .eq(CareDevice::getOrgId,loginUser.getOrgId())
-                        .eq(loginUser.getStationId()!=null,CareDevice::getStationId,loginUser.getStationId());
-                        resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-                        list.add(resVO);
-                    });
-                    results.setRecords(list);
-                }
-                return results;
-            } else {
-                //空的
-                IPage<CareMemberInfo> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-                QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(CareMemberInfo::getId,0L);
-                IPage<CareMemberInfo> pageRes = this.careMemberInfoService.page(page, queryWrapper);
-                IPage<MemberInfoVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-                return results;
-            }
-
-    }
-
-    /**
-     * 删除频安宝用户
-     * @param id
-     * @return
-     */
-    public boolean deleteById(Long id){
-        return this.careMemberInfoService.removeById(id);
-    }
-
-    /**
-     * 频安宝用户详情
-     * @param id
-     * @return
-     */
-    public MemberInfoVO getCareMemberInfoById(Long id){
-        CareMemberInfo careMemberInfo = this.careMemberInfoService.getById(id);
-        if (careMemberInfo!=null){
-            MemberInfoVO resVO = new MemberInfoVO();
-            BeanUtil.copyProperties(careMemberInfo,resVO);
-
-            //服务设备数量
-            QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.lambda().eq(CareDevice::getMemberId,resVO.getId());
-            resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-            return resVO;
-        }
-        return null;
-    }
-
-
-    /**
-     * 保存频安宝用户
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void createCareMemberInfo(MemberInfoVO vo){
-        //保存频安宝用户
-        CareMemberInfo careMemberInfo = new CareMemberInfo();
-        BeanUtil.copyProperties(vo,careMemberInfo);
-        careMemberInfo.setCreateTime(new Date());
-
-        this.careMemberInfoService.save(careMemberInfo);
-
-//        //更新设备
-//        List<DeviceVO> hasDeviceVOList = vo.getHasDeviceVOList();
-//        if (CollUtil.isNotEmpty(hasDeviceVOList)) {
-//            hasDeviceVOList.forEach(item -> {
-//                CareDevice careDevice = new CareDevice();
-//                BeanUtil.copyProperties(item,careDevice);
-//                careDevice.setMemberId(careMemberInfo.getId());
-//                careDeviceService.updateById(careDevice);
-//            });
-//        }
-    }
-
-    /**
-     * 修改频安宝用户
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCareMemberInfo(MemberInfoVO vo){
-        //保存频安宝用户
-        CareMemberInfo careMemberInfo = this.careMemberInfoService.getById(vo.getId());
-        MyBeanUtils.copyProperties(vo,careMemberInfo);
-        careMemberInfo.setModifyTime(new Date());
-        this.careMemberInfoService.updateById(careMemberInfo);
-
-//        List<DeviceVO> hasDeviceVOList = vo.getHasDeviceVOList();
-//        //查找原来拥有的设备
-//        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.lambda().eq(CareDevice::getMemberId,vo.getId());
-//        List<CareDevice> hasDeviceListOld = this.careDeviceService.list(queryWrapper);
-//
-//        if (CollUtil.isNotEmpty(hasDeviceListOld)) {
-//          for(CareDevice careDevice : hasDeviceListOld){
-//              boolean has = false;
-//              for(DeviceVO deviceVO : hasDeviceVOList) {
-//                  if(careDevice.getId().equals(deviceVO.getId())){
-//                      has = true;
-//                      break;
-//                  }
-//              }
-//              if(!has) {
-//                  //将不再拥有的设备的频安宝用户id置空
-//                  this.careDeviceService.updateDevChamb(careDevice.getId());
-//              }
-//          }
-//        }
-//
-//        //更新拥有的设备
-//        if (CollUtil.isNotEmpty(hasDeviceVOList)) {
-//            hasDeviceVOList.forEach(item -> {
-//                CareDevice careDevice = new CareDevice();
-//                BeanUtil.copyProperties(item,careDevice);
-//                careDevice.setMemberId(careMemberInfo.getId());
-//                careDeviceService.updateById(careDevice);
-//            });
-//        }
-
-    }
-    /**
-     * 修改频安宝用户状态
-     * @param status
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public boolean updateCareMemberInfoStatus(Long id, String status){
-        //修改频安宝用户
-        CareMemberInfo careMemberInfo = this.careMemberInfoService.getById(id);
-        careMemberInfo.setStatus(status);
-        careMemberInfo.setModifyTime(new Date());
-        this.careMemberInfoService.updateById(careMemberInfo);
-        return true;
-    }
-
-}

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

@@ -1,499 +0,0 @@
-package com.care.bms.service;
-
-import cn.hutool.core.bean.BeanUtil;
-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.care.common.entity.*;
-
-import com.care.common.enums.DeviceActiveStatusEnum;
-import com.care.common.enums.UserRoleEnum;
-import com.care.common.enums.ValidStatusEnum;
-import com.care.common.exception.BDException;
-import com.care.common.service.*;
-import com.care.common.util.DateUtils;
-import com.care.common.util.MyBeanUtils;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.sysuser.SysUserVO;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 安全管家表(CareSysUser)表服务实现类
- *
- * @author makejava
- * @since 2021-05-21 00:08:38
- */
-@Service
-public class BmsSysUserService{
-
-    @Resource
-    private CareOrganizationService careOrganizationService;
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareSysUserService careSysUserService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareEventOrderChambService careEventOrderChambService;
-    @Resource
-    private CareHouseService careHouseService;
-
-
-    public UserLogindConvertVO getLoginUser(String orgCode, String phone,String password) {
-        UserLogindConvertVO userLogindConvertVO = null;
-        /*QueryWrapper<CareOrganization>  organizationQueryWrapper = new QueryWrapper<>();
-        organizationQueryWrapper.lambda().eq(CareOrganization::getOrgCode,orgCode);
-        CareOrganization org = this.careOrganizationService.getOne(organizationQueryWrapper);
-        if (org == null){
-            return null;
-        }*/
-        QueryWrapper<CareSysUser>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda() //.eq(CareSysUser::getOrgId,org.getId())
-                                .eq(CareSysUser::getPhone,phone);
-        CareSysUser user = this.careSysUserService.getOne(userQueryWrapper);
-        if (user != null){
-            userLogindConvertVO = new UserLogindConvertVO();
-            BeanUtil.copyProperties(user,userLogindConvertVO);
-            Date now = DateUtils.strToDate(DateUtils.getCurrYyyy_MM_ddDate(),"yyyy-MM-dd");
-
-            if(user.getOrgId() != null) {
-                CareOrganization org =  careOrganizationService.getById(user.getOrgId());
-
-                if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
-                    throw new BDException("该用户所属机构已经停用");
-                }
-
-                Date servStartDate0 = org.getServStartDate();
-                Date servEndDate0 = org.getServEndDate();
-
-                if(servStartDate0 != null) {
-                    if (now.before(servStartDate0)) {
-                        throw new BDException("该用户所属机构没在有效期");
-                    }
-                }
-
-                if(servEndDate0 != null) {
-                    if (now.after(servEndDate0)) {
-                        throw new BDException("该用户所属机构没在有效期");
-                    }
-                }
-
-                if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
-                    throw new BDException("该用户所属机构已经停用");
-                }
-                userLogindConvertVO.setOrgName(org.getName());
-                userLogindConvertVO.setSystemName(org.getSystemName());
-                userLogindConvertVO.setLogo(org.getLogo());
-            }
-
-
-            String md5Password = DigestUtils.md5Hex(password);
-            if (!md5Password.equalsIgnoreCase(user.getPassword())) {
-                throw new BDException("用户名或密码错误");
-            }
-            if (ValidStatusEnum.INVALID.getValue().equals(user.getValidStatus())) {
-                throw new BDException("用户已经停用");
-            }
-            Date servStartDate = user.getServStartDate();
-            Date servEndDate = user.getServEndDate();
-            if(servStartDate != null) {
-                if ( now.before(servStartDate)) {
-                    throw new BDException("用户没在有效期");
-                }
-            }
-            if(servEndDate != null) {
-                if (now.after(servEndDate)) {
-                    throw new BDException("用户没在有效期");
-                }
-            }
-        }
-        return userLogindConvertVO;
-    }
-
-    /**
-     * 查询某服务站下的 安全管家列表
-     * @param stationId
-     * @return
-     */
-    public List<SysUserVO> queryKeeperListByStationId(Long orgId, Long stationId){
-        List<SysUserVO> datas = new ArrayList<>();
-        QueryWrapper<CareSysUser>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda().eq(orgId != null,CareSysUser::getOrgId,orgId)
-                .eq(stationId !=null,CareSysUser::getStationId,stationId)
-                .eq(CareSysUser::getRole, UserRoleEnum.CHANMB.getValue())
-                .orderByAsc(CareSysUser::getName);
-        List<CareSysUser> users = this.careSysUserService.list(userQueryWrapper);
-        if (users != null){
-            users.forEach(item -> {
-                SysUserVO vo = new SysUserVO();
-                BeanUtil.copyProperties(item,vo);
-                datas.add(vo);
-            });
-        }
-        return datas;
-    }
-
-    /**
-     * 查询安全管家列表
-     * @param stationId
-     * @return
-             */
-    public IPage<SysUserVO> listCareSysUser(String name, String phone, Long stationId, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-            IPage<CareSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-            QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareSysUser::getName,name)
-                    .like(StrUtil.isNotEmpty(phone),CareSysUser::getPhone,phone)
-                    .eq(CareSysUser::getOrgId,loginUser.getOrgId())
-                    .eq(loginUser.getStationId()!=null,CareSysUser::getStationId,loginUser.getStationId())
-                    .eq(stationId!=null,CareSysUser::getStationId,stationId)
-                    .eq(CareSysUser::getRole,UserRoleEnum.CHANMB.getValue())
-                    .orderByAsc(CareSysUser::getName);
-
-            IPage<CareSysUser> pageRes = this.careSysUserService.page(page, queryWrapper);
-            IPage<SysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-            if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<SysUserVO> list = new ArrayList<>();
-                pageRes.getRecords().forEach(item -> {
-                    SysUserVO resVO = new SysUserVO();
-                    BeanUtils.copyProperties(item,resVO);
-                    //服务设备数量
-                    QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.lambda().eq(CareDevice::getChambId,resVO.getId());
-                    resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-                    //服务次数
-                    QueryWrapper<CareEventOrderChamb> queryWrapper2 = new QueryWrapper<>();
-                    queryWrapper2.lambda().eq(CareEventOrderChamb::getChambId,resVO.getId()).ne(CareEventOrderChamb::getStatus,"3");
-                    resVO.setServeCount(this.careEventOrderChambService.count(queryWrapper2));
-
-                    CareStation station = this.careStationService.getById(resVO.getStationId());
-                    if (station!=null){
-                        resVO.setStationName(station.getShortName());
-                    }
-                    list.add(resVO);
-                });
-                results.setRecords(list);
-            }
-            return results;
-    }
-
-    /**
-     * 删除管家
-     * @param id
-     * @return
-     */
-    public boolean deleteById(Long id){
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareDevice::getChambId,id);
-        int cnt = careDeviceService.count(queryWrapper);
-        if(cnt > 0 ) {
-            return false;
-        }
-        QueryWrapper<CareEventOrderChamb> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.lambda().eq(CareEventOrderChamb::getChambId,id);
-        int cnt1 = careEventOrderChambService.count(queryWrapper1);
-        if(cnt1 > 0 ) {
-            return false;
-        }
-
-        return this.careSysUserService.removeById(id);
-    }
-
-    /**
-     * 详情
-     * @param id
-     * @return
-     */
-    public SysUserVO getCareSysUserById(Long id, UserLogindConvertVO loginUser){
-        CareSysUser careSysUser = this.careSysUserService.getById(id);
-        if (careSysUser!=null){
-            SysUserVO resVO = new SysUserVO();
-            BeanUtil.copyProperties(careSysUser,resVO);
-
-            //服务设备数量和列表
-            QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.lambda().eq(CareDevice::getChambId,resVO.getId());
-            List<CareDevice> hasDeviceList = this.careDeviceService.list(queryWrapper1);
-            if(CollUtil.isNotEmpty(hasDeviceList)){
-                List<DeviceVO> hasDeviceVOList = new ArrayList<>();
-                hasDeviceList.forEach(item ->{
-                    DeviceVO deviceVO = new DeviceVO();
-                    BeanUtil.copyProperties(item,deviceVO);
-                    if(deviceVO.getHouseId() != null) {
-                        CareHouse careHouse = careHouseService.getById(deviceVO.getHouseId());
-                        if(careHouse != null) {
-                            deviceVO.setHouseAddr(careHouse.getAddr());
-                        }
-                    }
-                    deviceVO.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(deviceVO.getActiveStatus()));
-
-                    hasDeviceVOList.add(deviceVO);
-                });
-                resVO.setHasDeviceVOList(hasDeviceVOList);
-                resVO.setDevCount(hasDeviceVOList.size());
-            } else {
-                resVO.setDevCount(0);
-            }
-
-
-            //服务次数
-            QueryWrapper<CareEventOrderChamb> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.lambda().eq(CareEventOrderChamb::getChambId,resVO.getId()).ne(CareEventOrderChamb::getStatus,"3");
-            resVO.setServeCount(this.careEventOrderChambService.count(queryWrapper2));
-
-            CareStation station = this.careStationService.getById(resVO.getStationId());
-            if (station!=null){
-                resVO.setStationName(station.getShortName());
-            }
-
-            //空闲设备列表
-            resVO.setFreeDeviceVOList(getFreeDeviceVOList(loginUser));
-            return resVO;
-        }
-        return null;
-    }
-
-    /**
-     * 获取空闲设备列表
-     * @return
-     */
-    public List<DeviceVO> getFreeDeviceVOList(UserLogindConvertVO loginUser){
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().isNull(CareDevice::getChambId).eq(CareDevice::getOrgId,loginUser.getOrgId());
-        List<CareDevice> freeDeviceList = this.careDeviceService.list(queryWrapper);
-        List<DeviceVO> freeDeviceVOList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(freeDeviceList)){
-            freeDeviceList.forEach(item ->{
-                DeviceVO deviceVO = new DeviceVO();
-                BeanUtil.copyProperties(item,deviceVO);
-                if (deviceVO.getHouseId() !=null) {
-                    CareHouse careHouse = careHouseService.getById(deviceVO.getHouseId() );
-                     if(careHouse != null) {
-                         deviceVO.setHouseAddr(careHouse.getAddr());
-                     }
-                }
-                freeDeviceVOList.add(deviceVO);
-            });
-        }
-        return freeDeviceVOList;
-    }
-
-    /**
-     * 保存管家
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public int createCareSysUser(SysUserVO vo, UserLogindConvertVO loginUser){
-        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareSysUser::getPhone,vo.getPhone());
-        if(careSysUserService.count(queryWrapper) > 0){
-            return 1;
-        }
-        //保存管家
-        CareSysUser careSysUser = new CareSysUser();
-        BeanUtil.copyProperties(vo,careSysUser);
-        careSysUser.setCreateTime(new Date());
-        careSysUser.setRole(UserRoleEnum.CHANMB.getValue());
-        careSysUser.setOrgId(loginUser.getOrgId());
-
-        this.careSysUserService.save(careSysUser);
-
-        //更新设备
-        List<DeviceVO> hasDeviceVOList = vo.getHasDeviceVOList();
-        if (CollUtil.isNotEmpty(hasDeviceVOList)) {
-            hasDeviceVOList.forEach(item -> {
-                CareDevice careDevice = new CareDevice();
-                BeanUtil.copyProperties(item,careDevice);
-                careDevice.setChambId(careSysUser.getId());
-                careDeviceService.updateById(careDevice);
-            });
-        }
-        return 0;
-    }
-
-    /**
-     * 修改管家
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCareSysUser(SysUserVO vo){
-        //保存管家
-        CareSysUser careSysUser = this.careSysUserService.getById(vo.getId());
-        MyBeanUtils.copyProperties(vo,careSysUser);
-        careSysUser.setModifyTime(new Date());
-        this.careSysUserService.updateById(careSysUser);
-
-        List<DeviceVO> hasDeviceVOList = vo.getHasDeviceVOList();
-        //查找原来拥有的设备
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareDevice::getChambId,vo.getId());
-        List<CareDevice> hasDeviceListOld = this.careDeviceService.list(queryWrapper);
-
-        if (CollUtil.isNotEmpty(hasDeviceListOld)) {
-          for(CareDevice careDevice : hasDeviceListOld){
-              boolean has = false;
-              for(DeviceVO deviceVO : hasDeviceVOList) {
-                  if(careDevice.getId().equals(deviceVO.getId())){
-                      has = true;
-                      break;
-                  }
-              }
-              if(!has) {
-                  //将不再拥有的设备的管家id置空
-                  this.careDeviceService.updateDevChamb(careDevice.getId());
-              }
-          }
-        }
-
-        //更新拥有的设备
-        if (CollUtil.isNotEmpty(hasDeviceVOList)) {
-            hasDeviceVOList.forEach(item -> {
-                CareDevice careDevice = new CareDevice();
-                BeanUtil.copyProperties(item,careDevice);
-                careDevice.setChambId(careSysUser.getId());
-                careDeviceService.updateById(careDevice);
-            });
-        }
-
-    }
-
-
-    /**
-     * 服务站账号列表分页
-     * @param stationName
-     * @return
-     */
-    public IPage<SysUserVO> listStationAccount(String stationName,Long orgId, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-
-        QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
-        queryWrapper0.lambda().like(StrUtil.isNotEmpty(stationName),CareStation::getName,stationName);
-        List<CareStation> careStations = careStationService.list(queryWrapper0);
-        List<Long> stationIds = new ArrayList<>();
-        if (CollUtil.isNotEmpty(careStations)){
-            careStations.forEach(item -> {
-                stationIds.add(item.getId());
-            });
-        }
-
-        IPage<CareSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda() .in(CollUtil.isNotEmpty(stationIds),CareSysUser::getStationId,stationIds)
-                .eq(orgId != null,CareSysUser::getOrgId,orgId)
-                .eq(CareSysUser::getOrgId,loginUser.getOrgId())
-                .eq(CareSysUser::getRole,UserRoleEnum.STATION.getValue())
-                .orderByAsc(CareSysUser::getName);
-
-        IPage<CareSysUser> pageRes = this.careSysUserService.page(page, queryWrapper);
-        IPage<SysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-        if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<SysUserVO> list = new ArrayList<>();
-            pageRes.getRecords().forEach(item -> {
-                SysUserVO resVO = new SysUserVO();
-                BeanUtils.copyProperties(item,resVO);
-                //服务设备数量
-                QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.lambda().eq(CareDevice::getStationId,resVO.getStationId());
-                resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-
-                resVO.setValidStatusName(ValidStatusEnum.getCodeToName(resVO.getValidStatus()));
-                resVO.setStationName(this.careStationService.getById(resVO.getStationId()).getName());
-                resVO.setOrgName(this.careOrganizationService.getById(resVO.getOrgId()).getName());
-                list.add(resVO);
-            });
-            results.setRecords(list);
-        }
-        return results;
-    }
-
-
-    /**
-     * 详情
-     * @param id
-     * @return
-     */
-    public SysUserVO getStationAccountById(Long id){
-        CareSysUser careSysUser = this.careSysUserService.getById(id);
-        if (careSysUser!=null){
-            SysUserVO resVO = new SysUserVO();
-            BeanUtil.copyProperties(careSysUser,resVO);
-
-            //服务设备列表
-            QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.lambda().eq(CareDevice::getStationId,resVO.getStationId());
-            List<CareDevice> stationDeviceList = this.careDeviceService.list(queryWrapper1);
-
-            if(CollUtil.isNotEmpty(stationDeviceList)){
-                List<DeviceVO> stationDeviceVOList = new ArrayList<>();
-                stationDeviceList.forEach(item ->{
-                    DeviceVO deviceVO = new DeviceVO();
-                    BeanUtil.copyProperties(item,deviceVO);
-                    if(deviceVO.getHouseId() != null) {
-                        CareHouse careHouse = careHouseService.getById(deviceVO.getHouseId());
-                        if(careHouse != null) {
-                            deviceVO.setHouseAddr(careHouse.getAddr());
-                        }
-                    }
-                    deviceVO.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(deviceVO.getActiveStatus()));
-
-                    stationDeviceVOList.add(deviceVO);
-                });
-                resVO.setStationDeviceVOList(stationDeviceVOList);
-
-            }
-
-            return resVO;
-        }
-        return null;
-    }
-
-    /**
-     * 保存服务站账号
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public int createStationAccount(SysUserVO vo, UserLogindConvertVO loginUser){
-        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareSysUser::getPhone,vo.getPhone());
-        if(careSysUserService.count(queryWrapper) > 0){
-            return 1;
-        }
-        //保存服务站账号
-        CareSysUser careSysUser = new CareSysUser();
-        BeanUtil.copyProperties(vo,careSysUser);
-        careSysUser.setName(this.careStationService.getById(vo.getStationId()).getShortName() + "管理账号");
-        careSysUser.setCreateTime(new Date());
-        careSysUser.setRole(UserRoleEnum.STATION.getValue());
-        careSysUser.setOrgId(loginUser.getOrgId());
-        String md5Password = DigestUtils.md5Hex("123456");
-        careSysUser.setPassword(md5Password);
-        this.careSysUserService.save(careSysUser);
-
-        return 0;
-    }
-
-    /**
-     * 修改服务站账号
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateStationAccount(SysUserVO vo){
-        //保存服务站账号
-        CareSysUser careSysUser = this.careSysUserService.getById(vo.getId());
-        BeanUtil.copyProperties(vo,careSysUser);
-        careSysUser.setModifyTime(new Date());
-        this.careSysUserService.updateById(careSysUser);
-    }
-
-}

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

@@ -1,439 +0,0 @@
-package com.care.bms.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.common.entity.*;
-import com.care.common.enums.*;
-import com.care.common.exception.BDException;
-import com.care.common.service.*;
-import com.care.common.util.HttpUtil;
-import com.care.common.util.MyBeanUtils;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.order.OrderContactorVO;
-import com.care.common.vo.order.OrderOlderVO;
-import com.care.mqtt.service.MqttConnectorPoolService;
-import lombok.Synchronized;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-/**
- * @Author: lilt
- * @Date: 2021/7/14
- * @Desc:
- */
-@Service
-public class DeviceService {
-    @Resource
-    private CareHouseService careHouseService;
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareOlderService careOlderService;
-    @Resource
-    private CareHouseContactService careHouseContactService;
-    @Resource
-    private CareHouseOlderRelService careHouseOlderRelService;
-    @Resource
-    private CareHouseContactRelService careHouseContactRelService;
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-    @Resource
-    private CareSysUserService careSysUserService;
-    @Resource
-    private MqttConnectorPoolService mqttConnectorPoolService;
-
-    @Resource
-    private CareOrganizationService careOrganizationService;
-
-//    @Value("${mqtt.topic.work.template:#{null}}")
-//    private String mqttTopicWorkTemplate;
-//    @Value("${mqtt.topic.install.template:#{null}}")
-//    private String mqttTopicInstallTemplate;
-    @Value("${syn.dev.url:#{null}}")
-    private String synDevUrl;
-    /**
-     * 删除设备
-     * @param id
-     * @return
-     */
-    public boolean deleteById(Long id){
-        mqttConnectorPoolService.removeOne(this.careDeviceService.getById(id));
-        return this.careDeviceService.removeById(id);
-    }
-
-    public DeviceVO getDevById(Long id){
-        CareDevice dev = this.careDeviceService.getById(id);
-        if (dev!=null){
-            DeviceVO vo = new DeviceVO();
-            BeanUtil.copyProperties(dev,vo);
-            vo.setStatusName(DeviceStatusEnum.getCodeToName(vo.getStatus()));
-            vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
-            vo.setDevSceneName(DeviceSceneEnum.getCodeToName(vo.getDevScene()));
-
-            CareSysUser careSysUser = this.careSysUserService.getById(vo.getChambId());
-            if (careSysUser != null){
-                vo.setChambPhone(careSysUser.getPhone());
-                vo.setChambName(careSysUser.getName());
-            }
-
-            CareStation station = this.careStationService.getById(vo.getStationId());
-            if (station!=null){
-                vo.setStationName(station.getShortName());
-            }
-            CareHouse house = this.careHouseService.getById(vo.getHouseId());
-            if (house!=null){
-                vo.setHouseAddr(house.getAddr());
-                vo.setHouseNumber(house.getHouseNumber());
-                vo.setLatitude(house.getLatitude());
-                vo.setLongitude(house.getLongitude());
-            }
-            QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId,dev.getHouseId());
-            List<CareHouseOlderRel> olderRels = careHouseOlderRelService.list(queryWrapper);
-            if(CollUtil.isNotEmpty(olderRels)) {
-                List<OrderOlderVO> orderOlderVOList = new ArrayList<>();
-                olderRels.forEach(item -> {
-                    CareOlder older = this.careOlderService.getById(item.getOlderId());
-                    OrderOlderVO orderOlderVO = new OrderOlderVO();
-                    BeanUtil.copyProperties(older,orderOlderVO);
-                    orderOlderVO.setLiveTypeDesc(OlderLiveTypeEnum.getCodeToName(orderOlderVO.getLiveType()));
-                    orderOlderVOList.add(orderOlderVO);
-                });
-                vo.setOrderOlderVOList(orderOlderVOList);
-            }
-
-            QueryWrapper<CareHouseContactRel> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.lambda().eq(CareHouseContactRel::getHouseId,dev.getHouseId());
-            List<CareHouseContactRel> contactRels = careHouseContactRelService.list(queryWrapper1);
-            if(CollUtil.isNotEmpty(contactRels)) {
-                List<OrderContactorVO> orderContactorVOList = new ArrayList<>();
-                contactRels.forEach(item -> {
-                    CareHouseContact contact = this.careHouseContactService.getById(item.getContactId());
-                    OrderContactorVO orderContactorVO = new OrderContactorVO();
-                    BeanUtil.copyProperties(contact,orderContactorVO);
-                    orderContactorVO.setRelationTypeDesc(RelationTypeEnum.getCodeToName(orderContactorVO.getRelationType()));
-                    orderContactorVOList.add(orderContactorVO);
-                });
-                vo.setOrderContactorVOList(orderContactorVOList);
-            }
-
-            return vo;
-        }
-        return null;
-    }
-
-    /**
-     * 保存设备 //TODO功能暂时不用
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Synchronized
-    public void createDevice(DeviceVO vo,UserLogindConvertVO loginUser){
-        //生成登陆账号
-        if (StrUtil.isEmpty(vo.getDevCode())){
-            throw new BDException("设备编号不能为空");
-        }else {
-            QueryWrapper<CareDevice> queryWrapper = new QueryWrapper();
-            queryWrapper.lambda().eq(CareDevice::getDevCode,vo.getDevCode());
-            if (this.careDeviceService.count(queryWrapper)>0){
-                throw new BDException("设备编号已经存在！");
-            }
-        }
-        //保存设备
-        CareDevice device = new CareDevice();
-        BeanUtil.copyProperties(vo,device);
-
-        //设备上线
-        device.setStatus(DeviceStatusEnum.ONLINE.getValue());
-        device.setCreateTime(new Date());
-        device.setOrgId(loginUser.getOrgId());
-
-//        String topic = mqttTopicWorkTemplate.replace("XXXXX",device.getDevCode());
-//        device.setTopic(topic);
-//
-//        String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",device.getDevCode());
-//        device.setTopicInstall(topicInstall);
-
-        device.setClientId(UUID.randomUUID().toString());
-        device.setClientIdInstall(UUID.randomUUID().toString());
-
-        this.careDeviceService.save(device);
-        //保存完后，启动通道
-        mqttConnectorPoolService.addOne(device);
-
-    }
-
-    /**
-     * 修改设备
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateDevice(DeviceVO vo) {
-
-        //保存设备
-        CareDevice device = this.careDeviceService.getById(vo.getId());
-
-        if (DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
-            //设备离线
-            device.setStatus(DeviceStatusEnum.OFFLINE.getValue());
-            mqttConnectorPoolService.removeOne(device);
-        }
-
-        MyBeanUtils.copyProperties(vo, device);
-
-        //处理house
-        if (device.getHouseId() == null) { //新增
-            CareHouse careHouse = new CareHouse();
-            careHouse.setAddr(vo.getHouseAddr());
-            careHouse.setHouseNumber(vo.getHouseNumber());
-            if(StringUtils.isNotEmpty(vo.getHouseNumber())){
-                careHouse.setName(vo.getHouseAddr() + vo.getHouseNumber());
-            } else {
-                careHouse.setName(vo.getHouseAddr());
-            }
-            careHouse.setLatitude(vo.getLatitude());
-            careHouse.setLongitude(vo.getLongitude());
-            careHouse.setCreateTime(new Date());
-            careHouse.setOrgId(device.getOrgId());
-            careHouse.setStationId(device.getStationId());
-            this.careHouseService.save(careHouse);
-
-            device.setHouseId(careHouse.getId());
-        } else { //修改
-            CareHouse careHouse = this.careHouseService.getById(device.getHouseId());
-            careHouse.setAddr(vo.getHouseAddr());
-            careHouse.setHouseNumber(vo.getHouseNumber());
-            if(StringUtils.isNotEmpty(vo.getHouseNumber())){
-                careHouse.setName(vo.getHouseAddr() + vo.getHouseNumber());
-            } else {
-                careHouse.setName(vo.getHouseAddr());
-            }
-            careHouse.setLatitude(vo.getLatitude());
-            careHouse.setLongitude(vo.getLongitude());
-            careHouse.setModifyTime(new Date());
-            this.careHouseService.updateById(careHouse);
-        }
-
-        //关联用户
-        //用手机号查找care_member_info表，有的话就关联上，没有的话只保留手机号在设备表
-        QueryWrapper<CareMemberInfo> queryWrapper0 = new QueryWrapper<>();
-        queryWrapper0.lambda().eq(CareMemberInfo::getPhone,vo.getMemberPhone());
-        CareMemberInfo careMemberInfo = this.careMemberInfoService.getOne(queryWrapper0);
-
-        if (careMemberInfo != null) { //关联,
-            device.setMemberId(careMemberInfo.getId());
-        } else { //todo 置空,null 不生效，暂时置为0
-            device.setMemberId(0L);
-        }
-
-
-        //mqtt
-//        if(StringUtils.isEmpty(device.getTopic())){
-//            String topic = mqttTopicWorkTemplate.replace("XXXXX",device.getDevCode());
-//            device.setTopic(topic);
-//        }
-//        if(StringUtils.isEmpty(device.getTopicInstall())){
-//            String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",device.getDevCode());
-//            device.setTopicInstall(topicInstall);
-//        }
-        if(StringUtils.isEmpty(device.getClientId())){
-            device.setClientId(UUID.randomUUID().toString());
-        }
-        if(StringUtils.isEmpty(device.getClientIdInstall())){
-            device.setClientIdInstall(UUID.randomUUID().toString());
-        }
-
-        device.setModifyTime(new Date());
-        this.careDeviceService.updateById(device);
-
-        //被监护人
-        List<OrderOlderVO> orderOlderVOList = vo.getOrderOlderVOList();
-        List<Long> orderOlderVOIdList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(orderOlderVOList)){
-            orderOlderVOList.forEach(item -> {
-                CareOlder careOlder = new CareOlder();
-                BeanUtil.copyProperties(item, careOlder);
-                if(careOlder.getId() != null) {//修改
-                    careOlder.setModifyTime(new Date());
-                    careOlderService.updateById(careOlder);
-                } else { //新增
-                    careOlder.setOrgId(device.getOrgId());
-                    careOlder.setStationId(device.getStationId());
-                    careOlder.setCreateTime(new Date());
-                    careOlderService.save(careOlder);
-                    CareHouseOlderRel  careHouseOlderRel = new  CareHouseOlderRel();
-                    careHouseOlderRel.setHouseId(device.getHouseId());
-                    careHouseOlderRel.setOlderId(careOlder.getId());
-                    careHouseOlderRelService.save(careHouseOlderRel);
-                }
-                orderOlderVOIdList.add(careOlder.getId());
-            });
-        }
-
-        //联系人
-        List<OrderContactorVO> orderContactorVOList = vo.getOrderContactorVOList();
-        List<Long> orderContactorVOIdList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(orderContactorVOList)){
-            orderContactorVOList.forEach(item -> {
-                CareHouseContact careHouseContact = new CareHouseContact();
-                BeanUtil.copyProperties(item, careHouseContact);
-                if(careHouseContact.getId() != null) {//修改
-                    careHouseContact.setModifyTime(new Date());
-                    careHouseContactService.updateById(careHouseContact);
-                } else { //新增
-                    careHouseContact.setOrgId(device.getOrgId());
-                    careHouseContact.setStationId(device.getStationId());
-                    careHouseContact.setCreateTime(new Date());
-                    careHouseContactService.save(careHouseContact);
-
-                    CareHouseContactRel  careHouseContactRel = new  CareHouseContactRel();
-                    careHouseContactRel.setHouseId(device.getHouseId());
-                    careHouseContactRel.setContactId(careHouseContact.getId());
-                    careHouseContactRelService.save(careHouseContactRel);
-                }
-                orderContactorVOIdList.add(careHouseContact.getId());
-            });
-
-        }
-
-        //处理删除部分
-        QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId,device.getHouseId());
-        //查询出来数据库里已经有的
-        List<CareHouseOlderRel> olderRelsDb = careHouseOlderRelService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(olderRelsDb)){
-            List<Long> olderIdDels = new ArrayList<>();
-            List<Long> olderReIdDels = new ArrayList<>();
-            olderRelsDb.forEach(item -> {
-                if(!orderOlderVOIdList.contains(item.getOlderId())){
-                    olderReIdDels.add(item.getId());
-                    olderIdDels.add(item.getOlderId());
-                }
-            });
-           if(CollUtil.isNotEmpty(olderIdDels)){
-               this.careHouseOlderRelService.removeByIds(olderReIdDels);
-               this.careOlderService.removeByIds(olderIdDels);
-           }
-        }
-
-        //处理删除部分
-        //查询出来数据库里已经有的
-        QueryWrapper<CareHouseContactRel> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.lambda().eq(CareHouseContactRel::getHouseId,device.getHouseId());
-        List<CareHouseContactRel> contactRels = careHouseContactRelService.list(queryWrapper2);
-        if(CollUtil.isNotEmpty(contactRels)){
-            List<Long> contactIdDels = new ArrayList<>();
-            List<Long> contactReIdDels = new ArrayList<>();
-            contactRels.forEach(item -> {
-                if(!orderContactorVOIdList.contains(item.getContactId())){
-                    contactReIdDels.add(item.getId());
-                    contactIdDels.add(item.getContactId());
-                }
-            });
-            if(CollUtil.isNotEmpty(contactIdDels)){
-                this.careHouseContactRelService.removeByIds(contactReIdDels);
-                this.careHouseContactService.removeByIds(contactIdDels);
-            }
-        }
-
-        if(DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
-            //设备上线
-            device.setStatus(DeviceStatusEnum.ONLINE.getValue());
-            //保存完后，启动通道
-            mqttConnectorPoolService.addOne(device);
-        }
-    }
-    /**
-     * 列表查询
-     * @param loginUser
-     * @param pageReqVo
-     * @return
-     */
-    public IPage<DeviceVO> listDevice(Long stationId, String  devCode, String activeStatus, String chambName,String status,String houseAddr,Long chambId,Long memberId,Long orgId,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-        return this.careDeviceService.queryList(pageReqVo,stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,orgId,loginUser);
-    }
-    /**
-     * 列表查询没有站点的
-     * @param loginUser
-     * @param pageReqVo
-     * @return
-     */
-    public IPage<DeviceVO> listDeviceNonStation(UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-        return this.careDeviceService.listDeviceNonStation(pageReqVo,loginUser);
-    }
-
-    /**
-     * 同步设备
-     */
-    public void synDev(String companyId) throws BDException {
-
-        if (StringUtils.isEmpty(companyId)){
-           throw new BDException("companyId 不能为空");
-        }
-        QueryWrapper<CareOrganization> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.lambda().eq(CareOrganization::getCompanyId,companyId);
-        CareOrganization careOrganization = this.careOrganizationService.getOne(queryWrapper1);
-        if (careOrganization == null){
-            throw new BDException("机构不存在");
-        }
-
-        // 通过synDevUrl获取data
-        JSONObject jsonObject = HttpUtil.httpGet(synDevUrl + "?companyId=" + companyId);
-        int code = jsonObject.getInt("code");
-        if (code == 1) {
-            JSONArray data = jsonObject.getJSONArray("data");
-            Iterator it = data.iterator();
-
-            List<CareDevice> list = new ArrayList<>();
-            boolean flag = false;
-            while (it.hasNext()) {
-                JSONObject obj = (JSONObject) it.next();
-                String devCode = obj.getStr("mdid");
-                if(StringUtils.isEmpty(devCode)){
-                    continue;
-                }
-                CareDevice careDevice = new CareDevice();
-                careDevice.setDevCode(devCode);
-                careDevice.setOrgId(careOrganization.getId());
-                careDevice.setTopic("/" + companyId + "/" + devCode + "/event");
-                careDevice.setTopicInstall("/" + companyId + "/" + devCode + "/control");
-                list.add(careDevice);
-                if(list.size() % 500 == 0){
-                    if (!list.isEmpty()) {
-                        careDeviceService.synDev(list);
-                        flag = true;
-                        list.clear();
-                    }
-                }
-            }
-            if (!list.isEmpty()) {
-                careDeviceService.synDev(list);
-                flag = true;
-            }
-
-            if(!flag) {
-                throw new BDException("同步数据为空");
-            }
-
-        } else {
-            throw new BDException("访问同步接口失败");
-        }
-
-    }
-
-
-}

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

@@ -1,60 +0,0 @@
-package com.care.bms.service;
-
-import cn.hutool.core.bean.BeanUtil;
-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.care.common.entity.CareHouse;
-import com.care.common.entity.CareStation;
-import com.care.common.entity.SysDimCode;
-import com.care.common.enums.KeyEscrowTypeEnum;
-import com.care.common.service.CareHouseService;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.service.CareStationService;
-import com.care.common.service.SysDimCodeService;
-import com.care.common.util.MyBeanUtils;
-import com.care.common.vo.DimCodeVO;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.device.HouseVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/7/14
- * @Desc:
- */
-@Service
-public class DimCodeService {
-    @Resource
-    private SysDimCodeService sysDimCodeService;
-
-    /**
-     * 根据typeCode查询编码列表
-     * @return
-     */
-    public List<DimCodeVO> queryDimCodeByType(String typeCode){
-        List<DimCodeVO> datas = new ArrayList<>();
-        QueryWrapper<SysDimCode>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda().eq(SysDimCode::getTypeCode,typeCode).eq(SysDimCode::getStatus,"1")
-                .orderByAsc(SysDimCode::getCodeIndex);
-        List<SysDimCode> list = this.sysDimCodeService.list(userQueryWrapper);
-        if (list != null){
-            list.forEach(item -> {
-                DimCodeVO vo = new DimCodeVO();
-                BeanUtil.copyProperties(item,vo);
-                datas.add(vo);
-            });
-        }
-        return datas;
-    }
-}

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

@@ -1,176 +0,0 @@
-package com.care.bms.service;
-
-import cn.hutool.core.bean.BeanUtil;
-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.care.common.entity.CareHouse;
-import com.care.common.entity.CareStation;
-import com.care.common.enums.KeyEscrowTypeEnum;
-import com.care.common.service.CareHouseService;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.service.CareStationService;
-import com.care.common.util.MyBeanUtils;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.device.HouseVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/7/14
- * @Desc:
- */
-@Service
-public class HouseService {
-    @Resource
-    private CareHouseService careHouseService;
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-    @Resource
-    private CareStationService careStationService;
-    /**
-     * 删除房屋
-     * @param id
-     * @return
-     */
-    public boolean deleteById(Long id){
-        return this.careHouseService.removeById(id);
-    }
-
-    public HouseVO getHouseById(Long id){
-        CareHouse house = this.careHouseService.getById(id);
-        if (house!=null){
-            HouseVO vo = new HouseVO();
-            BeanUtil.copyProperties(house,vo);
-            vo.setKeyEscrowTypeName(KeyEscrowTypeEnum.getCodeToName(vo.getKeyEscrowType()));
-//            if ("0".equals(vo.getStatus())){
-//                vo.setStatusName("未激活");
-//            }else if ("1".equals(vo.getStatus())){
-//                vo.setStatusName("已激活");
-//            }
-            CareStation station = this.careStationService.getById(vo.getStationId());
-            if (station!=null){
-                vo.setStationName(station.getShortName());
-            }
-            return vo;
-        }
-        return null;
-    }
-
-    /**
-     * 保存房屋
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void createHouse(HouseVO vo,UserLogindConvertVO loginUser){
-//        //生成登陆账号
-//        if (StrUtil.isNotEmpty(vo.getManagePhone())){
-//            CareMemberInfo memberInfo = careMemberInfoService.detailByPhone(vo.getManagePhone());
-//            if (memberInfo!=null){
-//                throw new BDException("一个用户只能拥有一个房屋，请修改其他手机号");
-//            }
-//        }else{
-//            throw new BDException("用户手机号不能为空");
-//        }
-        //保存房屋
-        CareHouse house = new CareHouse();
-        BeanUtil.copyProperties(vo,house);
-        house.setCreateTime(new Date());
-        house.setName(house.getAddr());
-//        house.setStatus("1");
-        house.setOrgId(loginUser.getOrgId());
-        this.careHouseService.save(house);
-//        CareMemberInfo memberInfo = new CareMemberInfo();
-//        memberInfo.setHouseId(house.getId());
-//        memberInfo.setOlderId(null);
-//        memberInfo.setName(house.getManageName());
-//        memberInfo.setPhone(house.getManagePhone());
-//        memberInfo.setPassword(SecureUtil.md5("123456"));
-//        memberInfo.setCreateTime(new Date());
-//        this.careMemberInfoService.save(memberInfo);
-    }
-
-    /**
-     * 保存房屋
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateHouse(HouseVO vo){
-        //保存房屋
-        CareHouse house = this.careHouseService.getById(vo.getId());
-        MyBeanUtils.copyProperties(vo,house);
-        house.setModifyTime(new Date());
-        house.setName(house.getAddr());
-        this.careHouseService.updateById(house);
-    }
-    /**
-     * 列表查询
-     * @param loginUser
-     * @param pageReqVo
-     * @return
-     */
-    public IPage<HouseVO> listHouse(String addr, Long  stationId, String status,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-        IPage<CareHouse> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-        QueryWrapper<CareHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda()//.eq(StrUtil.isNotEmpty(status),CareHouse::getStatus, status)
-                .like(StrUtil.isNotEmpty(addr),CareHouse::getAddr,addr)
-                .eq(CareHouse::getOrgId,loginUser.getOrgId())
-                .eq(loginUser.getStationId()!=null,CareHouse::getStationId,loginUser.getStationId())
-                .eq(stationId!=null,CareHouse::getStationId,stationId)
-                .orderByAsc(CareHouse::getAddr);
-
-        IPage<CareHouse> pageRes = this.careHouseService.page(page, queryWrapper);
-        IPage<HouseVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-        if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<HouseVO> list = new ArrayList<>();
-            pageRes.getRecords().forEach(item -> {
-                HouseVO  resVO = new HouseVO();
-                BeanUtils.copyProperties(item,resVO);
-//                if ("0".equals(resVO.getStatus())){
-//                    resVO.setStatusName("未激活");
-//                }else if ("1".equals(resVO.getStatus())){
-//                    resVO.setStatusName("已激活");
-//                }
-                resVO.setKeyEscrowType(KeyEscrowTypeEnum.getCodeToName(resVO.getKeyEscrowType()));
-                CareStation station = this.careStationService.getById(resVO.getStationId());
-                if (station!=null){
-                    resVO.setStationName(station.getShortName());
-                }
-                list.add(resVO);
-            });
-            results.setRecords(list);
-        }
-        return results;
-    }
-
-    /**
-     * 查询某服务站下的房屋列表
-     * @param stationId
-     * @return
-     */
-    public List<HouseVO> queryHouseListByStationId(Long stationId){
-        List<HouseVO> datas = new ArrayList<>();
-        QueryWrapper<CareHouse>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda().eq(CareHouse::getStationId,stationId)
-                .orderByAsc(CareHouse::getAddr);
-        List<CareHouse> users = this.careHouseService.list(userQueryWrapper);
-        if (users != null){
-            users.forEach(item -> {
-                HouseVO vo = new HouseVO();
-                BeanUtil.copyProperties(item,vo);
-                datas.add(vo);
-            });
-        }
-        return datas;
-    }
-}

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

@@ -1,288 +0,0 @@
-package com.care.bms.service;
-
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-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.care.common.entity.*;
-
-import com.care.common.enums.UserRoleEnum;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareDeviceService;
-import com.care.common.service.CareOrganizationService;
-import com.care.common.service.CareStationService;
-import com.care.common.service.CareSysUserService;
-import com.care.common.util.DateUtils;
-
-import com.care.common.util.HttpUtil;
-import com.care.common.util.ImgUtil;
-import com.care.common.vo.org.OrganizationVO;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-
-import com.care.common.vo.station.StationVO;
-import com.care.common.vo.sysuser.SysUserVO;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.FileOutputStream;
-import java.util.*;
-
-
-/**
- * @Author: lilt
- * @Date: 2021/7/14
- * @Desc:
- */
-@Service
-public class OrganizationService {
-    @Resource
-    private CareOrganizationService careOrganizationService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareSysUserService careSysUserService;
-    @Resource
-    private StationService stationService;
-
-    @Value("${file.savePath:#{null}}")
-    private String savePath;
-    @Value("${file.url:#{null}}")
-    private String fileUrl;
-
-    @Value("${syn.org.url:#{null}}")
-    private String synOrgUrl;
-
-
-    /**
-     * 查询登陆人，所能看到的 机构列表
-     * @return
-     */
-    public List<OrganizationVO> queryOrgsForSelect(UserLogindConvertVO loginUser){
-        List<OrganizationVO> datas = Lists.newArrayList();
-        QueryWrapper<CareOrganization> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(loginUser.getOrgId() != null, CareOrganization::getId, loginUser.getOrgId());
-        List<CareOrganization> organizations = this.careOrganizationService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(organizations)){
-            organizations.forEach(item -> {
-                OrganizationVO vo = new OrganizationVO();
-                BeanUtil.copyProperties(item,vo);
-                datas.add(vo);
-            });
-        }
-        return datas;
-    }
-
-    /**
-     * 查询机构列表
-     *
-     * @return
-     */
-    public IPage<OrganizationVO> listOrganization(String name, String systemName,PageReqVO pageReqVo) {
-        IPage<CareOrganization> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-        QueryWrapper<CareOrganization> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(StrUtil.isNotEmpty(name), CareOrganization::getName, name)
-                .like(StrUtil.isNotEmpty(systemName), CareOrganization::getSystemName, systemName)
-                .orderByAsc(CareOrganization::getName);
-
-        IPage<CareOrganization> pageRes = this.careOrganizationService.page(page, queryWrapper);
-        IPage<OrganizationVO> results = new Page<>(pageRes.getCurrent(), pageRes.getSize(), pageRes.getTotal());
-        if (CollUtil.isNotEmpty(pageRes.getRecords())) {
-            List<OrganizationVO> list = new ArrayList<>();
-            pageRes.getRecords().forEach(item -> {
-                OrganizationVO resVO = new OrganizationVO();
-                BeanUtils.copyProperties(item, resVO);
-                //服务站数量
-                QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
-                queryWrapper0.lambda().eq(CareStation::getOrgId, resVO.getId());
-                resVO.setStationCount(this.careStationService.count(queryWrapper0));
-
-                //服务设备数量
-                QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.lambda().eq(CareDevice::getOrgId, resVO.getId());
-                resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-
-                //服务有效期
-                QueryWrapper<CareSysUser> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.lambda().eq(CareSysUser::getOrgId, resVO.getId()).eq(CareSysUser::getRole,UserRoleEnum.ORG);
-                CareSysUser careSysUser = this.careSysUserService.getOne(queryWrapper2);
-                if (careSysUser != null && careSysUser.getServStartDate() != null && careSysUser.getServEndDate() != null) {
-                    resVO.setServValidPeriod(DateUtils.formatToDateStr(careSysUser.getServStartDate(), "yyyy-MM-dd") + "~" + DateUtils.formatToDateStr(careSysUser.getServEndDate(), "yyyy-MM-dd"));
-                }
-
-                list.add(resVO);
-            });
-            results.setRecords(list);
-        }
-        return results;
-    }
-
-    public OrganizationVO getOrganizationInfo(Long organizationId) {
-        OrganizationVO vo = new OrganizationVO();
-        CareOrganization organizationInfo = this.careOrganizationService.getById(organizationId);
-        BeanUtil.copyProperties(organizationInfo,vo);
-
-        //机构账号
-        QueryWrapper<CareSysUser> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.lambda().eq(CareSysUser::getOrgId, organizationId).eq(CareSysUser::getRole,UserRoleEnum.ORG);
-        CareSysUser careSysUser = this.careSysUserService.getOne(queryWrapper2);
-        SysUserVO sysUserVO = new SysUserVO();
-        BeanUtil.copyProperties(careSysUser, sysUserVO);
-        vo.setSysUserVO(sysUserVO);
-
-        return vo;
-    }
-
-    /**
-     * 同步机构
-     */
-    public boolean synOrganization() {
-
-        try {
-            // 通过synOrgUrl获取data
-            JSONObject jsonObject = HttpUtil.httpGet(synOrgUrl);
-            int code = jsonObject.getInt("code");
-            if (code == 1) {
-                JSONArray data = jsonObject.getJSONArray("data");
-                Iterator it = data.iterator();
-                List<CareOrganization> list = new ArrayList<>();
-                while (it.hasNext()) {
-                    JSONObject obj = (JSONObject) it.next();
-                    CareOrganization careOrganization = new CareOrganization();
-
-                    careOrganization.setName(obj.getStr("companyName"));
-                    careOrganization.setShortName(obj.getStr("shortName"));
-                    careOrganization.setCompanyId(obj.getStr("companyId"));
-                    careOrganization.setOrgCode(obj.getStr("companyId"));
-                    careOrganization.setCompanyKey(obj.getStr("companyKey"));
-                    list.add(careOrganization);
-
-                }
-                if(!list.isEmpty()){
-                    careOrganizationService.synOrganization(list);
-                    return true;
-                } else {
-                    return false;
-                }
-
-            } else {
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-    }
-    /**
-     * 上传文件
-     * @param file
-     * @return  访问URL
-     */
-    public String upload(MultipartFile file) throws BDException {
-         String logo = null;
-         try {
-            if (file != null) {
-                //获取文件名
-                String fileName = file.getOriginalFilename();
-                if (StringUtils.isEmpty(fileName) || file.getSize() == 0) {
-                    throw new BDException("logo文件不能为空！");
-                }
-                //验证文件名是否合格
-                if (!ImgUtil.isImg(fileName)) {
-                    throw new BDException("logo文件必须是图片格式！");
-                }
-                String saveFileName = UUID.randomUUID().toString() + "_" + fileName;
-                String picFullFileName = savePath + "/logo/" + saveFileName;
-                FileOutputStream fos = new FileOutputStream(picFullFileName);
-                fos.write(file.getBytes());
-                logo = fileUrl + "logo/" + saveFileName;
-            } else {
-                throw new BDException("上传失败");
-            }
-        } catch (Exception e) {
-            throw new BDException("上传失败",e);
-        }
-
-        return logo;
-    }
-
-    /**
-     * 修改机构
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateOrganization(OrganizationVO vo) throws BDException {
-
-        CareOrganization careOrganization = new CareOrganization();
-        BeanUtil.copyProperties(vo, careOrganization);
-        if(!this.careOrganizationService.updateById(careOrganization)){
-            throw new BDException("机构修改失败！");
-        }
-
-        //机构账号
-        SysUserVO sysUserVO = vo.getSysUserVO();
-        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareSysUser::getPhone, sysUserVO.getPhone());
-        CareSysUser careSysUserDb = careSysUserService.getOne(queryWrapper);
-        if(careSysUserDb != null){
-            sysUserVO.setId(careSysUserDb.getId());
-            CareSysUser careSysUser = new CareSysUser();
-            BeanUtil.copyProperties(sysUserVO,careSysUser);
-            if(!this.careSysUserService.updateById(careSysUser)){
-                throw new BDException("机构账号修改失败！");
-            };
-        } else {
-            CareSysUser careSysUser = new CareSysUser();
-            BeanUtil.copyProperties(sysUserVO,careSysUser);
-            careSysUser.setName((vo.getShortName() == null ? "" : vo.getShortName()) + "管理账号");
-            careSysUser.setCreateTime(new Date());
-            careSysUser.setRole(UserRoleEnum.ORG.getValue());
-            careSysUser.setOrgId(vo.getId());
-            String md5Password = DigestUtils.md5Hex("123456");
-            careSysUser.setPassword(md5Password);
-            this.careSysUserService.save(careSysUser);
-
-            //创建一个默认服务站
-            CareOrganization careOrganizationDb = this.careOrganizationService.getById(vo.getId());
-            StationVO careStationVO = new StationVO();
-            careStationVO.setOrgId(vo.getId());
-            careStationVO.setName(careOrganizationDb.getName());
-            careStationVO.setShortName(careOrganizationDb.getShortName());
-             careStationVO.setPhone(careSysUser.getPhone());
-             stationService.addStation(careStationVO);
-        }
-
-    }
-    /**
-     * 启用停用机构
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void invalidOrganization(OrganizationVO vo) throws Exception {
-        CareOrganization careOrganization = new CareOrganization();
-        BeanUtil.copyProperties(vo, careOrganization);
-        if(!this.careOrganizationService.updateById(careOrganization)){
-            throw new BDException("操作失败！");
-        }
-    }
-
-}
-
-
-

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

@@ -1,172 +0,0 @@
-package com.care.bms.service;
-
-import cn.hutool.core.bean.BeanUtil;
-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.care.common.entity.CareDevice;
-import com.care.common.entity.CareHouse;
-import com.care.common.entity.CareOrganization;
-import com.care.common.entity.CareStation;
-import com.care.common.enums.DeviceActiveStatusEnum;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareDeviceService;
-import com.care.common.service.CareHouseService;
-import com.care.common.service.CareOrganizationService;
-import com.care.common.service.CareStationService;
-import com.care.common.util.RandomCodeUtil;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.station.StationVO;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/7/14
- * @Desc:
- */
-@Service
-public class StationService {
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareOrganizationService careOrganizationService;
-    @Resource
-    private CareHouseService careHouseService;
-
-
-    /**
-     * 查询服务站列表
-     * @return
-     */
-    public IPage<StationVO> listStation(String name, Long orgId, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-        IPage<CareStation> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-        QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareStation::getName,name)
-                .eq(orgId != null,CareStation::getOrgId,orgId)
-                .eq(loginUser.getOrgId() != null,CareStation::getOrgId,loginUser.getOrgId())
-                .orderByAsc(CareStation::getName);
-
-        IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);
-        IPage<StationVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-        if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<StationVO> list = new ArrayList<>();
-            pageRes.getRecords().forEach(item -> {
-                StationVO  resVO = new StationVO();
-                BeanUtils.copyProperties(item,resVO);
-                //服务设备数量
-                QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.lambda().eq(CareDevice::getStationId,resVO.getId());
-                resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-                CareOrganization org = this.careOrganizationService.getById(resVO.getOrgId());
-                resVO.setOrgName(org != null? org.getName() : "");
-                list.add(resVO);
-            });
-            results.setRecords(list);
-        }
-        return results;
-    }
-
-    public StationVO getStationInfo(Long stationId) {
-        CareStation stationInfo = this.careStationService.getById(stationId);
-       if(stationInfo == null){
-           return null;
-       }
-        StationVO vo = new StationVO();
-        BeanUtil.copyProperties(stationInfo,vo);
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareDevice::getStationId,stationId);
-        List<CareDevice> deviceList  = this.careDeviceService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(deviceList)){
-            List<DeviceVO> deviceVOList  = Lists.newArrayList();
-            deviceList.forEach(item -> {
-                DeviceVO deviceVO = new DeviceVO();
-                BeanUtil.copyProperties(item,deviceVO);
-                deviceVO.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(deviceVO.getActiveStatus()));
-                CareHouse house = this.careHouseService.getById(deviceVO.getHouseId());
-                if (house!=null){
-                    deviceVO.setHouseAddr(house.getAddr());
-                    deviceVO.setHouseNumber(house.getHouseNumber());
-                    deviceVO.setLatitude(house.getLatitude());
-                    deviceVO.setLongitude(house.getLongitude());
-                }
-                deviceVOList.add(deviceVO);
-            });
-            vo.setDeviceVOList(deviceVOList);
-            vo.setDevCount(deviceVOList.size());
-        }
-        CareOrganization careOrganization = this.careOrganizationService.getById(vo.getOrgId());
-        if(careOrganization != null){
-            vo.setOrgName(careOrganization.getName());
-        }
-        return vo;
-    }
-
-    /**
-     * 查询登陆人，所能看到的 服务站列表
-     * @param loginUser
-     * @return
-     */
-    public List<StationVO> queryStationsForSelect(UserLogindConvertVO loginUser){
-        List<StationVO> datas = Lists.newArrayList();
-        if (loginUser == null){
-            return datas;
-        }
-        QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(loginUser.getOrgId()!=null,CareStation::getOrgId,loginUser.getOrgId());
-        queryWrapper.lambda().eq(loginUser.getStationId()!=null,CareStation::getId,loginUser.getStationId());
-        List<CareStation> stations = this.careStationService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(stations)){
-            stations.forEach(item -> {
-                StationVO vo = new StationVO();
-                BeanUtil.copyProperties(item,vo);
-                datas.add(vo);
-            });
-        }
-        return datas;
-    }
-
-    public Long addStation(StationVO vo) throws BDException {
-        QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareStation::getName,vo.getName());
-        int count = this.careStationService.count(queryWrapper);
-        if(count > 0){
-            throw new BDException("服务站名称已经存在！");
-        }
-
-        CareStation careStation = new CareStation();
-        BeanUtil.copyProperties(vo,careStation);
-
-        careStation.setCode(getCode());
-        careStation.setCreateTime(new Date());
-        boolean flag = this.careStationService.save(careStation);
-        if (!flag) {
-            throw new BDException("新增服务站失败！");
-        }
-        return careStation.getId();
-    }
-
-    private String getCode(){
-        String code = RandomCodeUtil.radomNumberCode(10);
-        QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareStation::getCode,code);
-        CareStation careStationDb1 = this.careStationService.getOne(queryWrapper);
-        if(careStationDb1 == null) {
-            return code;
-        } else {
-            return getCode();
-        }
-    }
-}

src/main/java/com/care/bms/websocket/StationWebSocketEndpoint.java

@@ -1,190 +0,0 @@
-package com.care.bms.websocket;
-
-
-import cn.hutool.json.JSONUtil;
-import com.care.common.vo.UserLogindConvertVO;
-import com.care.common.util.ExUtil;
-import com.care.common.util.JsonUtil;
-import com.care.common.util.JwtUtils;
-import com.care.common.util.Result;
-import io.jsonwebtoken.Claims;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-/**
- * Swagger2配置
- *
- * @author stw
- * @version 1.0.0 创建于 2021/5/24
- **/
-@ServerEndpoint("/bms/bigscreen/ws")
-@Component
-public class StationWebSocketEndpoint {
-    private static final Logger logger = LoggerFactory.getLogger(StationWebSocketEndpoint.class);
-
-
-    //用来存放每个客户端对应的BigScreenWebSocketEndpoint对象
-    private static CopyOnWriteArraySet<StationWebSocketEndpoint> currentWebSocketSession = new CopyOnWriteArraySet<>();
-
-    // 与某个客户端的连接会话，需要通过它来与客户端进行数据收发
-    private Session session;
-    //用于关联当前客户端和websocket会话的关系
-
-    //电话作为登陆用户名
-    private String phone;
-
-    //服务站ID
-    private String stationId;
-
-
-    /**
-     * websocket 连接打开操作
-     *
-     * @param session websocket会话对象
-     */
-    @OnOpen
-    public void webSocketOnOpen(Session session) {
-        try {
-            //校验参数
-            String requestParamString = session.getQueryString();
-            if (StringUtils.isEmpty(requestParamString)) {
-                closeSession(session, "-1", "连接失败,token为空");
-                return;
-            }
-            //建立websocket和登录用户、站点ID的关联关系
-            //从token中解析出登录用户的信息
-            String[] keyValues = requestParamString.split("&");
-            //取出token 字符串
-            String ts = null;
-
-            for (String t : keyValues) {
-                if (t.startsWith("token=")) {
-                    ts = t.replaceAll("token=", "");
-                } else if (t.startsWith("stationId=")) {
-                    stationId = t.replaceAll("stationId=", "");
-                }
-            }
-            if (StringUtils.isEmpty(ts) || StringUtils.isEmpty(stationId)) {
-                closeSession(session, "-1", "连接失败,token或stationId为空");
-                return;
-            }
-            Claims claims = JwtUtils.tokenParse(ts);
-            if (claims != null) {
-                UserLogindConvertVO vo = JSONUtil.toBean(claims.getSubject(), UserLogindConvertVO.class);
-                if (vo != null) {
-                    this.phone = vo.getPhone();
-                } else{
-                    closeSession(session, "-1", "连接失败,token解析失败");
-                    return;
-                }
-            }
-            logger.info("websocket会话建立:服务站ID={},登录用户={}登录！", this.stationId,this.phone);
-            this.session = session;
-            currentWebSocketSession.add(this);
-        } catch (Exception e) {
-            closeSession(session, "-1", "连接失败,token为空");
-            logger.error("websocket会话建立异常:"+ ExUtil.exToDetail(e));
-        }
-    }
-
-    @OnClose
-    public void onClose(Session session) {
-        //移除连接
-        currentWebSocketSession.remove(this);
-        logger.info("客户端断开连接,客户端id={},服务站ID={},登录用户={},退出websocket连接", session.getId(), this.stationId, this.phone);
-    }
-
-    @OnError
-    public void onError(Session session, Throwable error) {
-        logger.error("客户端id={},服务站ID={},登录用户={},连接异常信息={}.", session.getId(), this.stationId, this.phone, error.getCause());
-    }
-
-    @OnMessage
-    public void onMessage(String message, Session session) throws Exception {
-//        logger.info("Receive a message from client: " + message);
-        // 页面传过来的消息不做任何处理
-        logger.info("收到来自" + session.getId() + "的消息" + message);
-        //返回消息给Web Socket客户端（浏览器）
-//        sendMessage(message);
-    }
-
-    public static void sendMessage(String message) throws IOException {
-        for (StationWebSocketEndpoint endpoint : currentWebSocketSession) {
-            Session session = endpoint.getSession();
-            if (session.isOpen()) {
-                //发送消息
-                try {
-                    session.getBasicRemote().sendText(message);
-                } catch (IOException e) {
-                    logger.info("给服务站ID={},登录用户={} 发送数据失败，客户端连接已经断开.", endpoint.getStationId(), endpoint.getPhone());
-                }
-            }
-        }
-    }
-
-    /**
-     * 给客户端发送消息的方法
-     *
-     * @param stationId 服务站ID
-     * @param msg        发送的信息
-     */
-    public static void sendMessage(String stationId,String msg) throws IOException  {
-        //根据服务站ID，匹配连接并发送消息
-        for (StationWebSocketEndpoint endpoint : currentWebSocketSession) {
-            Session session = endpoint.getSession();
-            if (session.isOpen() && stationId.equals(endpoint.getStationId())) {
-                //发送消息
-                try {
-                    session.getBasicRemote().sendText(msg);
-                } catch (IOException e) {
-                    logger.info("给服务站ID={}，登录用户={} 发送数据失败，客户端连接已经断开.", endpoint.getStationId(), endpoint.getPhone());
-                }
-            }
-        }
-
-    }
-
-
-    /**
-     * 关闭session操作
-     *
-     * @param session
-     * @param msg
-     * @throws Exception
-     */
-    private void closeSession(Session session,  String code, String msg) {
-        try {
-            if (session != null){
-                if("-1".equals(code)){
-                    session.getBasicRemote().sendText(JsonUtil.toJson(Result.error(msg)));
-                } else {
-                    session.getBasicRemote().sendText(JsonUtil.toJson(Result.success(msg)));
-                }
-
-                session.close();
-            }
-
-        } catch (Exception e) {
-            logger.info("关闭连接异常", e.getCause());
-        }
-    }
-
-    public Session getSession() {
-        return session;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-}

src/main/java/com/care/bms/websocket/WebSocketEndpoint.java

@@ -1,171 +0,0 @@
-package com.care.bms.websocket;
-
-
-import cn.hutool.json.JSONUtil;
-import com.care.common.util.ExUtil;
-import com.care.common.util.JsonUtil;
-import com.care.common.util.JwtUtils;
-import com.care.common.util.Result;
-import com.care.common.vo.UserLogindConvertVO;
-import io.jsonwebtoken.Claims;
-import io.swagger.annotations.ApiModelProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-/**
- * Swagger2配置
- *
- * @author stw
- * @version 1.0.0 创建于 2021/5/24
- **/
-@ServerEndpoint("/bms/order/ws")
-@Component
-public class WebSocketEndpoint {
-    private static final Logger logger = LoggerFactory.getLogger(WebSocketEndpoint.class);
-
-
-    //用来存放每个客户端对应的BigScreenWebSocketEndpoint对象
-    private static CopyOnWriteArraySet<WebSocketEndpoint> currentWebSocketSession = new CopyOnWriteArraySet<>();
-
-    // 与某个客户端的连接会话，需要通过它来与客户端进行数据收发
-    private Session session;
-    //用于关联当前客户端和websocket会话的关系
-
-    //电话作为登陆用户名
-    private String phone;
-
-    @ApiModelProperty("机构ID")
-    private Long orgId;
-
-    @ApiModelProperty("服务站ID，角色为坐席时，该字段可能未空")
-    private Long stationId;
-
-
-
-    /**
-     * websocket 连接打开操作
-     *
-     * @param session websocket会话对象
-     */
-    @OnOpen
-    public void webSocketOnOpen(Session session) {
-        try {
-            //校验参数
-            String requestParamString = session.getQueryString();
-            if (StringUtils.isEmpty(requestParamString)) {
-                closeSession(session, "-1", "连接失败,token为空");
-                return;
-            }
-            //建立websocket和登录用户、站点ID的关联关系
-            //从token中解析出登录用户的信息
-            String[] keyValues = requestParamString.split("&");
-            //取出token 字符串
-            String ts = null;
-
-            for (String t : keyValues) {
-                if (t.startsWith("token=")) {
-                    ts = t.replaceAll("token=", "");
-                }
-            }
-            if (StringUtils.isEmpty(ts)) {
-                closeSession(session, "-1", "连接失败,token为空");
-                return;
-            }
-            Claims claims = JwtUtils.tokenParse(ts);
-            if (claims != null) {
-                UserLogindConvertVO vo = JSONUtil.toBean(claims.getSubject(), UserLogindConvertVO.class);
-                if (vo != null) {
-                    this.phone = vo.getPhone();
-                    this.orgId = vo.getOrgId();
-                    this.stationId = vo.getStationId();
-                } else{
-                    closeSession(session, "-1", "连接失败,token解析失败");
-                    return;
-                }
-            }
-            logger.info("websocket会话建立:登录用户={}登录！",this.phone);
-            this.session = session;
-            currentWebSocketSession.add(this);
-        } catch (Exception e) {
-            closeSession(session, "-1", "连接失败,token为空");
-            logger.error("websocket会话建立异常:"+ ExUtil.exToDetail(e));
-        }
-    }
-
-    @OnClose
-    public void onClose(Session session) {
-        //移除连接
-        currentWebSocketSession.remove(this);
-        logger.info("客户端断开连接,客户端id={},登录用户={},退出websocket连接", session.getId(), this.phone);
-    }
-
-    @OnError
-    public void onError(Session session, Throwable error) {
-        logger.error("客户端id={},登录用户={},连接异常信息={}.", session.getId(), this.phone, error.getCause());
-    }
-
-    @OnMessage
-    public void onMessage(String message, Session session) throws Exception {
-//        logger.info("Receive a message from client: " + message);
-        // 页面传过来的消息不做任何处理
-        logger.info("收到来自" + session.getId() + "的消息" + message);
-        //返回消息给Web Socket客户端（浏览器）
-//        sendMessage(message);
-    }
-
-    public static void sendMessage(Long orgId,Long stationId ,String message) throws IOException {
-        for (WebSocketEndpoint endpoint : currentWebSocketSession) {
-            Session session = endpoint.getSession();
-            if (session.isOpen()) {
-                if (endpoint.orgId == orgId){
-                    //发送消息
-                    try {
-                        session.getBasicRemote().sendText(message);
-                    } catch (IOException e) {
-                        logger.info("登录用户={} 发送数据失败，客户端连接已经断开.", endpoint.getPhone());
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 关闭session操作
-     *
-     * @param session
-     * @param msg
-     * @throws Exception
-     */
-    private void closeSession(Session session,  String code, String msg) {
-        try {
-            if (session != null){
-                if("-1".equals(code)){
-                    session.getBasicRemote().sendText(JsonUtil.toJson(Result.error(msg)));
-                } else {
-                    session.getBasicRemote().sendText(JsonUtil.toJson(Result.success(msg)));
-                }
-
-                session.close();
-            }
-
-        } catch (Exception e) {
-            logger.info("关闭连接异常", e.getCause());
-        }
-    }
-
-    public Session getSession() {
-        return session;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-}

src/main/java/com/care/client/config/PlatformOfficialConfig.java

@@ -1,22 +0,0 @@
-package com.care.client.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 描述：
- *
- * @autho：wenskys
- * @create 2020/5/11 0:05
- **/
-@Configuration
-public class PlatformOfficialConfig {
-
-    @Bean
-    @ConfigurationProperties(prefix = "wx.official")
-    public WxConfig officialConfig() {
-        return new WxConfig();
-    }
-
-}

src/main/java/com/care/client/config/PlatformPinanbaoConfig.java

@@ -1,21 +0,0 @@
-package com.care.client.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 描述：
- *
- * @autho：wenskys
- * @create 2020/5/11 0:05
- **/
-@Configuration
-public class PlatformPinanbaoConfig {
-
-    @Bean
-    @ConfigurationProperties(prefix = "wx.pinanbao")
-    public WxConfig wxConfig() {
-        return new WxConfig();
-    }
-}

src/main/java/com/care/client/config/WxConfig.java

@@ -1,14 +0,0 @@
-package com.care.client.config;
-
-import lombok.Data;
-
-@Data
-public class WxConfig {
-
-    private String codeUrl;
-    private String tokenUrl;
-    private String infoUrl;
-    private String appId;
-    private String secret;
-
-}

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

@@ -1,163 +0,0 @@
-package com.care.client.controller;
-
-import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoContactService;
-import com.care.client.vo.HouseContactVO;
-import com.care.client.vo.MemberInfoVO;
-import com.care.common.exception.BDException;
-import com.care.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "ContactApiController", tags = { "我的紧急联系人" })
-@Slf4j
-@RequestMapping("/pinanbao/contact")
-public class ContactApiController {
-
-    @Resource
-    private PinanbaoContactService pinanbaoContactService;
-    @Resource
-    private PassportService passportService;
-
-    /**
-     * 紧急联系人列表
-     * @param request
-     * @return
-     */
-    @GetMapping("/my/list")
-    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人列表")
-    public Result<List<HouseContactVO>> myHouseContactList(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        MemberInfoVO current = passportService.checkToken(token);
-        try {
-            List<HouseContactVO> datas = pinanbaoContactService.queryContactByMemberId(current.getId());
-            return Result.success(datas);
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("我的紧急联系人: 紧急联系人列表查询出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-    /**
-     * 我的紧急联系人详情
-     * @return
-     */
-    @GetMapping("/my/getMyContactInfo")
-    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人详情 -- 二期新增")
-    public Result<HouseContactVO> getMyContactInfo(@RequestHeader(value = "token") String token,
-                                          @RequestParam("contactId") Long contactId){
-        try {
-            return Result.success(this.pinanbaoContactService.getContactInfo(contactId));
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("紧急联系人: 查询详情出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-
-    @PostMapping("/my/add")
-    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人新增 -- 二期新增")
-    public Result<Object> addMyContact(@RequestHeader("token") String token,
-                                     @RequestBody HouseContactVO vo){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            if(this.pinanbaoContactService.createMyContact(current.getId(),vo)){
-                return  Result.success("新增成功！");
-            } else {
-                return Result.error("新增失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("新增紧急联系人-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("紧急联系人: 新增紧急联系人出现异常",e);
-            return Result.error("新增失败！");
-        }
-    }
-
-    @PostMapping("/my/update")
-    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人修改 -- 二期新增")
-    public Result<Object> updateMyContact(@RequestHeader("token") String token,
-                                        @RequestBody HouseContactVO vo){
-        try {
-            if(this.pinanbaoContactService.updateMyContact(vo)){
-                return  Result.success("修改成功！");
-            } else {
-                return Result.error("修改失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("修改紧急联系人-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("紧急联系人: 修改紧急联系人出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-    @PostMapping("/my/addOrUpdate")
-    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人新增 -- 三期新增")
-    public Result<Object> addOrUpdateMyContact(@RequestBody HouseContactVO vo){
-        try {
-            if (this.pinanbaoContactService.createOrUpdateMyContact(null, vo)) {
-                return Result.success("保存成功！");
-            } else {
-                return Result.error("保存失败！");
-            }
-        }catch (BDException e) {
-            log.error("保存紧急联系人-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("保存联系人: 保存紧急联系人出现异常",e);
-            return Result.error("保存失败！");
-        }
-    }
-
-    @PostMapping("/my/getMyContact")
-    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人查询 -- 三期新增")
-    public Result<HouseContactVO> getMyContact(@RequestBody HouseContactVO vo){
-        try {
-            HouseContactVO myContact = this.pinanbaoContactService.getMyContact(vo.getMemberId(), vo.getContactPhone(), vo.getOpenId());
-            if (myContact != null) {
-                return Result.success("查询成功！", myContact);
-            } else {
-                return Result.error("查询失败！");
-            }
-        }catch (BDException e) {
-            log.error("保存紧急联系人-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("保存联系人: 保存紧急联系人出现异常",e);
-            return Result.error("保存失败！");
-        }
-    }
-
-    @DeleteMapping("/my/delete/{contactId}")
-    @ApiOperation(tags = {"我的紧急联系人"},value = "删除紧急联系人 -- 二期新增")
-    public Result<Object> deleteMyContact(HttpServletRequest request,@RequestHeader("token") String token,
-                                        @PathVariable("contactId") Long contactId) {
-        try {
-            this.pinanbaoContactService.deleteById(contactId);
-            return Result.success("删除成功！");
-        } catch (Exception e) {
-            log.error("紧急联系人: 删除紧急联系人出现异常", e);
-            return Result.error("删除失败！");
-        }
-    }
-}

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

@@ -1,233 +0,0 @@
-package com.care.client.controller;
-
-import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoDeviceService;
-import com.care.client.vo.HouseContactVO;
-import com.care.client.vo.MemberInfoVO;
-import com.care.client.vo.DeviceVO;
-import com.care.client.vo.OlderVO;
-import com.care.common.exception.BDException;
-import com.care.common.util.Result;
-import com.care.common.vo.station.StationVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "DevApiController", tags = { "我的设备" })
-@Slf4j
-@RequestMapping("/pinanbao/device")
-public class DevApiController {
-
-    @Resource
-    private PinanbaoDeviceService pinanbaoDeviceService;
-    @Resource
-    private PassportService passportService;
-
-    /**
-     * 我的设备列表
-     * @return
-     */
-    @GetMapping("/my/myDeviceList")
-    @ApiOperation(tags = {"我的设备"},value = "我的设备列表 -- 二期新增")
-    public Result<List<DeviceVO>> myDeviceList(@RequestHeader(value = "token") String token){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            List<DeviceVO> datas = pinanbaoDeviceService.queryDeviceByMemberId(current.getId());
-            return Result.success(datas);
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备: 列表查询出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-
-
-    @PostMapping("/my/unBindMyDevice")
-    @ApiOperation(tags = {"我的设备"},value = "在设备列表中移除设备（解除绑定） -- 二期新增")
-    public Result<Object> unBindMyDevice(HttpServletRequest request,@RequestHeader("token") String token,
-                                         @RequestParam("devId") Long devId) {
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            this.pinanbaoDeviceService.unBindMyDevice(current.getId(),devId);
-            return Result.success("移除成功！");
-        } catch (Exception e) {
-            log.error("设备: 移除设备出现异常", e);
-            return Result.error("移除失败！");
-        }
-    }
-
-
-
-    /**
-     * 我的设备详情
-     * @return
-     */
-    @GetMapping("/my/getMyDeviceInfo")
-    @ApiOperation(tags = {"我的设备"},value = "设备详情 （包括设备名、场景、响应时间、服务信息，是否设置xxx的标志等） -- 二期新增")
-    public Result<DeviceVO> getMyDeviceInfo(@RequestHeader(value = "token") String token,
-                                                @RequestParam("devId") Long devId){
-        try {
-            return Result.success(this.pinanbaoDeviceService.getDeviceInfo(devId));
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备: 查询详情出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-    /**
-     * 我的设备-服务站简介
-     * @return
-     */
-    @GetMapping("/my/getMyDevStationInfo")
-    @ApiOperation(tags = {"我的设备"},value = "服务站简介 -- 二期新增")
-    public Result<StationVO> getMyDevStationInfo(@RequestHeader(value = "token") String token,
-                                                 @RequestParam("stationId") Long stationId){
-        try {
-            return Result.success(this.pinanbaoDeviceService.getMyDevStationInfo(stationId));
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("服务站: 查询详情出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-    @PostMapping("/my/updateMyDevice")
-    @ApiOperation(tags = {"我的设备"},value = "设备修改(设备名，场景、响应时间) -- 二期新增")
-    public Result<Object> updateMyDevice(@RequestHeader("token") String token,
-                                 @RequestBody DeviceVO vo){
-        try {
-            if(this.pinanbaoDeviceService.updateMyDevice(vo)){
-                return  Result.success("修改成功！");
-            } else {
-                return Result.error("修改失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("修改设备-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备: 修改设备出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-
-    /**
-     * 查询我的设备拥有的被监护人列表
-     * @return
-     */
-    @GetMapping("/my/queryMyOlderListByDeviceId")
-    @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的被监护人列表 -- 二期新增")
-    public Result<List<OlderVO>> queryMyOlderListByDeviceId(@RequestHeader(value = "token") String token,
-                                                   @RequestParam("devId") Long devId){
-        try {
-            List<OlderVO> datas = pinanbaoDeviceService.queryMyOlderListByDeviceId(devId);
-            return Result.success(datas);
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("老人: 列表查询出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-
-    /**
-     * 查询我的设备拥有的紧急联系人列表
-     * @return
-     */
-    @GetMapping("/my/queryMyContactListByDeviceId")
-    @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的紧急联系人列表 -- 二期新增")
-    public Result<List<HouseContactVO>> queryMyContactListByDeviceId(@RequestHeader(value = "token") String token,
-                                                            @RequestParam("devId") Long devId){
-        try {
-            List<HouseContactVO> datas = pinanbaoDeviceService.queryMyContactListByDeviceId(devId);
-            return Result.success(datas);
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("联系人: 列表查询出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-    /**
-     * 选择我的被监护人列表中某个老人保存绑定
-     * @return
-     */
-    @PostMapping("/my/bindOlder")
-    @ApiOperation(tags = {"我的设备"},value = "选择我的被监护人列表中某个老人保存绑定 --二期新增")
-    public Result<Object> bindOlder(HttpServletRequest request, @RequestHeader("token") String token,
-                                    @RequestParam("devId") Long devId,
-                                     @RequestParam("olderId") Long olderId) {
-        if (this.pinanbaoDeviceService.bindOlder(devId,olderId)) {
-            return  Result.success("绑定成功");
-        } else{
-            return  Result.error("绑定失败");
-        }
-    }
-
-    @PostMapping("/my/unBindOlder")
-    @ApiOperation(tags = {"我的设备"},value = "移除被监护人（解除绑定） -- 二期新增")
-    public Result<Object> unBindOlder(HttpServletRequest request,@RequestHeader("token") String token,
-                                      @RequestParam("devId") Long devId,
-                                      @RequestParam("olderId") Long olderId) {
-        try {
-            this.pinanbaoDeviceService.unBindOlder(devId,olderId);
-            return Result.success("移除成功！");
-        } catch (Exception e) {
-            log.error("设备: 移除设备出现异常", e);
-            return Result.error("移除失败！");
-        }
-    }
-    /**
-     * 选择我的紧急人列表中某个保存绑定
-     * @return
-     */
-    @PostMapping("/my/bindHouseContact")
-    @ApiOperation(tags = {"我的设备"},value = "选择我的紧急人列表中某个保存绑定 --二期新增")
-    public Result<Object> bindHouseContact(HttpServletRequest request, @RequestHeader("token") String token,
-                                    @RequestParam("devId") Long devId,
-                                    @RequestParam("contactId") Long contactId) {
-        if (this.pinanbaoDeviceService.bindHouseContact(devId,contactId)) {
-            return  Result.success("绑定成功");
-        } else{
-            return  Result.error("绑定失败");
-        }
-    }
-
-    /**
-     * 移除被紧急联系人（解除绑定）
-     * @return
-     */
-    @PostMapping("/my/unHouseContact")
-    @ApiOperation(tags = {"我的设备"},value = "移除被紧急联系人（解除绑定） --二期新增")
-    public Result<Object> unHouseContact(HttpServletRequest request, @RequestHeader("token") String token,
-                                           @RequestParam("devId") Long devId,
-                                           @RequestParam("contactId") Long contactId) {
-        if (this.pinanbaoDeviceService.unHouseContact(devId,contactId)) {
-            return  Result.success("绑定成功");
-        } else{
-            return  Result.error("绑定失败");
-        }
-    }
-
-
-
-}

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

@@ -1,56 +0,0 @@
-package com.care.client.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoService;
-import com.care.client.vo.EventDetailVO;
-import com.care.client.vo.MemberInfoVO;
-import com.care.common.util.Result;
-import com.care.common.vo.order.EventOrderVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "EventHandleController")
-@Slf4j
-@RequestMapping("/pinanbao/event")
-public class EventApiController {
-
-    @Resource
-    private PinanbaoService pinanbaoService;
-    @Resource
-    private PassportService passportService;
-
-    @GetMapping("/allList")
-    @ApiOperation(tags = {"首页"},value = "当前进行中的事件  --二期修改")
-    public Result<IPage<EventOrderVO>> getAllListEvent(HttpServletRequest request, @RequestHeader("token") String token, @RequestParam Integer current){
-        MemberInfoVO memberInfoVo = passportService.checkToken(token);
-        return  Result.success("查询成功！", this.pinanbaoService.getAllListEvent(current, memberInfoVo.getId()));
-    }
-
-    @GetMapping("/hasDoing")
-    @ApiOperation(tags = {"首页"},value = "当前进行中的事件  --二期修改")
-    public Result<EventOrderVO> getDoingEvent(HttpServletRequest request,@RequestHeader("token") String token){
-        MemberInfoVO current = passportService.checkToken(token);
-        EventOrderVO orderInfo = this.pinanbaoService.getDoingEvent(current.getId());
-        return  Result.success("查询成功！",orderInfo);
-    }
-
-
-    @GetMapping("/getEventInfo")
-    @ApiOperation(tags = {"事件处理"},value = "某个事件的详细处理记录  -- 二期修改")
-    public Result<EventDetailVO> getEventInfo(HttpServletRequest request, @RequestHeader("token") String token, @RequestParam("orderId") Long orderId){
-        return  Result.success("查询成功！",this.pinanbaoService.getEventInfo(orderId));
-    }
-
-}

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

@@ -1,184 +0,0 @@
-package com.care.client.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoService;
-import com.care.client.vo.DeviceMonitorVO;
-import com.care.client.vo.MemberInfoVO;
-import com.care.common.entity.CareBedroomInbedHourSta;
-import com.care.common.entity.CareToiletInoutHourSta;
-import com.care.common.entity.CareWalkingDistanceHourSta;
-import com.care.common.exception.BDException;
-import com.care.common.util.PageResult;
-import com.care.common.util.Result;
-import com.care.common.vo.device.DeviceVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "HouseApiController", tags = { "房屋信息" })
-@Slf4j
-@RequestMapping("/pinanbao/house")
-public class HouseApiController {
-    @Resource
-    private PassportService passportService;
-    @Autowired
-    private PinanbaoService pinanbaoService;
-    //TODO 某个设备的睡眠报告 夜间、白天
-
-    /**
-     *设备列表
-     * @param token
-     * @return
-     */
-    @GetMapping("/device/list")
-    @ApiOperation(tags = {"首页"},value = "设备列表  --二期修改")
-    public Result<List<DeviceVO>> deviceList(@RequestHeader(value = "token") String token){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            List<DeviceVO> datas = pinanbaoService.devList(current.getId());
-            return Result.success(datas);
-        }catch (BDException e) {
-            log.error("未处理事件查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("事件处理: 未处理事件查询出现异常",e);
-            return PageResult.error( "获取列表失败");
-        }
-    }
-
-    @GetMapping("/device/monitor")
-    @ApiOperation(tags = {"首页"},value = "设备的监测信息 --三期修改")
-    public Result<DeviceMonitorVO> getMonitor(@RequestHeader(value = "token") String token, @RequestParam("devId") Long devId){
-        try {
-            return Result.success(this.pinanbaoService.devMonitorData(devId));
-        }catch (BDException e) {
-            log.error("首页设备的监测信息-查询监测信息出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("首页设备的监测信息: 查询监测信息出现异常",e);
-            return PageResult.error( "获取信息失败");
-        }
-    }
-
-    
-
-    @PostMapping(value = "/sos" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @ApiOperation(tags = {"首页"},value = "SOS呼叫",httpMethod ="POST" ,response = Result.class)
-    public Result<Object> sos(@RequestHeader("token") String token, @RequestParam(value = "file") MultipartFile file){
-        try {
-            MemberInfoVO memberInfoVO = passportService.checkToken(token);
-            this.pinanbaoService.sos(memberInfoVO,file);
-            return Result.success("呼叫成功");
-        }
-        catch (BDException e) {
-            log.error("主动呼叫异常BDException",e);
-            return Result.error("呼叫失败！");
-        }catch (Exception e) {
-            log.error("线路管理:线路导入出现异常",e);
-            return Result.error("呼叫失败！");
-        }
-    }
-
-    @PostMapping(value = "/sos-bak")
-    @ApiOperation(tags = {"首页"},value = "SOS呼叫",httpMethod ="POST" ,response = Result.class)
-    public Result<Object> sos(@RequestHeader("token") String token){
-        try {
-            MemberInfoVO memberInfoVO = passportService.checkToken(token);
-            this.pinanbaoService.sos(memberInfoVO);
-            return Result.success("呼叫成功");
-        }
-        catch (BDException e) {
-            log.error("主动呼叫异常BDException",e);
-            return Result.error(e.getMessage());
-        }catch (Exception e) {
-            log.error("线路管理:线路导入出现异常",e);
-            return Result.error("呼叫失败！");
-        }
-    }
-    @GetMapping("/getRealTimeMonitorUrl")
-    @ApiOperation(tags = {"首页"},value = "获取实时监控URL")
-    public Result<String> getRealTimeMonitorUrl(@RequestHeader(value = "token") String token, @RequestParam("devId") Long devId){
-        String url = this.pinanbaoService.getRealTimeMonitorUrl(devId);
-        if (StrUtil.isNotEmpty(url)) {
-            return  Result.success("查询成功！",url);
-        }else{
-            return  Result.error("查询失败！");
-        }
-    }
-
-
-    /**
-     *卧室在床时间图表
-     * @param token
-     * @return
-     */
-    @GetMapping("/device/getInbedTimeChartList")
-    @ApiOperation(tags = {"首页"},value = "卧室在床时间统计图表  --三期新增")
-    public Result<List<CareBedroomInbedHourSta>> getInbedTimeChartList(@RequestHeader(value = "token") String token, @RequestParam("devId") Long devId){
-        try {
-            List<CareBedroomInbedHourSta> datas = pinanbaoService.getInbedTimeChartList(devId);
-            return Result.success(datas);
-        }catch (BDException e) {
-            log.error("首页-在床时间图表查询出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("首页: 在床时间图表查询出现异常",e);
-            return PageResult.error( "获取在床时间图表失败");
-        }
-    }
-
-    /**
-     *卫生间进出统计图表
-     * @param token
-     * @return
-     */
-    @GetMapping("/device/getToiletInoutChartList")
-    @ApiOperation(tags = {"首页"},value = "卫生间进出统计图表  --三期新增")
-    public Result<List<CareToiletInoutHourSta>> getToiletInoutChartList(@RequestHeader(value = "token") String token, @RequestParam("devId") Long devId){
-        try {
-            List<CareToiletInoutHourSta> datas = pinanbaoService.getToiletInoutChartList(devId);
-            return Result.success(datas);
-        }catch (BDException e) {
-            log.error("首页-卫生间进出图表查询出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("首页: 卫生间进出图表查询出现异常",e);
-            return PageResult.error( "获取卫生间进出图表失败");
-        }
-    }
-
-    /**
-     *活动统计图表
-     * @param token
-     * @return
-     */
-    @GetMapping("/device/getActivityChartList")
-    @ApiOperation(tags = {"首页"},value = "活动统计图表  --三期新增")
-    public Result<List<CareWalkingDistanceHourSta>> getActivityChartList(@RequestHeader(value = "token") String token, @RequestParam("devId") Long devId){
-        try {
-            List<CareWalkingDistanceHourSta> datas = pinanbaoService.getActivityChartList(devId);
-            return Result.success(datas);
-        }catch (BDException e) {
-            log.error("首页-卫生间进出图表查询出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("首页: 卫生间进出图表查询出现异常",e);
-            return PageResult.error( "获取卫生间进出图表失败");
-        }
-    }
-
-}

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

@@ -1,88 +0,0 @@
-package com.care.client.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoMemberInfoService;
-import com.care.client.vo.MemberInfoVO;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 描述：
- *
- * @autho：wenskys
- * @create 2020/5/12 14:13
- **/
-@Api(tags = "用户相关接口")
-@RestController
-@RequestMapping("/pinanbao/member")
-public class MemberApiController {
-
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-    @Resource
-    private PinanbaoMemberInfoService pinanbaoMemberInfoService;
-
-
-    @Resource
-    private PassportService passportService;
-
-
-    @ApiOperation(value = "获取基本信息", notes = "获取用户基本信息")
-    @PostMapping("detail/info")
-    public Result<Object> detailInfo(@RequestHeader String token) {
-        MemberInfoVO current = passportService.checkToken(token);
-        CareMemberInfo member = careMemberInfoService.detailByPhone(current.getPhone());
-        BeanUtil.copyProperties(member,current);
-        if (member.getBirthday()!=null){
-            current.setAge(DateUtil.ageOfNow(member.getBirthday()));
-        }
-        return Result.success(current);
-    }
-
-    @PostMapping("/update/updateMyInfo")
-    @ApiOperation(value = "修改个人信息（姓名、地址、头像、昵称、性别等） -- 二期新增", notes = "修改个人信息（姓名、地址、姓名、地址、头像、昵称、性别等）")
-    public Result<Object> updateMyMemberInfo(@RequestHeader("token") String token,
-                                         @RequestBody MemberInfoVO vo){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            if(current == null) {
-                return Result.error("修改失败！");
-            }
-            vo.setId(current.getId());
-            if(this.pinanbaoMemberInfoService.updateMyMemberInfo(vo)){
-                return  Result.success("修改成功！");
-            } else {
-                return Result.error("修改失败！");
-            }
-
-        } catch (Exception e) {
-            return Result.error("修改失败！");
-        }
-    }
-
-
-    /*@ApiOperation(value = "刷新基本信息", notes = "刷新用户基本信息")
-    @PostMapping("refresh")
-    public Result<Object> refreshMember(@RequestHeader String token) {
-        MemberInfoVO lastMemberInfoVO = abstractPassportService.refreshMember(token);
-        return Result.success(lastMemberInfoVO);
-    }*/
-
-   /* @ApiOperation(value = "校验是否要刷新小程序用户信息", notes = "校验是否要刷新小程序用户信息 true刷新")
-    @PostMapping("notMatchMemberField")
-    public Result<Object> notMatchMemberField(@RequestHeader String token) {
-        return Result.success(passportService.notMatchMemberField(token));
-    }
-*/
-
-
-
-}

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

@@ -1,125 +0,0 @@
-package com.care.client.controller;
-
-import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoOlderService;
-import com.care.client.vo.MemberInfoVO;
-import com.care.client.vo.OlderVO;
-import com.care.common.exception.BDException;
-import com.care.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "OlderApiController", tags = { "我的被监护人" })
-@Slf4j
-@RequestMapping("/pinanbao/older")
-public class OlderApiController {
-
-    @Resource
-    private PinanbaoOlderService pinanbaoOlderService;
-    @Resource
-    private PassportService passportService;
-
-    /**
-     * 我的被监护人列表
-     * @return
-     */
-    @GetMapping("/my/list")
-    @ApiOperation(tags = {"我的被监护人,我的设备"},value = "被监护人列表")
-    public Result<List<OlderVO>> myOlderList(@RequestHeader(value = "token") String token){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            List<OlderVO> datas = pinanbaoOlderService.queryOlderByMemberId(current.getId());
-            return Result.success(datas);
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("被监护人: 列表查询出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-    /**
-     * 我的被监护人详情
-     * @return
-     */
-    @GetMapping("/my/getMyOlderInfo")
-    @ApiOperation(tags = {"我的被监护人"},value = "被监护人详情  -- 二期新增")
-    public Result<OlderVO> getMyOlderInfo(@RequestHeader(value = "token") String token,
-                                                @RequestParam("olderId") Long olderId){
-        try {
-            return Result.success(this.pinanbaoOlderService.getOlderInfo(olderId));
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("被监护人: 查询详情出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
-
-
-    @PostMapping("/my/add")
-    @ApiOperation(tags = {"我的被监护人,我的设备"},value = "被监护人新增 -- 二期新增")
-    public Result<Object> addMyOlder(@RequestHeader("token") String token,
-                                   @RequestBody OlderVO vo){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            if(this.pinanbaoOlderService.createMyOlder(current.getId(),vo)){
-                return  Result.success("新增成功！");
-            } else {
-                return Result.error("新增失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("新增被监护人-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("被监护人: 新增被监护人出现异常",e);
-            return Result.error("新增失败！");
-        }
-    }
-
-    @PostMapping("/my/update")
-    @ApiOperation(tags = {"我的被监护人,我的设备"},value = "被监护人修改 -- 二期新增")
-    public Result<Object> updateMyOlder(@RequestHeader("token") String token,
-                                 @RequestBody OlderVO vo){
-        try {
-            if(this.pinanbaoOlderService.updateMyOlder(vo)){
-                return  Result.success("修改成功！");
-            } else {
-                return Result.error("修改失败！");
-            }
-
-        }catch (BDException e) {
-            log.error("修改被监护人-出现异常",e);
-            return Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("被监护人: 修改被监护人出现异常",e);
-            return Result.error("修改失败！");
-        }
-    }
-
-    @DeleteMapping("/my/delete/{olderId}")
-    @ApiOperation(tags = {"我的被监护人"},value = "删除被监护人 -- 二期新增")
-    public Result<Object> deleteMyOlder(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @PathVariable("olderId") Long olderId) {
-        try {
-            this.pinanbaoOlderService.deleteById(olderId);
-            return Result.success("删除成功！");
-        } catch (Exception e) {
-            log.error("被监护人: 删除被监护人出现异常", e);
-            return Result.error("删除失败！");
-        }
-    }
-}

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

@@ -1,193 +0,0 @@
-package com.care.client.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.care.client.service.PassportService;
-import com.care.client.vo.MemberInitParams;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.service.SmsSendService;
-import com.care.common.util.CheckUtils;
-import com.care.common.util.JwtUtils;
-import com.care.common.util.Result;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import io.swagger.annotations.*;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-@Api(tags = "登录")
-@RestController
-@RequestMapping("/pinanbao")
-public class PassportController {
-
-    @Resource
-    private PassportService passportService;
-    @Resource
-    private SmsSendService smsSendService;
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-
-    public final Cache<String, String> smsTimeoutCache = CacheBuilder.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).build();
-
-    @ApiOperation(value = "小程序登录", notes = "小程序授权登录,微信登录传参：loginType=wx，code; 密码登录：loginType=pwd， phone， password")
-    @ApiParam(name = "params", value = "登录参数")
-    @PostMapping("login")
-    public Result<Object> login(@RequestBody MemberInitParams params) {
-        CheckUtils.valueIsNull(params, "loginType");
-
-        if ("wx".equalsIgnoreCase(params.getLoginType())) {
-            CheckUtils.valueIsNull(params, "code");
-        } else if ("pwd".equalsIgnoreCase(params.getLoginType())) {
-            if (StringUtils.isBlank(params.getPhone())) {
-                return Result.error("请输入手机号码");
-            }
-            if (StringUtils.isBlank(params.getPassword())) {
-                return Result.error("请输入密码");
-            }
-        }
-        return passportService.login(params);
-    }
-
-
-    @ApiOperation(value = "小程序登录", notes = "微信登录解密手机号")
-    @PostMapping("decodePhoneNumber")
-    public Result<Object> decodePhoneNumber(@RequestBody Map<String,String> body) {
-        return passportService.decodePhoneNumber(body.get("code"),body.get("encryptedData"),body.get("iv"));
-    }
-
-    @ApiOperation(value = "新用户注册", notes = "新用户注册")
-    @GetMapping("registerPhone")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "phone", value = "电话号码"),
-            @ApiImplicitParam(paramType = "query", name = "vcode", value = "验证码"),
-            @ApiImplicitParam(paramType = "query", name = "password", value = "密码 "),
-    })
-    public Result<Object> registerPhone(@RequestHeader(value = "token") String token,
-                                        @RequestParam(value = "phone", required = true) String phone,
-                                        @RequestParam(value = "vcode", required = true) String vcode,
-                                        @RequestParam(value = "password", required = true) String password) {
-
-        if (StringUtils.isBlank(phone)) {
-            return Result.error("请输入手机号");
-        }
-        if(careMemberInfoService.detailByPhone(phone) != null){
-            return Result.error("该账号已经注册");
-        }
-        if (!StringUtils.equalsIgnoreCase(vcode, smsTimeoutCache.getIfPresent(phone))) {
-            return Result.error("请输入正确的验证码");
-        }
-        if (StringUtils.isBlank(password)) {
-            return Result.error("请输入密码");
-        }
-        if (StringUtils.isNotBlank(phone) && StringUtils.isNotBlank(password)) {
-            CareMemberInfo careMemberInfo = new CareMemberInfo();
-            careMemberInfo.setPhone(phone);
-            careMemberInfo.setPassword(DigestUtils.md5Hex(password));
-            careMemberInfo.setCreateTime(DateUtil.date());
-            boolean flag = careMemberInfoService.save(careMemberInfo);
-            if (flag) {
-                return Result.success();
-            }
-        }
-        return Result.error("注册失败");
-    }
-
-    @ApiOperation(value = " 获取验证码", notes = "获取验证码")
-    @GetMapping("getVCode")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "phone", value = "电话号码"),
-            @ApiImplicitParam(paramType = "query", name = "type", value = "类型：1手机号注册，2密码重置，3修改注册手机号"),
-    })
-    public Result<String> getVCode(@RequestParam(value = "phone", required = true) String phone,
-                                   @RequestParam(value = "type", required = true) String type) {
-
-        String vcode = String.format("%04d",new Random().nextInt(9999));
-        boolean flag = false;
-        if("1".equals(type)){
-            if(careMemberInfoService.detailByPhone(phone) != null){
-                return Result.error("该手机号已经注册");
-            }
-            flag = smsSendService.sendSmsCode4RegisterPhone(phone, vcode);
-        } else if("2".equals(type)){
-            flag = smsSendService.sendSmsCode4ModifyPassword(phone, vcode);
-        } else if("3".equals(type)){
-            flag = smsSendService.sendSmsCode4ModifyPhone(phone, vcode);
-        }
-
-        if (flag) {
-            smsTimeoutCache.put(phone, vcode);
-            return Result.success();
-        } else {
-            return Result.error("获取验证码失败");
-        }
-    }
-
-    @ApiOperation(value = "校验验证码", notes = "校验验证码")
-    @GetMapping("checkVCode")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "phone", value = "电话号码"),
-    })
-    public Result<String> checkVCode(@RequestParam(value = "phone", required = true) String phone,
-                                     @RequestParam(value = "vcode", required = true) String vcode) {
-        if(StringUtils.equalsIgnoreCase(vcode, smsTimeoutCache.getIfPresent(phone))){
-            return Result.success();
-        } else {
-            return Result.error("请输入正确的验证码");
-        }
-
-    }
-
-    @ApiOperation(value = "设置新密码", notes = "设置新密码, 传值：手机号，密码，确认密码，验证码")
-    @ApiParam(name = "params", value = "登录参数")
-    @PostMapping("changePwd")
-    public Result<Object> changePwd(@RequestBody MemberInitParams params) {
-
-        if (StringUtils.isBlank(params.getPhone())) {
-            return Result.error("手机号码不能为空");
-        }
-        if (StringUtils.isBlank(params.getPassword())) {
-            return Result.error("请输入密码");
-        }
-        if (StringUtils.isBlank(params.getPasswordAgain())) {
-            return Result.error("请再次输入密码");
-        }
-        if (!params.getPassword().equals(params.getPasswordAgain())) {
-            return Result.error("两次输入密码不一致");
-        }
-        if (StringUtils.isBlank(params.getVcode())) {
-            return Result.error("验证码不能为空");
-        }
-        if (!StringUtils.equalsIgnoreCase(params.getVcode(), smsTimeoutCache.getIfPresent(params.getPhone()))) {
-            return Result.error("验证码无效");
-        }
-        CareMemberInfo careMemberInfo = careMemberInfoService.detailByPhone(params.getPhone());
-        if (careMemberInfo == null) {
-            return Result.error("该手机号未注册");
-        }
-
-        boolean flag = passportService.changePwd(params.getPassword(), careMemberInfo.getId());
-        if (flag) {
-            return Result.success();
-        }
-
-        return Result.error("设置新密码失败");
-    }
-
-
-    @ApiOperation(value = "小程序登出", notes = "小程序登出")
-    @PostMapping("logout")
-    public Result<Object>  logout(@RequestHeader String token) {
-        passportService.logout(token);
-        return Result.success();
-    }
-
-
-
-}

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

@@ -1,92 +0,0 @@
-package com.care.client.controller;
-
-import com.care.common.service.WxTemplateService;
-import com.care.client.dto.TemplateDataDTO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Api(tags = "模板测试")
-@RestController
-@RequestMapping("/wxtemplate")
-@Slf4j
-public class TestWxController {
-
-    @Resource
-    private WxTemplateService wxTemplateService;
-
-    @ApiOperation(value = "模板测试", notes = "消息发送")
-    @GetMapping("send")
-    public void test(@RequestParam("openId") String openId, @RequestParam("templateId") String templateId) {
-
-
-//        WxAccessTokenVO wxda02870032b8f928 = WxTemplateUtil.getAccessToken("wxda02870032b8f928", "5984b6cf5dad4693eb60cbc494d9f385");
-//        System.out.println();
-
-//        WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
-
-        // 获取accessToken
-//        WxAccessTokenVO wxAccessTokenVO = WxTemplateUtil.getAccessToken(wxConfig.getAppId(), wxConfig.getSecret());
-//        WxAccessTokenVO wxAccessTokenVO = WxTemplateUtil.getAccessToken("wxf393853ab94c853f", "f3fc21fee8de01d79ded7f799a4d2d4d");
-//        WxAccessTokenVO wxAccessTokenVO = new WxAccessTokenVO();
-//        wxAccessTokenVO.setAccessToken("50_hMKs4nHb0yvJwhfByWRc01Zq_ksQ34mfWHwHkymrT560MuDcW8DMuRTKTa5QjH06ZL-slBSGqKR42R7cPWsFoy6u7wlkpEDQgjG-Hv0YG9GA3FEZRMUsd-Zy0ePKCN06Ur2uNrzNPkdefA6tSEKjADAVHN");
-//        wxAccessTokenVO.setExpiresIn(7200);
-
-//        WxAccessTokenVO wxAccessTokenVO = new WxAccessTokenVO();
-//        if (redisUtil.hasKey(RedisKeyConstant.YUANSERVICE_ACCESSTOKEN + "y")) {
-//            wxAccessTokenVO.setAccessToken(ObjectUtils.toString(redisUtil.get(RedisKeyConstant.YUANSERVICE_ACCESSTOKEN)));
-//        } else {
-//            wxAccessTokenVO = WxTemplateUtil.getAccessToken("wxf393853ab94c853f", "f3fc21fee8de01d79ded7f799a4d2d4d");
-//            wxAccessTokenVO = WxTemplateUtil.getAccessToken("wxd735a330f9387639", "f0b4652c392b7cae457fe9d986115052");
-//            if (wxAccessTokenVO == null || StringUtils.isBlank(wxAccessTokenVO.getAccessToken())) {
-//                return;
-//            }
-//            redisUtil.set(RedisKeyConstant.YUANSERVICE_ACCESSTOKEN, wxAccessTokenVO.getAccessToken(),60 * 100);
-//        }
-//        WxTemplateUtil.getUserOpenIdList(wxAccessTokenVO.getAccessToken(), "oAIrY6RoG56fKOZZD6auXgdheV_Y");
-
-//        System.out.println("token: " + wxAccessTokenVO.getAccessToken());
-
-        // 消息模板对象
-//        WxTemplateDTO wxTemplateDTO = new WxTemplateDTO();
-        // 时间格式转换
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        // 用户openIdopenid ->
-//        wxTemplateDTO.setTouser("oAIrY6RoG56fKOZZD6auXgdheV_Y");
-//        self
-//        wxTemplateDTO.setTouser("oAIrY6ci3o4O_HtGGKzVj495vV7M");
-//        wxTemplateDTO.setTouser("oAvJS6tYkZCwm6xC8m6uqW-UjBGc");
-        // 模板ID
-//        wxTemplateDTO.setTemplate_id("1M1kDRDW-kMSoOzmv9cP-SImD1kXWtezwyWe8euUJIc");
-//        wxTemplateDTO.setTemplate_id("S86r6mkzaKIv-m9HndhFgCmyCrrv9Uw87_5THakYCkQ");
-        // 跳转页面设置（仅限上线后的小程序，测试时可以忽略此属性）
-//        wxTemplateDTO.setPage("pages/index/index");
-
-        Map<String, TemplateDataDTO> data = new HashMap<>();
-        data.put("first", new TemplateDataDTO("您关联的与安宝设备上传一条安全事件", "#ff5200"));
-        data.put("keyword1", new TemplateDataDTO("跌倒报警", "#000000"));
-        data.put("keyword2", new TemplateDataDTO(simpleDateFormat.format(new Date()), "#000000"));
-        data.put("keyword3", new TemplateDataDTO("北京市丰台区金桥东街6号 顶秀金石家园1号楼1单元111室", "#000000"));
-        data.put("remark", new TemplateDataDTO("请尽快联系您的被监护人, 确认现场情况", "#ff5200"));
-        // 模板内容
-//        wxTemplateDTO.setData(data);
-
-        // 发送消息模板
-//        boolean flag = wxTemplateService.sendTemplateMsg("oyVYT6Ox9b88n_33lgKWRj5uFbUY", "S86r6mkzaKIv-m9HndhFgCmyCrrv9Uw87_5THakYCkQ", data);
-        boolean flag = wxTemplateService.sendTemplateMsg(openId, templateId, "wxda02870032b8f928", "/page/index/index", data);
-        log.info("发送消息模板: openId: " + openId + ", templateId: " + templateId + " 状态: " + flag);
-
-    }
-
-}

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

@@ -1,330 +0,0 @@
-package com.care.client.controller;
-
-import cn.hutool.core.util.XmlUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.care.client.dto.TemplateDataDTO;
-import com.care.client.service.PinanbaoContactService;
-import com.care.client.vo.HouseContactVO;
-import com.care.client.vo.WxAccessTokenVO;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.entity.CareDevice;
-import com.care.common.entity.CareHouseContact;
-import com.care.common.service.CareDeviceService;
-import com.care.common.service.CareHouseContactService;
-import com.care.common.service.WxQrCodeService;
-import com.care.common.service.WxTemplateService;
-import com.care.common.util.CheckoutUtil;
-import com.care.common.util.MessageUtil;
-import com.care.common.util.WxTemplateUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-@Controller
-@RequestMapping("/wxmsg")
-@Slf4j
-public class WxMsgController {
-
-//    @Resource
-//    private CareOfficialMemberInfoService careOfficialMemberInfoService;
-
-//    @Resource
-//    private CareMemberInfoService careMemberInfoService;
-
-    @Resource
-    private WxTemplateService wxService;
-
-    @Resource
-    private PinanbaoContactService pinanbaoContactService;
-
-    @Resource
-    private WxTemplateService wxTemplateService;
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    @Resource
-    private CareDeviceService careDeviceService;
-
-    @Resource
-    private WxQrCodeService wxQrCodeService;
-
-    /**
-     * 微信消息接收和token验证
-     * @param request
-     * @param response
-     * @throws IOException
-     */
-        @RequestMapping(value="/checkToken",method= RequestMethod.GET)
-    public void weChat(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        log.info("校验wxToken 开始");
-        boolean isGet = request.getMethod().toLowerCase().equals("get");
-        if (isGet) {
-            // 微信加密签名
-            String signature = request.getParameter("signature");
-            // 时间戳
-            String timestamp = request.getParameter("timestamp");
-            // 随机数
-            String nonce = request.getParameter("nonce");
-            // 随机字符串
-            String echostr = request.getParameter("echostr");
-            log.info("校验wxToken signature: " + signature);
-            // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
-            if (signature != null && CheckoutUtil.checkSignature(signature, timestamp, nonce)) {
-                try {
-                    boolean flag = CheckoutUtil.checkSignature(signature, timestamp, nonce);
-                    System.out.println(flag);
-                    PrintWriter print = response.getWriter();
-                    print.write(echostr);
-                    System.out.println(echostr);
-                    print.flush();
-                    print.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    @RequestMapping(value="/checkToken",method=RequestMethod.POST)
-    @ResponseBody
-    public String  responseEvent(HttpServletRequest req, HttpServletResponse resp)throws IOException {
-        req.setCharacterEncoding("UTF-8");
-        resp.setCharacterEncoding("UTF-8");
-        String message = "success";
-        try {
-//            WxAccessTokenVO wxAccessTokenVO = wxService.processAccessToken();
-            WxAccessTokenVO wxAccessTokenVO = wxQrCodeService.processOfficialToken();
-            if (wxAccessTokenVO == null) {
-                return "failure";
-            }
-            // 读取输入流
-            Document document = XmlUtil.readXML(req.getInputStream());
-            // 得到xml根元素
-            Element element = document.getDocumentElement();
-            //把微信返回的xml信息转义成map
-            Map<String, Object> map = XmlUtil.xmlToMap(element);
-            System.out.println("微信接收到的消息为:"+map.toString());
-            String fromUserName = ObjectUtils.toString(map.get("FromUserName"));//消息来源用户标识
-            String msgType = ObjectUtils.toString(map.get("MsgType"));//消息类型(event或者text)
-            String eventType = ObjectUtils.toString(map.get("Event"));//事件类型
-//            String nickName = getUserNickName(fromUserName);
-            if(MessageUtil.MSGTYPE_EVENT.equals(msgType)){//如果为事件类型
-                if(MessageUtil.SCAN_EVENT.equalsIgnoreCase(eventType)) {// 扫描事件
-                    JSONObject parseUnionObject = WxTemplateUtil.parseWxOpenIdBySubscribe(wxAccessTokenVO.getAccessToken(), fromUserName);
-                    System.out.println("scan parseUnionObject:" + parseUnionObject.toString());
-
-                    String eventKey = ObjectUtils.toString(map.get("EventKey"));
-                    Object obj = redisUtil.get(RedisKeyConstant.YUANSERVICE_QRCODE + ":" + eventKey);
-                    log.info("用户扫描: " + fromUserName + ": " + ObjectUtils.toString(map.get("EventKey")));
-                    if (obj == null) {
-                        return "failure";
-                    }
-                    String[] arrs = Objects.toString(obj).split(":");
-                    if (arrs == null || arrs.length != 2) {
-                        return "failure";
-                    }
-                    CareDevice careDevice = careDeviceService.getById(arrs[0]);
-                    if (careDevice == null) {
-                        log.info("设备不存在: " + arrs[0]);
-                        return "failure";
-                    }
-                    if (parseUnionObject != null) {
-                        HouseContactVO houseContactVO = new HouseContactVO();
-                        houseContactVO.setContactName(parseUnionObject.getStr("nickname"));
-                        houseContactVO.setCreateTime(new Date());
-                        String gender = "";
-                        if ("0".equalsIgnoreCase(parseUnionObject.getStr("sex"))) {
-                            gender = "M";
-                        } else if ("1".equalsIgnoreCase(parseUnionObject.getStr("sex"))) {
-                            gender = "W";
-                        }
-                        houseContactVO.setGender(gender);
-                        houseContactVO.setOpenId(fromUserName);
-                        houseContactVO.setMemberId(NumberUtils.toLong(arrs[1]));
-                        boolean saved = pinanbaoContactService.createOrUpdateMyContact(NumberUtils.toLong(arrs[0]), houseContactVO);
-                        if (!saved) {
-                            log.error("保存订阅用户出现错误: " + JSONUtil.toJsonStr(houseContactVO));
-                            return "failure";
-                        }
-
-                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        // 正式环境
-                        String templateId = "W7tT8QGmrBQNVimt6l6w55DBwSH5MBUiFgJxf3gjIV4";
-                        // 测试环境
-//                        String templateId = "gvJ1g3JOThT5IuQc1In6D2cwKwmKz9MBIkGdkXtXOTI";
-
-                        Map<String, TemplateDataDTO> data = new HashMap<>();
-                        data.put("first", new TemplateDataDTO("您已关联该监护人", "#459ae9"));
-                        data.put("keyword1", new TemplateDataDTO(careDevice.getDevName(), "#459ae9"));
-                        data.put("keyword2", new TemplateDataDTO(simpleDateFormat.format(new Date()), "#459ae9"));
-                        data.put("remark", new TemplateDataDTO("请补全您的联系信息, 便于能及时收到事件通知", "#459ae9"));
-
-                        String openId = fromUserName;
-                        log.info("生成小程序跳转URL: " + "pages/supplement/index?memberId=" + arrs[1] + "&openId=" + fromUserName);
-                        boolean flag = wxTemplateService.sendTemplateMsgOriginal(openId, templateId, "wxda02870032b8f928", "pages/supplement/index?memberId=" + arrs[1] + "&openId=" + openId, data);
-                        log.info("发送消息模板: openId: " + openId + ", templateId: " + templateId + " 状态: " + flag);
-
-                        return "success";
-                    }
-
-                } else if (MessageUtil.SUBSCIBE_EVENT.equals(eventType)) {//处理订阅事件
-                    JSONObject parseUnionObject = WxTemplateUtil.parseWxOpenIdBySubscribe(wxAccessTokenVO.getAccessToken(), fromUserName);
-                    System.out.println("subscibe parseUnionObject:" + parseUnionObject.toString());
-//                    parseUnionObject.set("unionid", "oyVYT6Ox9b88n_33lgKWRj5uFbUY");
-
-                    String eventKey = ObjectUtils.toString(map.get("EventKey"));
-                    if (StringUtils.isNotBlank(eventKey) && eventKey.indexOf("_") != -1) {
-                        eventKey = StringUtils.substring(eventKey, eventKey.indexOf("_") + 1);
-                    }
-                    Object obj = redisUtil.get(RedisKeyConstant.YUANSERVICE_QRCODE + ":" + eventKey);
-                    log.info("新用户关注: " + fromUserName + ": " + ObjectUtils.toString(map.get("EventKey")));
-                    if (obj == null) {
-                        return "failure";
-                    }
-
-                    String[] arrs = Objects.toString(obj).split(":");
-                    if (arrs == null || arrs.length != 2) {
-                        return "failure";
-                    }
-                    CareDevice careDevice = careDeviceService.getById(arrs[0]);
-                    if (careDevice == null) {
-                        log.info("设备不存在: " + arrs[0]);
-                        return "failure";
-                    }
-
-                    if (parseUnionObject != null) {
-//                        CareOfficialMemberInfo careOfficialMemberInfo = new CareOfficialMemberInfo();
-//                        careOfficialMemberInfo.setNickname(parseUnionObject.getStr("nickname"));
-//                        careOfficialMemberInfo.setOpenId(fromUserName);
-//                        careOfficialMemberInfo.setProfile(parseUnionObject.getStr("headimgurl"));
-//                        careOfficialMemberInfo.setUnionId(parseUnionObject.getStr("unionid"));
-//                        careOfficialMemberInfo.setSubscribeStatus(1);
-//                        careOfficialMemberInfo.setCreateTime(new Date());
-//                        boolean subscribed = careOfficialMemberInfoService.subscribe(careOfficialMemberInfo);
-//                        if (subscribed) {
-//                            return "success";
-//                        } else {
-//                            return "failure";
-//                        }
-                        HouseContactVO houseContactVO = new HouseContactVO();
-                        houseContactVO.setContactName(parseUnionObject.getStr("nickname"));
-                        houseContactVO.setCreateTime(new Date());
-                        String gender = "";
-                        if ("0".equalsIgnoreCase(parseUnionObject.getStr("sex"))) {
-                            gender = "M";
-                        } else if ("1".equalsIgnoreCase(parseUnionObject.getStr("sex"))) {
-                            gender = "W";
-                        }
-                        houseContactVO.setGender(gender);
-                        houseContactVO.setOpenId(fromUserName);
-                        houseContactVO.setMemberId(NumberUtils.toLong(arrs[1]));
-                        boolean saved = pinanbaoContactService.createOrUpdateMyContact(NumberUtils.toLong(arrs[0]), houseContactVO);
-                        if (!saved) {
-                            log.error("保存订阅用户出现错误: " + JSONUtil.toJsonStr(houseContactVO));
-                            return "failure";
-                        }
-
-                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        // 正式环境
-                        String templateId = "W7tT8QGmrBQNVimt6l6w55DBwSH5MBUiFgJxf3gjIV4";
-                        // 测试环境
-//                        String templateId = "gvJ1g3JOThT5IuQc1In6D2cwKwmKz9MBIkGdkXtXOTI";
-
-                        Map<String, TemplateDataDTO> data = new HashMap<>();
-                        data.put("first", new TemplateDataDTO("您已关联该监护人", "#459ae9"));
-                        data.put("keyword1", new TemplateDataDTO(careDevice.getDevName(), "#459ae9"));
-                        data.put("keyword2", new TemplateDataDTO(simpleDateFormat.format(new Date()), "#459ae9"));
-                        data.put("remark", new TemplateDataDTO("请补全您的联系信息, 便于能及时收到事件通知", "#459ae9"));
-
-                        String openId = fromUserName;
-                        log.info("生成小程序跳转URL: " + "pages/supplement/index?memberId=" + arrs[1] + "&openId=" + fromUserName);
-                        boolean flag = wxTemplateService.sendTemplateMsgOriginal(openId, templateId, "wxda02870032b8f928", "pages/supplement/index?memberId=" + arrs[1] + "&openId=" + openId, data);
-                        log.info("发送消息模板: openId: " + openId + ", templateId: " + templateId + " 状态: " + flag);
-
-//                        String eventKey = ObjectUtils.toString(map.get("EventKey"));
-//                        if (StringUtils.isNotBlank(eventKey) && eventKey.indexOf("_") != -1) {
-//                            eventKey = StringUtils.substring(eventKey, eventKey.indexOf("_") + 1);
-//                        }
-//                        Object obj = redisUtil.get(RedisKeyConstant.YUANSERVICE_QRCODE + ":" + eventKey);
-//                        if (obj == null) {
-//                            return "failure";
-//                        }
-
-//                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//                        String templateId = "OPENTM418029089";
-//
-//                        Map<String, TemplateDataDTO> data = new HashMap<>();
-//                        data.put("first", new TemplateDataDTO("您已成功关联该设备", "#ff5200"));
-//                        data.put("keyword1", new TemplateDataDTO("跌倒报警", "#000000"));
-//                        data.put("keyword2", new TemplateDataDTO(simpleDateFormat.format(new Date()), "#000000"));
-//                        data.put("remark", new TemplateDataDTO("请尽快补全您的联系信息, 便于能及时通知您", "#ff5200"));
-//
-//                        String openId = parseUnionObject.getStr("openid");
-//                        boolean flag = wxTemplateService.sendTemplateMsg(parseUnionObject.getStr("openid"), templateId, "wxda02870032b8f928", "pages/supplement/index", data);
-//                        log.info("发送消息模板: openId: " + openId + ", templateId: " + templateId + " 状态: " + flag);
-
-//                        careHouseContactService.save();
-                        return "success";
-                    }
-                } else if (MessageUtil.UNSUBSCIBE_EVENT.equals(eventType)) {//处理取消订阅事件
-                    System.out.println("事件类型为:"+eventType);
-//                    JSONObject parseUnionObject = WxTemplateUtil.parseWxOpenIdBySubscribe(wxAccessTokenVO.getAccessToken(), fromUserName);
-//                    if (parseUnionObject != null && parseUnionObject.containsKey("unionid")) {
-//                        boolean updated = careOfficialMemberInfoService.cancelSubscribe(parseUnionObject.getStr("unionid"));
-//                        if (updated) {
-//                            return "success";
-//                        } else {
-//                            return "failure";
-//                        }
-//                    }
-                    return "success";
-//                    message = MessageUtil.unsubscribe(toUserName, fromUserName);
-                }
-            }else {
-//                //微信消息分为事件推送消息和普通消息,非事件即为普通消息类型
-//                switch (msgType) {
-//                    case "text":{//文本消息
-//                        String content = map.get("Content");//用户发的消息内容
-//                        content = "您发的消息内容是:"+content+",如需帮助,请联系";
-//                        message = MessageUtil.replyMsg(toUserName, fromUserName,content,"text");
-//                        break;
-//                    }
-//                    case "image":{//图片消息
-//                        String content = "您发的消息内容是图片,如需帮助,请联系";
-//                        message = MessageUtil.replyMsg(toUserName, fromUserName,content,"text");
-//                        break;
-//                    }
-//                    default:{//其他类型的普通消息
-//                        break;
-//                    }
-//                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("关注微信公众号自动回复的消息内容为:" + message);
-        return message;
-    }
-
-}

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

@@ -1,37 +0,0 @@
-package com.care.client.controller;
-
-import com.care.common.service.WxQrCodeService;
-import com.care.common.util.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-@RestController
-@RequestMapping("/pinanbao/wx/qrcode")
-@Slf4j
-public class WxQrCodeController {
-
-    @Resource
-    private WxQrCodeService wxQrCodeService;
-
-//    @ApiOperation(tags = { "事件处理" },value = "某个事件的详细处理记录  -- 二期修改")
-    @GetMapping("/gen")
-    public Result weChat(HttpServletRequest request,
-//                       @RequestParam("orgId") Long orgId,
-//                       @RequestParam("stationId") Long stationId,
-                         @RequestParam("deviceId") Long deviceId,
-                         @RequestParam("memberId") Long memberId
-                       ) throws Exception {
-
-        String sceneId = deviceId + ":" + memberId;
-        String url = wxQrCodeService.genWxQrcodeUrl(sceneId);
-        return Result.success("查询成功！", url);
-    }
-
-
-}

src/main/java/com/care/client/dto/MpTemplateMsgDTO.java

@@ -1,25 +0,0 @@
-package com.care.client.dto;
-
-import lombok.Data;
-
-import java.util.Map;
-
-@Data
-public class MpTemplateMsgDTO {
-
-    /** 公众号appid，要求与小程序有绑定且同主体 */
-    private String appid;
-
-    /** 公众号模板id */
-    private String template_id;
-
-    /** 公众号模板消息所要跳转的url */
-    private String url;
-
-    /** 公众号模板消息所要跳转的小程序，小程序的必须与公众号具有绑定关系 */
-    private Map<String, String> miniprogram;
-
-    /** 模板内容，不填则下发空模板（必填） */
-    private Map<String, TemplateDataDTO> data;
-
-}

src/main/java/com/care/client/dto/MpTemplateMsgOriginalDTO.java

@@ -1,27 +0,0 @@
-package com.care.client.dto;
-
-import lombok.Data;
-
-import java.util.Map;
-
-@Data
-public class MpTemplateMsgOriginalDTO {
-
-    /** 公众号appid，要求与小程序有绑定且同主体 */
-    private String appid;
-
-    /** 公众号模板id */
-    private String template_id;
-
-    /** 公众号模板消息所要跳转的url */
-    private String url;
-
-    private String touser;
-
-    /** 公众号模板消息所要跳转的小程序，小程序的必须与公众号具有绑定关系 */
-    private Map<String, String> miniprogram;
-
-    /** 模板内容，不填则下发空模板（必填） */
-    private Map<String, TemplateDataDTO> data;
-
-}

src/main/java/com/care/client/dto/TemplateDataDTO.java

@@ -1,34 +0,0 @@
-package com.care.client.dto;
-
-/**
- * 消息模板内容，字体大小，颜色可配置
- */
-public class TemplateDataDTO {
-
-    /** 模板内容字体的颜色，不填默认黑色.*/
-    private String color;
-
-    /** 模板需要放大的关键词，不填则默认无放大.*/
-    private String value;
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public TemplateDataDTO(String value, String color) {
-        this.value = value;
-        this.color = color;
-    }
-}

src/main/java/com/care/client/dto/WxTemplateDTO.java

@@ -1,53 +0,0 @@
-package com.care.client.dto;
-
-import java.util.Map;
-
-/**
- * 消息模板基本属性封装，参数命名风格需参照微信参数定义
- */
-public class WxTemplateDTO {
-
-    /** 模板消息ID（必填）.*/
-    private String template_id;
-
-    /** 接收者（用户）的 openid(必填).*/
-    private String touser;
-
-    /** 点击模板卡片后的跳转页面.*/
-    private String page;
-
-    /** 模板内容，不填则下发空模板（必填）.*/
-    private Map<String, TemplateDataDTO> data;
-
-    public String getTemplate_id() {
-        return template_id;
-    }
-
-    public void setTemplate_id(String template_id) {
-        this.template_id = template_id;
-    }
-
-    public String getTouser() {
-        return touser;
-    }
-
-    public void setTouser(String touser) {
-        this.touser = touser;
-    }
-
-    public String getPage() {
-        return page;
-    }
-
-    public void setPage(String page) {
-        this.page = page;
-    }
-
-    public Map<String, TemplateDataDTO> getData() {
-        return data;
-    }
-
-    public void setData(Map<String, TemplateDataDTO> data) {
-        this.data = data;
-    }
-}

src/main/java/com/care/client/dto/WxUniformTemplateDTO.java

@@ -1,17 +0,0 @@
-package com.care.client.dto;
-
-import lombok.Data;
-
-/**
- * 消息模板基本属性封装，参数命名风格需参照微信参数定义
- */
-@Data
-public class WxUniformTemplateDTO {
-
-    /** 接收者（用户）的 openid(必填).*/
-    private String touser;
-
-    /** 公众号配置 */
-    private MpTemplateMsgDTO mp_template_msg;
-
-}

src/main/java/com/care/client/schedule/HealthDataStaSchedule.java

@@ -1,101 +0,0 @@
-package com.care.client.schedule;
-
-
-
-import com.care.common.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-
-/** 健康数据统计调度
- * @author stw
- * @version 2.7.0.0 创建于 2021/11/16
- **/
-@Configuration
-@EnableScheduling
-@EnableAsync
-public class HealthDataStaSchedule {
-
-    @Autowired
-    private CareBedroomInbedHourStaService careBedroomInbedHourStaService;
-
-    @Autowired
-    private CareToiletInoutHourStaService careToiletInoutHourStaService;
-
-    @Autowired
-    private CareWalkingDistanceHourStaService careWalkingDistanceHourStaService;
-
-    @Autowired
-    private CareDevEventDayStaService careDevEventDayStaService;
-
-
-    @Autowired
-    private CareHeartBreathHourStaService careHeartBreathHourStaService;
-
-    @Autowired
-    private CareHeartBreathDetailService careHeartBreathDetailService;
-
-    /**
-     * 每小时卧室在床统计
-     * 1分钟调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeBedroomInbedHourSta() {
-        careBedroomInbedHourStaService.exeBedroomInbedHourSta();
-    }
-
-    /**
-     * 每小时进出卫生间统计
-     * 1小时调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeToiletInoutHourSta() {
-        careToiletInoutHourStaService.exeToiletInoutHourSta();
-    }
-
-    /**
-     * 每小时行走距离统计
-     * 1分钟调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeWalkingDistanceHourSta() {
-        careWalkingDistanceHourStaService.exeWalkingDistanceHourSta();
-    }
-
-    /**
-     * 每日安全事件统计
-     * 1分钟调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeDevEventDaySta() {
-        careDevEventDayStaService.exeDevEventDaySta();
-    }
-
-    /**
-     * 每小时心率呼吸统计
-     * 1分钟调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeHeartBreathHourSta() {
-        careHeartBreathHourStaService.exeHeartBreathHourSta();
-    }
-
-    /**
-     * 心率呼吸详细采样
-     * 1 分钟调用一次
-     */
-    @Async
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void exeHeartBreathDetail() {
-        careHeartBreathDetailService.exeHeartBreathDetail();
-    }
-}

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

@@ -1,99 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.SecureUtil;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.care.client.vo.MemberInfoVO;
-import com.care.client.vo.MemberInitParams;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.enums.ValidStatusEnum;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.util.Result;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class AbstractPassportService {
-
-    @Resource
-    private RedisUtil redisUtil;
-
-
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-
-    public Result<Object> cache(MemberInitParams params) {
-        String token = IdUtil.fastUUID();
-        // cache member
-        CareMemberInfo member = null;
-
-        if ("wx".equalsIgnoreCase(params.getLoginType())) {
-            member = careMemberInfoService.detailByOpenid(params.getOpenid());
-            if (member == null) {
-                member = careMemberInfoService.detailByPhone(params.getPhone());
-                if (member == null) {
-                    return Result.error("账号不存在！");
-                }
-            }
-            if (ValidStatusEnum.INVALID.getValue().equals(member.getStatus())){
-                return Result.error("用户已经停用");
-            }
-        } else if ("pwd".equalsIgnoreCase(params.getLoginType())) {
-            member = careMemberInfoService.detailByPhone(params.getPhone());
-            if (member == null) {
-                return Result.error("账号不存在");
-            }
-            if (ValidStatusEnum.INVALID.getValue().equals(member.getStatus())){
-                return Result.error("用户已经停用");
-            }
-            if (!StrUtil.equalsIgnoreCase(SecureUtil.md5(params.getPassword()), member.getPassword())) {
-                return Result.error("账号密码不匹配");
-            }
-
-        }
-        if (StringUtils.isBlank(member.getOpenId()) && StringUtils.isNotBlank(params.getOpenid())) {
-            UpdateWrapper<CareMemberInfo> careMemberInfoUpdateWrapper = new UpdateWrapper<>();
-            careMemberInfoUpdateWrapper.lambda().eq(CareMemberInfo::getId,member.getId()).set(CareMemberInfo::getOpenId,params.getOpenid());
-            boolean bindFlag = this.careMemberInfoService.update(careMemberInfoUpdateWrapper);
-            if (bindFlag) {
-                member.setOpenId(params.getOpenid());
-            }
-        }
-        MemberInfoVO memberInfoVO = new MemberInfoVO();
-        BeanUtil.copyProperties(member,memberInfoVO);
-        if (member.getBirthday()!=null){
-            memberInfoVO.setAge(DateUtil.ageOfNow(member.getBirthday()));
-        }
-        redisUtil.hset(RedisKeyConstant.PINANBAO_LOGIN_INFO, token, memberInfoVO, RedisKeyConstant.PINANBAO_LOGIN_INFO_TIME);
-
-        Map<String,Object> data = Maps.newHashMap();
-        data.put("token", token);
-        data.put("member", memberInfoVO);
-        return Result.success(data);
-    }
-
-    public MemberInfoVO refreshMember(String token) {
-        if (StrUtil.isNotBlank(token) && redisUtil.hHasKey(RedisKeyConstant.PINANBAO_LOGIN_INFO, token)) {
-            MemberInfoVO oldMemberInfoVo = (MemberInfoVO)redisUtil.hget(RedisKeyConstant.PINANBAO_LOGIN_INFO, token);
-            CareMemberInfo member = careMemberInfoService.getById(oldMemberInfoVo.getId());
-            if (oldMemberInfoVo != null && member != null) {
-                MemberInfoVO memberInfoVO = new MemberInfoVO();
-                BeanUtil.copyProperties(member,memberInfoVO);
-                redisUtil.hset(RedisKeyConstant.PINANBAO_LOGIN_INFO, token, memberInfoVO, RedisKeyConstant.PINANBAO_LOGIN_INFO_TIME);
-                return memberInfoVO;
-            }
-        }
-        return null;
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.care.client.service;
-
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.stereotype.Service;
-
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Slf4j
-@Service
-public class HealthDataStaService {
-
-
-}

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

@@ -1,147 +0,0 @@
-package com.care.client.service;
-
-
-import com.care.client.vo.MemberInfoVO;
-import com.care.client.vo.MemberInitParams;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.enums.ValidStatusEnum;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.util.CheckUtils;
-import com.care.common.util.Result;
-import com.care.common.util.WxUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-@Slf4j
-@Service
-public class PassportService extends AbstractPassportService {
-
-    @Resource
-    private RedisUtil redisUtil;
-    @Resource
-    private WxPassportService wxPassportService;
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-
-
-
-    public Result<Object> login(MemberInitParams params) {
-
-        if ("wx".equalsIgnoreCase(params.getLoginType())) {
-            CheckUtils.valueIsNull(params, "code");
-            CareMemberInfo  careMemberInfo = wxPassportService.login(params);
-
-            if(careMemberInfo != null){
-                if (ValidStatusEnum.INVALID.getValue().equals(careMemberInfo.getStatus())){
-                    return Result.error("用户已经停用");
-                }
-                params.setPhone(careMemberInfo.getPhone());
-                params.setOpenid(careMemberInfo.getOpenId());
-                return cache(params);
-            } else {
-                return Result.success();
-            }
-
-        } else if ("pwd".equalsIgnoreCase(params.getLoginType())) {
-            CheckUtils.valueIsNull(params, "phone");
-            CheckUtils.valueIsNull(params, "password");
-            return cache(params);
-        }
-        return Result.error();
-    }
-
-    public void logout(String token) {
-        CheckUtils.notNull(token, "token");
-        MemberInfoVO memberInfoVO = (MemberInfoVO) redisUtil.hget(RedisKeyConstant.PINANBAO_LOGIN_INFO, token);
-        if (memberInfoVO != null) {
-            redisUtil.hset(RedisKeyConstant.PINANBAO_LOGIN_INFO, token, null);
-        }
-    }
-
-    public MemberInfoVO checkToken(String token) {
-        CheckUtils.notNull(token, "token");
-        if (!redisUtil.hHasKey(RedisKeyConstant.PINANBAO_LOGIN_INFO, token)) {
-            throw new BDException(400002, "TOKEN WAS WRONG :[{"+token+"}]" );
-        }
-        return (MemberInfoVO) redisUtil.hget(RedisKeyConstant.PINANBAO_LOGIN_INFO, token);
-    }
-
-
-     public Boolean changePwd(String password,Long memberId) {
-         CareMemberInfo careMemberInfo = careMemberInfoService.getById(memberId);
-         careMemberInfo.setPassword(DigestUtils.md5Hex(password));
-         return careMemberInfoService.updateById(careMemberInfo);
-     }
-
-     public Result<Object> decodePhoneNumber(String code, String encryptedData,String iv) {
-         MemberInitParams params = (MemberInitParams) redisUtil.hget(RedisKeyConstant.PINANBAO_WX_LOGIN_INFO, code);
-
-         String openId = params.getOpenid();
-         if (StringUtils.isEmpty(openId)){
-             return  Result.error();
-         }
-         String unionId = params.getUnionid();
-         //判断是否注册过了
-         CareMemberInfo careMemberInfoDb = careMemberInfoService.detailByOpenid(openId);
-         if(careMemberInfoDb != null) {
-             return cache(params);
-         }
-
-         String sessionKey = params.getSessionKey();
-         log.warn("encryptedData==" + encryptedData);
-         log.warn("sessionKey==" + sessionKey);
-         log.warn("iv==" + iv);
-
-         String phone = WxUtil.getPhoneNumber(encryptedData,sessionKey,iv);
-        if (StringUtils.isEmpty(phone)) {
-            return  Result.error();
-        }
-         params.setPhone(phone);
-         CareMemberInfo member = careMemberInfoService.detailByPhone(phone);
-         if (member == null) { //注册新用户
-             CareMemberInfo careMemberInfo = new CareMemberInfo();
-             careMemberInfo.setPhone(phone);
-             careMemberInfo.setOpenId(openId);
-             careMemberInfo.setUnionId(unionId);
-
-             //前端主动获取传给后台，下面不用了
-//             String accessToken= wxPassportService.accessToken();
-//             WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
-//
-//             String infoUrl = MessageFormat.format(wxConfig.getInfoUrl(),accessToken, openId);
-//             JSONObject jsonObject = HttpUtil.httpGet(infoUrl);
-//             log.warn("-----jsonObject:[{}]", jsonObject);
-//             if(jsonObject != null){
-//                 String headimgurl = jsonObject.getStr("headimgurl");
-//                 careMemberInfo.setProfile(headimgurl);
-//                 String nickname = jsonObject.getStr("nickname");
-//                 careMemberInfo.setNickname(nickname);
-//                 int sex = jsonObject.getInt("sex");
-//                 careMemberInfo.setGender(sex == 1 ? "M" : (sex == 2 ? "W": null));
-//             }
-             careMemberInfo.setCreateTime(new Date());
-             boolean flag = careMemberInfoService.save(careMemberInfo);
-             if (flag) {
-                 return cache(params);
-             } else {
-                 return Result.error();
-             }
-         } else { //已经注册了
-             if (StringUtils.isNotBlank(openId) && StringUtils.isNotBlank(unionId)) {
-                 boolean updated = careMemberInfoService.modifyUnionId(openId, openId);
-                 if (!updated) {
-                     log.error("修改用户平台唯一标识出现错误, openId: " + openId + "; unionId: " + unionId);
-                 }
-             }
-             return cache(params);
-         }
-     }
-}

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

@@ -1,204 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.care.client.vo.DeviceVO;
-import com.care.client.vo.HouseContactVO;
-import com.care.common.entity.*;
-import com.care.common.enums.OrderStatusEnum;
-import com.care.common.enums.RelationTypeEnum;
-import com.care.common.exception.BDException;
-import com.care.common.service.*;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.compress.utils.Lists;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Slf4j
-@Service
-public class PinanbaoContactService {
-
-    @Resource
-    private CareHouseContactService careHouseContactService;
-
-    @Resource
-    private CareHouseContactRelService careHouseContactRelService;
-
-    @Resource
-    private PinanbaoDeviceService pinanbaoDeviceService;
-
-    private final Lock lock = new ReentrantLock();
-
-    /**
-     * 查询紧急联系人
-     * @param memberId
-     * @return
-     */
-    public List<HouseContactVO> queryContactByMemberId(Long memberId){
-        List<HouseContactVO> vos = Lists.newArrayList();
-        QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseContact::getMemberId, memberId)
-        .orderByAsc(CareHouseContact::getContactLevel);
-        List<CareHouseContact> contacts = this.careHouseContactService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(contacts)){
-            contacts.forEach(item -> {
-                HouseContactVO vo = new HouseContactVO();
-                BeanUtil.copyProperties(item,vo);
-                vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
-
-    /**
-     * 新增紧急联系人
-     * @param memberId
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean createMyContact(Long memberId,HouseContactVO vo){
-        //保存被监护人
-        CareHouseContact careContact = new CareHouseContact();
-        BeanUtil.copyProperties(vo,careContact);
-        careContact.setMemberId(memberId);
-        careContact.setCreateTime(new Date());
-        return this.careHouseContactService.save(careContact);
-    }
-
-    /**
-     * 查询紧急联系人
-     * @return
-     */
-    public HouseContactVO getMyContact(Long memberId, String phone, String openId) {
-        if (memberId == null) return null;
-        if (StringUtils.isBlank(phone) && StringUtils.isBlank(openId)) return null;
-        QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseContact::getMemberId, memberId).and(wrapper->
-                wrapper.eq(StringUtils.isNotBlank(phone), CareHouseContact::getContactPhone, phone)
-                        .or().eq(StringUtils.isNotBlank(openId), CareHouseContact::getOpenId, openId));
-        List<CareHouseContact> contactList = careHouseContactService.list(queryWrapper);
-
-        if (CollectionUtils.isNotEmpty(contactList)) {
-            HouseContactVO vo = new HouseContactVO();
-            BeanUtil.copyProperties(contactList.get(0), vo);
-            vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-            return vo;
-        }
-        return null;
-    }
-
-    /**
-     * 新增修改紧急联系人
-     * @param vo
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean createOrUpdateMyContact(Long devId, HouseContactVO vo) {
-        lock.lock();
-        try {
-            QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(CareHouseContact::getMemberId, vo.getMemberId()).and(wrapper->
-                    wrapper.eq(StringUtils.isNotBlank(vo.getContactPhone()), CareHouseContact::getContactPhone, vo.getContactPhone())
-                            .or().eq(StringUtils.isNotBlank(vo.getOpenId()), CareHouseContact::getOpenId, vo.getOpenId()));
-            List<CareHouseContact> contactList = careHouseContactService.list(queryWrapper);
-            if (CollectionUtils.isEmpty(contactList)) {
-                //保存被监护人
-                CareHouseContact careContact = new CareHouseContact();
-                BeanUtil.copyProperties(vo,careContact);
-                careContact.setMemberId(vo.getMemberId());
-                careContact.setCreateTime(new Date());
-                boolean saved = this.careHouseContactService.save(careContact);
-                if (saved) {
-                    boolean childSaved = pinanbaoDeviceService.bindHouseContact(devId, careContact.getId());
-                    if (childSaved == false) {
-                        throw new BDException("该设备绑定联系人出错");
-                    }
-                }
-                return saved;
-            } else {
-                //修改被监护人
-                CareHouseContact careContact = contactList.get(0);
-                careContact.setContactName(vo.getContactName());
-                careContact.setContactPhone(vo.getContactPhone());
-                careContact.setAddr(vo.getAddr());
-                careContact.setLatitude(vo.getLatitude());
-                careContact.setLongitude(vo.getLongitude());
-                careContact.setRelationType(vo.getRelationType());
-                boolean updated = this.careHouseContactService.updateById(careContact);
-
-                if (devId != null) {
-                    List<CareHouseContactRel> relVos = pinanbaoDeviceService.queryMyContactRelListByDeviceId(devId);
-                    if (updated && (relVos == null || relVos.stream().filter(v -> careContact.getId() == v.getContactId()).count() <= 0)) {
-                        boolean childSaved = pinanbaoDeviceService.bindHouseContact(devId, careContact.getId());
-                        if (childSaved == false) {
-                            throw new BDException("修改紧急联系人, 对该设备绑定联系人出错");
-                        }
-                    }
-                }
-                return updated;
-            }
-        } catch (Exception e) {
-            throw new BDException(e.getMessage());
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    /**
-     * 查询紧急联系人详情
-     * @param id
-     * @return
-     */
-    public HouseContactVO getContactInfo(Long id){
-        CareHouseContact careContact = this.careHouseContactService.getById(id);
-        HouseContactVO vo = new HouseContactVO();
-        BeanUtil.copyProperties(careContact,vo);
-        vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-        return vo;
-    }
-
-    /**
-     * 修改紧急联系人
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateMyContact(HouseContactVO vo){
-        //修改紧急联系人
-        CareHouseContact careContact = this.careHouseContactService.getById(vo.getId());
-        BeanUtil.copyProperties(vo,careContact);
-        careContact.setModifyTime(new Date());
-        return this.careHouseContactService.updateById(careContact);
-    }
-
-    /**
-     * 删除紧急联系人
-     * @param id
-     * @return
-     */
-    public boolean deleteById(Long id){
-        QueryWrapper<CareHouseContactRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseContactRel::getContactId,id);
-        careHouseContactRelService.remove(queryWrapper);
-
-        return this.careHouseContactService.removeById(id);
-    }
-
-}

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

@@ -1,97 +0,0 @@
-package com.care.client.service;
-
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.care.common.entity.CareDevice;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.enums.DeviceActiveStatusEnum;
-import com.care.common.service.CareDeviceService;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.vo.device.DeviceVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class PinanbaoDevAddService {
-
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-
-    @Resource
-    private CareDeviceService careDeviceService;
-
-    public Map<String,Boolean> checkDevCode(Long memberId , String devCode) {
-        Map<String,Boolean> map = new HashMap<>();
-
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
-        CareDevice careDevice = this.careDeviceService.getOne(queryWrapper);
-        if (careDevice == null) { //不存在
-            map.put("isExist",false);
-            return map;
-        } else if(careDevice.getMemberId() !=null && careDevice.getMemberId() != 0L && !careDevice.getMemberId().equals(memberId)) { //已经被别人绑定
-            map.put("isExist",true);
-            map.put("isOtherBind",true);
-            return map;
-        } else if(memberId.equals(careDevice.getMemberId()) && DeviceActiveStatusEnum.ACTIVE.getValue().equals(careDevice.getActiveStatus())) { //已经自己绑定，并且已经激活
-            map.put("isExist",true);
-            map.put("isOtherBind",false);
-            map.put("isSelfBind",true);
-            map.put("isActive",true);
-            return map;
-        }  else if(memberId.equals(careDevice.getMemberId()) && DeviceActiveStatusEnum.NOACTIVE.getValue().equals(careDevice.getActiveStatus())) { //已经自己绑定，并且未激活
-            map.put("isExist",true);
-            map.put("isOtherBind",false);
-            map.put("isSelfBind",true);
-            map.put("isActive",false);
-            return map;
-        }  else if((careDevice.getMemberId() == null  || careDevice.getMemberId() == 0L ) &&  DeviceActiveStatusEnum.NOACTIVE.getValue().equals(careDevice.getActiveStatus())) { //没绑定，并且未激活
-            map.put("isExist",true);
-            map.put("isOtherBind",false);
-            map.put("isSelfBind",false);
-            map.put("isActive",false);
-            return map;
-        }  else if((careDevice.getMemberId() == null  || careDevice.getMemberId() == 0L ) &&  DeviceActiveStatusEnum.ACTIVE.getValue().equals(careDevice.getActiveStatus())) { //没绑定，并且已经激活
-            map.put("isExist",true);
-            map.put("isOtherBind",false);
-            map.put("isSelfBind",false);
-            map.put("isActive",true);
-            return map;
-        }
-
-        return map;
-    }
-
-    public Boolean bindUser(String phone ,String devCode) {
-        QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareMemberInfo::getPhone,phone);
-        CareMemberInfo careMemberInfo = this.careMemberInfoService.getOne(queryWrapper);
-
-        QueryWrapper<CareDevice> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.lambda().eq(CareDevice::getDevCode,devCode);
-        CareDevice careDevice = this.careDeviceService.getOne(queryWrapper2);
-
-        careDevice.setMemberId(careMemberInfo.getId());
-        careDevice.setMemberPhone(phone);
-
-        return this.careDeviceService.updateById(careDevice);
-    }
-
-
-    public DeviceVO getDevActiveStatus(String devCode) {
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
-        CareDevice careDevice = this.careDeviceService.getOne(queryWrapper);
-        DeviceVO vo = new DeviceVO();
-        vo.setActiveStatus(careDevice.getActiveStatus());
-        vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
-        return vo;
-    }
-
-}

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

@@ -1,287 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.care.client.vo.DeviceVO;
-import com.care.client.vo.HouseContactVO;
-import com.care.client.vo.OlderVO;
-import com.care.common.entity.*;
-import com.care.common.enums.*;
-import com.care.common.service.*;
-import com.care.common.vo.station.StationVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.Lists;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Slf4j
-@Service
-public class PinanbaoDeviceService {
-
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareSysUserService careSysUserService;
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareHouseOlderRelService careHouseOlderRelService;
-    @Resource
-    private CareOlderService careOlderService;
-    @Resource
-    private CareHouseContactRelService careHouseContactRelService;
-    @Resource
-    private CareHouseContactService careHouseContactService;
-
-
-    /**
-     * 移除设备
-     * @return
-     */
-    public Boolean unBindMyDevice(Long memberId,Long devId) {
-        UpdateWrapper<CareDevice> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(CareDevice::getMemberId,memberId).eq(CareDevice::getId,devId)
-        .set(CareDevice::getMemberId,null).set(CareDevice::getMemberPhone,null);
-        return careDeviceService.update(updateWrapper);
-    }
-
-    /**
-     * 查询设备列表
-     * @param memberId
-     * @return
-     */
-    public List<DeviceVO> queryDeviceByMemberId(Long memberId){
-        List<DeviceVO> vos = Lists.newArrayList();
-        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareDevice::getMemberId, memberInfo.getId());
-        List<CareDevice> devices = this.careDeviceService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(devices)){
-            devices.forEach(item -> {
-                DeviceVO vo = new DeviceVO();
-                BeanUtil.copyProperties(item,vo);
-                vo.setDevSceneName(DeviceSceneEnum.getCodeToName(vo.getDevScene()));
-                vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
-
-    /**
-     * 新增设备
-     * @param memberId
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean createMyDevice(Long memberId,DeviceVO vo){
-        //保存被监护人
-        CareDevice careDevice = new CareDevice();
-        BeanUtil.copyProperties(vo,careDevice);
-        careDevice.setMemberId(memberId);
-        careDevice.setCreateTime(new Date());
-        return this.careDeviceService.save(careDevice);
-    }
-
-    /**
-     * 查询设备详情
-     * @param id
-     * @return
-     */
-    public DeviceVO getDeviceInfo(Long id){
-        CareDevice careDevice = this.careDeviceService.getById(id);
-        DeviceVO vo = new DeviceVO();
-        BeanUtil.copyProperties(careDevice,vo);
-        CareSysUser chamb = this.careSysUserService.getById(vo.getChambId());
-        if(chamb != null) {
-            vo.setChambName(chamb.getName());
-            vo.setChambPhone(chamb.getPhone());
-        }
-        vo.setStationName(this.careStationService.getById(vo.getStationId()).getShortName());
-        vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
-        vo.setStatusName(DeviceStatusEnum.getCodeToName(vo.getStatus()));
-
-        if(StringUtils.isNotEmpty(vo.getDevScene())){
-            vo.setIsHasScene(true);
-        } else {
-            vo.setIsHasScene(false);
-        }
-
-        if((vo.getFallingbedResponseTime() != null && vo.getFallingbedResponseTime() > 0)
-               || (vo.getFallResponseTime() != null && vo.getFallResponseTime() > 0)
-                || (vo.getLonglagResponseTime() != null && vo.getLonglagResponseTime() > 0)){
-            vo.setIsHasResponseTime(true);
-        } else {
-            vo.setIsHasResponseTime(false);
-        }
-        if(CollUtil.isNotEmpty(queryMyOlderListByDeviceId(id))){
-            vo.setIsHasOlder(true);
-        } else {
-            vo.setIsHasOlder(false);
-        }
-        if(CollUtil.isNotEmpty(queryMyContactListByDeviceId(id))){
-            vo.setIsHasConnector(true);
-        } else {
-            vo.setIsHasConnector(false);
-        }
-
-        return vo;
-    }
-    /**
-     * 查询服务站简介
-     * @param stationId
-     * @return
-     */
-    public StationVO getMyDevStationInfo(Long stationId){
-        CareStation careStation = this.careStationService.getById(stationId);
-        StationVO vo = new StationVO();
-        BeanUtil.copyProperties(careStation,vo);
-        return vo;
-    }
-
-    /**
-     * 修改设备
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateMyDevice(DeviceVO vo){
-        //修改设备
-        CareDevice careDevice = this.careDeviceService.getById(vo.getId());
-        BeanUtil.copyProperties(vo,careDevice);
-        careDevice.setModifyTime(new Date());
-        return this.careDeviceService.updateById(careDevice);
-    }
-
-    /**
-     * 查询我的设备拥有的被监护人列表
-     * @param devId
-     * @return
-     */
-    public List<OlderVO> queryMyOlderListByDeviceId(Long devId){
-        List<OlderVO> vos = Lists.newArrayList();
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-        if(careDevice == null){
-            return vos;
-        }
-        QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId, careDevice.getHouseId());
-        List<CareHouseOlderRel> rels = this.careHouseOlderRelService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(rels)){
-            rels.forEach(item -> {
-                OlderVO vo = new OlderVO();
-                CareOlder careOlder = this.careOlderService.getById(item.getOlderId());
-                BeanUtil.copyProperties(careOlder,vo);
-                vo.setLiveTypeDesc(OlderLiveTypeEnum.getCodeToName(vo.getLiveType()));
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
-
-
-    /**
-     * 查询我的设备关联数据
-     * @param devId
-     * @return
-     */
-    public List<CareHouseContactRel> queryMyContactRelListByDeviceId(Long devId){
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-        if(careDevice == null){
-            return Lists.newArrayList();
-        }
-        QueryWrapper<CareHouseContactRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseContactRel::getHouseId, careDevice.getHouseId());
-        return this.careHouseContactRelService.list(queryWrapper);
-    }
-
-    /**
-     * 查询我的设备拥有的紧急联系人列表
-     * @param devId
-     * @return
-     */
-    public List<HouseContactVO> queryMyContactListByDeviceId(Long devId){
-        List<HouseContactVO> vos = Lists.newArrayList();
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-        if(careDevice == null){
-            return vos;
-        }
-        QueryWrapper<CareHouseContactRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseContactRel::getHouseId, careDevice.getHouseId());
-        List<CareHouseContactRel> rels = this.careHouseContactRelService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(rels)){
-            rels.forEach(item -> {
-                HouseContactVO vo = new HouseContactVO();
-                CareHouseContact careHouseContact = this.careHouseContactService.getById(item.getContactId());
-                BeanUtil.copyProperties(careHouseContact,vo);
-                vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-                vos.add(vo);
-            });
-        }
-        List<HouseContactVO> vosNew = CollUtil.sortByProperty(vos,"contactLevel");
-        return vosNew;
-    }
-
-    /**
-     * 绑定设备 和 老人
-     * @return
-     */
-    public boolean bindOlder(Long devId,Long olderId){
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-        CareHouseOlderRel careHouseOlderRel = new CareHouseOlderRel();
-        careHouseOlderRel.setHouseId(careDevice.getHouseId());
-        careHouseOlderRel.setOlderId(olderId);
-        return this.careHouseOlderRelService.save(careHouseOlderRel);
-    }
-
-    /**
-     * 移除被监护人，解绑设备 和 老人
-     * @return
-     */
-    public boolean unBindOlder(Long devId,Long olderId){
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-
-        QueryWrapper<CareHouseOlderRel> delWrapper = new QueryWrapper<>();
-        delWrapper.lambda().eq(CareHouseOlderRel::getHouseId, careDevice.getHouseId())
-        .eq(CareHouseOlderRel::getOlderId, olderId);
-        return this.careHouseOlderRelService.remove(delWrapper);
-    }
-
-    /**
-     * 绑定设备 和 紧急联系人
-     * @return
-     */
-    public boolean bindHouseContact(Long devId,Long contactId){
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-        CareHouseContactRel careHouseContactRel = new CareHouseContactRel();
-        careHouseContactRel.setHouseId(careDevice.getHouseId());
-        careHouseContactRel.setContactId(contactId);
-        return this.careHouseContactRelService.save(careHouseContactRel);
-    }
-
-    /**
-     * 移除被监护人，解绑设备 和 老人
-     * @return
-     */
-    public boolean unHouseContact(Long devId,Long contactId){
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-
-        QueryWrapper<CareHouseContactRel> delWrapper = new QueryWrapper<>();
-        delWrapper.lambda().eq(CareHouseContactRel::getHouseId, careDevice.getHouseId())
-                .eq(CareHouseContactRel::getContactId, contactId);
-        return this.careHouseContactRelService.remove(delWrapper);
-    }
-}

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

@@ -1,48 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.care.client.vo.MemberInfoVO;
-import com.care.client.vo.OlderVO;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.entity.CareOlder;
-import com.care.common.enums.OlderLiveTypeEnum;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.service.CareOlderService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Slf4j
-@Service
-public class PinanbaoMemberInfoService {
-
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-
-
-    /**
-     * 修改个人信息
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateMyMemberInfo(MemberInfoVO vo){
-        CareMemberInfo careMemberInfo = this.careMemberInfoService.getById(vo.getId());
-        BeanUtil.copyProperties(vo,careMemberInfo);
-        careMemberInfo.setModifyTime(new Date());
-        return this.careMemberInfoService.updateById(careMemberInfo);
-    }
-
-
-}

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

@@ -1,108 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.care.client.vo.OlderVO;
-import com.care.common.entity.*;
-
-import com.care.common.enums.OlderLiveTypeEnum;
-import com.care.common.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Slf4j
-@Service
-public class PinanbaoOlderService {
-
-
-    @Resource
-    private CareOlderService careOlderService;
-    @Resource
-    private CareHouseOlderRelService careHouseOlderRelService;
-    /**
-     * 查询老人
-     * @param memberId
-     * @return
-     */
-    public List<OlderVO> queryOlderByMemberId(Long memberId){
-        List<OlderVO> vos = Lists.newArrayList();
-        QueryWrapper<CareOlder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareOlder::getMemberId, memberId);
-        List<CareOlder> olders = this.careOlderService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(olders)){
-            olders.forEach(item -> {
-                OlderVO vo = new OlderVO();
-                BeanUtil.copyProperties(item,vo);
-                vo.setLiveTypeDesc(OlderLiveTypeEnum.getCodeToName(vo.getLiveType()));
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
-
-    /**
-     * 新增老人
-     * @param memberId
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean createMyOlder(Long memberId,OlderVO vo){
-        //保存被监护人
-        CareOlder careOlder = new CareOlder();
-        BeanUtil.copyProperties(vo,careOlder);
-        careOlder.setMemberId(memberId);
-        careOlder.setCreateTime(new Date());
-        return this.careOlderService.save(careOlder);
-    }
-
-    /**
-     * 查询老人详情
-     * @param id
-     * @return
-     */
-    public OlderVO getOlderInfo(Long id){
-        CareOlder careOlder = this.careOlderService.getById(id);
-        OlderVO vo = new OlderVO();
-        BeanUtil.copyProperties(careOlder,vo);
-        vo.setLiveTypeDesc(OlderLiveTypeEnum.getCodeToName(vo.getLiveType()));
-        return vo;
-    }
-
-    /**
-     * 修改老人
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateMyOlder(OlderVO vo){
-        //修改老人
-        CareOlder careOlder = this.careOlderService.getById(vo.getId());
-        BeanUtil.copyProperties(vo,careOlder);
-        careOlder.setModifyTime(new Date());
-        return this.careOlderService.updateById(careOlder);
-    }
-
-    /**
-     * 删除老人
-     * @param id
-     * @return
-     */
-    public boolean deleteById(Long id){
-        QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseOlderRel::getOlderId,id);
-        careHouseOlderRelService.remove(queryWrapper);
-
-        return this.careOlderService.removeById(id);
-    }
-}

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

@@ -1,539 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.math.MathUtil;
-import cn.hutool.core.util.NumberUtil;
-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.care.client.vo.*;
-import com.care.common.entity.*;
-import com.care.common.enums.*;
-import com.care.common.service.*;
-import com.care.common.vo.device.DeviceVO;
-import com.care.common.vo.order.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Slf4j
-@Service
-public class PinanbaoService {
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareEventOrderService careEventOrderService;
-    @Resource
-    private CareEventOrderHandleHisService careEventOrderHandleHisService;
-    @Resource
-    private CareHouseService careHouseService;
-    @Resource
-    private CareEventOrderChambService careEventOrderChambService;
-    @Resource
-    private CareSysUserService careSysUserService;
-    @Resource
-    private CareEventOrderContactStatusService careEventOrderContactStatusService;
-    @Resource
-    private CareEventOrderOlderService careEventOrderOlderService;
-    @Resource
-    private CareBedroomInbedDetailService careBedroomInbedDetailService;
-    @Resource
-    private CareToiletInoutDetailService careToiletInoutDetailService;
-    @Resource
-    private CareWalkingDistanceDetailService careWalkingDistanceDetailService;
-    @Resource
-    private CareBedroomInbedHourStaService careBedroomInbedHourStaService;
-    @Resource
-    private CareToiletInoutHourStaService careToiletInoutHourStaService;
-    @Resource
-    private CareWalkingDistanceHourStaService careWalkingDistanceHourStaService;
-    /**
-     * 查询我的的设备列表
-     * @param memberId
-     * @return
-     */
-    public List<DeviceVO> devList(Long memberId){
-        return this.careDeviceService.queryListByMemberId(memberId);
-    }
-
-    /**
-     * 设备监测数据
-     * @param devId
-     * @return
-     */
-    public DeviceMonitorVO devMonitorData(Long devId){
-        CareDevice device = this.careDeviceService.getById(devId);
-        DeviceMonitorVO vo = new DeviceMonitorVO();
-        if (device!=null){
-            vo.setId(devId);
-            //场景
-            vo.setDevScene(device.getDevScene());
-            vo.setDevSceneName(DeviceSceneEnum.getCodeToName(device.getDevScene()));
-
-            //心率和呼吸
-            vo.setBreathRate(device.getBreathRate());
-            vo.setHeartRate(device.getHeartRate());
-
-            //厕所场景下， 活动状态 只有 有人/无人
-            if (DeviceSceneEnum.TOILET.getValue().equals(device.getDevScene())){
-                vo.setMoveStatu(device.getMoveStatus());
-                String desc = DeviceMoveStateEnum.NONE.getValue().equals(device.getMoveStatus())?"无人":"有人";
-                vo.setMoveStatuName(desc);
-            }else{
-                //活动状态
-                vo.setMoveStatu(device.getMoveStatus());
-                vo.setMoveStatuName(DeviceMoveStateEnum.getCodeToName(device.getMoveStatus()));
-            }
-
-
-            //在床状态
-            vo.setInbedStatus(device.getInbedStatus());
-            vo.setInbedStatusName(DeviceInbedStateEnum.getCodeToName(device.getInbedStatus()));
-
-            //卧室场景： 在床、无人冲突时， 显示成 静止状态
-            if (DeviceSceneEnum.BEDROOM.getValue().equals(device.getDevScene())){
-                if (DeviceMoveStateEnum.NONE.getValue().equals(device.getMoveStatus()) && DeviceInbedStateEnum.INBED.getValue().equals(device.getInbedStatus())){
-                    vo.setMoveStatu(DeviceMoveStateEnum.STATIC.getValue());
-                    vo.setMoveStatuName(DeviceMoveStateEnum.getCodeToName(DeviceMoveStateEnum.STATIC.getValue()));
-                }
-            }
-
-            //睡眠时间
-            DeviceMonitorVO vo1 = careBedroomInbedDetailService.selectSleepTime(devId);
-            if(vo1 != null) {
-                vo.setSleepTimeHour(vo1.getSleepTimeHour());
-                vo.setSleepTimeMinute(vo1.getSleepTimeMinute());
-            }
-
-            //卫生间进出次数
-            DeviceMonitorVO vo2 = careToiletInoutDetailService.selectToiletInoutFrequency(devId);
-            if(vo2 != null) {
-                vo.setToiletInoutFrequency(vo2.getToiletInoutFrequency());
-                vo.setToiletStayDurationAvg(vo2.getToiletStayDurationAvg());
-                vo.setToiletStayDurationMax(vo2.getToiletStayDurationMax());
-            }
-
-            //活动距离和时长
-            DeviceMonitorVO vo3 = careWalkingDistanceDetailService.selectWalking(devId);
-            if(vo3 != null) {
-                vo.setActivityDistance(vo3.getActivityDistance());
-                vo.setActivityTimeHour(vo3.getActivityTimeHour());
-                vo.setActivityTimeMinute(vo3.getActivityTimeMinute());
-            }
-        }
-        return vo;
-    }
-
-    /**
-     * 在床时间chart
-     * @param devId
-     * @return
-     */
-    public List<CareBedroomInbedHourSta> getInbedTimeChartList(Long devId){
-        String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
-        QueryWrapper<CareBedroomInbedHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareBedroomInbedHourSta::getDevId,devId).ge(CareBedroomInbedHourSta::getDataHour,beginHour).orderByAsc(CareBedroomInbedHourSta::getDataHour);
-        List<CareBedroomInbedHourSta> list = this.careBedroomInbedHourStaService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(list)){
-            list.forEach(item -> {
-                item.setDataHour(item.getDataHour().substring(8)+":00");
-            });
-        }
-        return list;
-    }
-
-    /**
-     * 卫生间进出统计chart
-     * @param devId
-     * @return
-     */
-    public List<CareToiletInoutHourSta> getToiletInoutChartList(Long devId){
-        String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
-        QueryWrapper<CareToiletInoutHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareToiletInoutHourSta::getDevId,devId).ge(CareToiletInoutHourSta::getDataHour,beginHour).orderByAsc(CareToiletInoutHourSta::getDataHour);
-        List<CareToiletInoutHourSta> list = this.careToiletInoutHourStaService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(list)){
-            list.forEach(item -> {
-                item.setDataHour(item.getDataHour().substring(8)+":00");
-            });
-        }
-        return list;
-    }
-
-    /**
-     * 活动统计chart
-     * @param devId
-     * @return
-     */
-    public List<CareWalkingDistanceHourSta> getActivityChartList(Long devId){
-        String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
-        QueryWrapper<CareWalkingDistanceHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareWalkingDistanceHourSta::getDevId,devId).ge(CareWalkingDistanceHourSta::getDataHour,beginHour).orderByAsc(CareWalkingDistanceHourSta::getDataHour);
-        List<CareWalkingDistanceHourSta> list = this.careWalkingDistanceHourStaService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(list)){
-            list.forEach(item -> {
-                item.setDataHour(item.getDataHour().substring(8)+":00");
-                item.setWalkingDistance(Math.ceil(item.getWalkingDistance()));
-            });
-        }
-        return list;
-    }
-
-    /**
-     * 查询正在进行中的事件
-     * @param memberId
-     * @return
-     */
-    public IPage<EventOrderVO> getAllListEvent(Integer current, Long memberId) {
-        IPage<CareEventOrder> page = new Page<>(current, 10);
-        List<DeviceVO> deviceVOS = devList(memberId);
-        List<Long> deviceIds = deviceVOS.stream().map(DeviceVO::getDevId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-        if (CollUtil.isNotEmpty(deviceIds)){
-            QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(CareEventOrder::getMemberId,memberId).in(CareEventOrder::getDevId, deviceIds).orderByDesc(CareEventOrder::getCreateTime);
-            IPage<CareEventOrder> contentPage = this.careEventOrderService.page(page, queryWrapper);
-            IPage<EventOrderVO> results = new Page<>(contentPage.getCurrent(), contentPage.getSize(), contentPage.getTotal());
-            if (CollUtil.isNotEmpty(contentPage.getRecords())) {
-                List<EventOrderVO> list = new ArrayList<>();
-                contentPage.getRecords().forEach(item -> {
-                    EventOrderVO resVO = new EventOrderVO();
-                    BeanUtils.copyProperties(item, resVO);
-                    resVO.setOrderTypeName(OrderTypeEnum.getCodeToName(item.getOrderType()));
-                    resVO.setStatusName(OrderStatusEnum.getCodeToName(item.getStatus()));
-                    list.add(resVO);
-                });
-                results.setRecords(list);
-            }
-            return results;
-        }else{
-            return new Page<>(1, 10, 0);
-        }
-
-
-    }
-
-    /**
-     * 查询正在进行中的事件
-     * @param memberId
-     * @return
-     */
-    public EventOrderVO getDoingEvent(Long memberId){
-        EventOrderVO vo = null;
-        QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrder::getMemberId,memberId).and(item->
-            item.eq(CareEventOrder::getStatus, OrderStatusEnum.TODO.getValue()).or(i->
-                i.eq(CareEventOrder::getStatus,OrderStatusEnum.DOING.getValue())
-            )
-        ).orderByAsc(CareEventOrder::getCreateTime);
-        List<CareEventOrder> list = this.careEventOrderService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(list)){
-            CareEventOrder order = list.get(0);
-            vo = new EventOrderVO();
-            BeanUtil.copyProperties(order,vo);
-        }
-        return vo;
-    }
-
-    /**
-     * 获取事件详情
-     * @return
-     */
-    public EventDetailVO getEventInfo(Long orderId) {
-        EventDetailVO result = new EventDetailVO();
-
-        //事件基本信息
-        EventOrderVO eventOrderVO = this.getOrderInfo(orderId);
-        result.setEventOrderVO(eventOrderVO);
-
-        //主管家和改派管家列表
-        List<ChamberlainVO>  chambList = this.queryChambList(orderId);
-        result.setChambList(chambList);
-
-        //老人列表
-        List<OrderOlderVO>  olderList = this.queryOrderOlderList(orderId);
-        result.setOlderList(olderList);
-
-        //联系人列表
-        List<OrderContactorVO> contactList = this.queryContactList(orderId);
-        result.setContactList(contactList);
-
-        //历史处理记录
-        List<OrderHandleHisVO> orderHandleHisVOList = queryOrderHandleHis(orderId);
-        result.setOrderHandleHisVOList(orderHandleHisVOList);
-        return result;
-    }
-
-    /**
-     * 查询事件基本信息
-     * @param orderId
-     * @return
-     */
-    private EventOrderVO getOrderInfo(Long orderId){
-        EventOrderVO eventOrderVO = null;
-        CareEventOrder order = this.careEventOrderService.getById(orderId);
-        if (order!=null){
-            eventOrderVO  = new EventOrderVO();
-            BeanUtil.copyProperties(order,eventOrderVO);
-            eventOrderVO.setStatusName(OrderStatusEnum.getCodeToName(eventOrderVO.getStatus()));
-            eventOrderVO.setOrderTypeName(OrderTypeEnum.getCodeToName(eventOrderVO.getOrderType()));
-            CareHouse house = this.careHouseService.getById(order.getHouseId());
-            CareHouseVO houseVO = new CareHouseVO();
-            BeanUtil.copyProperties(house,houseVO);
-            //houseVO.setRelationTypeDesc("屋主");
-            eventOrderVO.setHouse(houseVO);
-        }
-        return  eventOrderVO;
-    }
-
-    /**
-     * 主管家改派管家列表查询
-     * @param orderId
-     * @return
-     */
-    private List<ChamberlainVO>  queryChambList(Long orderId){
-        List<ChamberlainVO> chambList = new ArrayList<>();
-
-        ChamberlainVO mainVO = null;
-        ChamberlainVO assignVO = null;
-
-        CareEventOrder order = this.careEventOrderService.getById(orderId);
-        CareDevice dev = this.careDeviceService.getById(order.getDevId());
-        if(dev != null){
-            CareSysUser careSysUser = this.careSysUserService.getById(dev.getChambId());
-            if (careSysUser != null) {
-                mainVO = new ChamberlainVO();
-                BeanUtil.copyProperties(careSysUser,mainVO);
-                mainVO.setIsMain(TrueFalseEnum.TRUE.getValue());
-                mainVO.setStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getStatus()));
-            }
-        }
-        CareEventOrderChamb careEventOrderChamb = this.careEventOrderChambService.getChambOrderByOrderId(orderId);
-        if(careEventOrderChamb != null) {
-            CareSysUser careSysUser = this.careSysUserService.getById(careEventOrderChamb.getChambId());
-            if(careSysUser != null){
-                assignVO = new ChamberlainVO();
-                BeanUtil.copyProperties(careSysUser,assignVO);
-                assignVO.setIsMain(TrueFalseEnum.FALSE.getValue());
-                assignVO.setStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getStatus()));
-            }
-        }
-
-        if (mainVO != null && assignVO != null) {
-            if(mainVO.getId().equals(assignVO.getId())){ //没有指派管家
-                if(ChambStatusEnum.BUSY.getValue().equals(mainVO.getStatus())){ //主状态是忙碌时拆分子状态
-                    if(ChambOrderStatusEnum.DOING.getValue().equals(careEventOrderChamb.getStatus())){
-                        mainVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
-                    } else {
-                        mainVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
-                    }
-                } else {//主状态不是忙碌时设置子状态和主状态相同
-                    mainVO.setSubStatus(mainVO.getStatus());
-                }
-                mainVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getSubStatus()));
-                chambList.add(mainVO);
-            } else{ //指派了管家
-                //设置主管家子状态和主状态相同：空闲、休假、忙碌
-                mainVO.setSubStatus(mainVO.getStatus());
-
-                //设置指派管家状态
-                if(ChambStatusEnum.BUSY.getValue().equals(assignVO.getStatus())) { //指派管家的主状态是忙碌时拆分子状态
-                    if(ChambOrderStatusEnum.DOING.getValue().equals(careEventOrderChamb.getStatus())){
-                        assignVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
-                    } else {
-                        assignVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
-                    }
-                } else {//指派管家的主状态不是忙碌时设置子状态和主状态相同
-                    assignVO.setSubStatus(assignVO.getStatus());
-                }
-                mainVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(mainVO.getSubStatus()));
-                chambList.add(mainVO);
-                assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
-                chambList.add(assignVO);
-            }
-        } else if(mainVO == null && assignVO != null) {
-            //设置指派管家状态
-            if(ChambStatusEnum.BUSY.getValue().equals(assignVO.getStatus())) { //指派管家的主状态是忙碌时拆分子状态
-                if(ChambOrderStatusEnum.DOING.getValue().equals(careEventOrderChamb.getStatus())){
-                    assignVO.setSubStatus(ChambSubStatusEnum.DOING.getValue());//处理中
-                } else {
-                    assignVO.setSubStatus(ChambSubStatusEnum.BUSY.getValue());//忙碌
-                }
-            } else {//指派管家的主状态不是忙碌时设置子状态和主状态相同
-                assignVO.setSubStatus(assignVO.getStatus());
-            }
-
-            assignVO.setSubStatusDesc(ChambStatusEnum.getCodeToName(assignVO.getSubStatus()));
-            chambList.add(assignVO);
-        }
-
-        return chambList;
-    }
-
-    /**
-     * 查询老人列表
-     * @param orderId
-     * @return
-     */
-    public List<OrderOlderVO>  queryOrderOlderList(Long orderId){
-        List<OrderOlderVO> orderOlderVOList = Lists.newArrayList();
-        QueryWrapper<CareEventOrderOlder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrderOlder::getOrderId,orderId);
-        List<CareEventOrderOlder> ceoos  = this.careEventOrderOlderService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(ceoos)){
-            ceoos.forEach(item->{
-                OrderOlderVO orderOlderVO = new OrderOlderVO();
-                BeanUtil.copyProperties(item,orderOlderVO);
-                orderOlderVO.setStatusDesc(OrderOlderStatusEnum.getCodeToName(orderOlderVO.getStatus()));
-                orderOlderVOList.add(orderOlderVO);
-            });
-
-        }
-        return orderOlderVOList;
-    }
-
-    /**
-     *  查询工单的相关联系人
-     * @param orderId
-     * @return
-     */
-    private List<OrderContactorVO> queryContactList(Long orderId){
-        List<OrderContactorVO> result = Lists.newArrayList();
-        QueryWrapper<CareEventOrderContactStatus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrderContactStatus::getOrderId,orderId).orderByAsc(CareEventOrderContactStatus::getContactLevel);
-        List<CareEventOrderContactStatus> ceocs = this.careEventOrderContactStatusService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(ceocs)){
-            ceocs.forEach(item -> {
-                OrderContactorVO contactorVO = new OrderContactorVO();
-                BeanUtil.copyProperties(item,contactorVO);
-                contactorVO.setStatusDesc(ContactorStatusEnum.getCodeToName(item.getStatus()));
-                if (contactorVO.getContactName() == null){
-                    contactorVO.setContactName("");
-                }
-                result.add(contactorVO);
-            });
-        }
-        return  result;
-    }
-
-    /**
-     * 查询事件处理历史列表
-     * @param orderId
-     * @return
-     */
-    private  List<OrderHandleHisVO> queryOrderHandleHis(Long orderId){
-        List<OrderHandleHisVO> orderHandleHisVOList = Lists.newArrayList();
-        QueryWrapper<CareEventOrderHandleHis> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("distinct org_id,station_id,house_id,order_id,log_type,order_type,log_object_id,log_object_name,log_result," +
-                "op_user_role,op_user_id,op_user_name,create_time,relation_type_desc,call_result_id").lambda().eq(CareEventOrderHandleHis::getOrderId,orderId)
-                .orderByDesc(CareEventOrderHandleHis::getCreateTime);
-        List<CareEventOrderHandleHis> datas = this.careEventOrderHandleHisService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(datas)){
-            datas.forEach(item ->{
-                OrderHandleHisVO hisVO = new OrderHandleHisVO();
-                BeanUtil.copyProperties(item,hisVO);
-                if (hisVO.getLogObjectName() == null){
-                    hisVO.setLogObjectName("");
-                }
-                orderHandleHisVOList.add(hisVO);
-            });
-        }
-        return orderHandleHisVOList;
-    }
-
-    /**
-     *  老人 SOS呼叫
-     * @param member
-     * @param file
-     * @return
-     */
-    public boolean sos(MemberInfoVO member,  MultipartFile file){
-
-//        EventOrderVO orderVO = getDoingEvent(member.getHouseId());
-//        if (orderVO!=null){
-//            throw new BDException("有进行中事件，请勿重复呼叫");
-//        }
-//
-//        Date now  = DateUtil.date();
-//        //1. 保存文件
-//        String url = fileUploadService.upload(file,"sos");
-//        //2. 查询房屋
-//        CareHouse house = this.careHouseService.getById(member.getHouseId());
-//        //2. 生成工单
-//        CareEventOrder order = new CareEventOrder();
-//        order.setOrgId(house.getOrgId());
-//        order.setOrgName(this.careOrganizationService.getById(house.getOrgId()).getName());
-//        order.setStationId(house.getStationId());
-//        order.setStationName(this.careStationService.getById(house.getStationId()).getName());
-//        order.setHouseId(house.getId());
-//        order.setHouseName(house.getName());
-//        order.setTitle(house.getAddr()+" "+member.getName()+" 主动呼叫");
-//        order.setOlderId(member.getId());
-//        order.setOlderName(member.getName());
-//        order.setVoiceUrl(url);
-//        order.setOrderType(OrderTypeEnum.ZHU_DONG_HU_JIAO.getValue());
-//        order.setStatus(OrderStatusEnum.TODO.getValue());
-//        order.setCreateTime(now);
-//        order.setModifyTime(now);
-//        this.careEventOrderService.saveOrder(order);
-        return true;
-    }
-
-    /**
-     *  老人 SOS呼叫
-     * @param member
-     * @return
-     */
-    public boolean sos(MemberInfoVO member){
-
-//        EventOrderVO orderVO = getDoingEvent(member.getHouseId());
-//        if (orderVO!=null){
-//            throw new BDException("有进行中事件，请勿重复呼叫");
-//        }
-//        Date now  = DateUtil.date();
-//        //2. 查询房屋
-//        CareHouse house = this.careHouseService.getById(member.getHouseId());
-//        //2. 生成工单
-//        CareEventOrder order = new CareEventOrder();
-//        order.setOrgId(house.getOrgId());
-//        order.setOrgName(this.careOrganizationService.getById(house.getOrgId()).getName());
-//        order.setStationId(house.getStationId());
-//        order.setStationName(this.careStationService.getById(house.getStationId()).getName());
-//        order.setHouseId(house.getId());
-//        order.setHouseName(house.getName());
-//        order.setTitle(house.getAddr()+" "+member.getName()+" 主动呼叫");
-//        order.setOlderId(member.getId());
-//        order.setOlderName(member.getName());
-//        order.setOrderType(OrderTypeEnum.ZHU_DONG_HU_JIAO.getValue());
-//        order.setStatus(OrderStatusEnum.TODO.getValue());
-//        order.setCreateTime(now);
-//        order.setModifyTime(now);
-//        this.careEventOrderService.saveOrder(order);
-        return true;
-    }
-
-    /**
-     * 获取3D监控页面URL
-     * @return
-     */
-    public String getRealTimeMonitorUrl(Long devId){
-        Map<String,String> map =  this.careDeviceService.get3dUrl(devId);
-        return  map.get("toWX");
-    }
-}

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

@@ -1,91 +0,0 @@
-package com.care.client.service;
-
-import cn.hutool.json.JSONObject;
-
-import com.care.client.config.PlatformPinanbaoConfig;
-import com.care.client.config.WxConfig;
-import com.care.client.vo.MemberInitParams;
-import com.care.common.cache.RedisKeyConstant;
-import com.care.common.cache.RedisUtil;
-import com.care.common.entity.CareMemberInfo;
-import com.care.common.service.CareMemberInfoService;
-import com.care.common.util.HttpUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.text.MessageFormat;
-
-@Slf4j
-@Service
-public class WxPassportService extends AbstractPassportService {
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    @Resource
-    private PlatformPinanbaoConfig platformPinanbaoConfig;
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
-
-    public CareMemberInfo login(MemberInitParams params) {
-        WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
-        // 解析codeUrl
-        String codeUrl = MessageFormat.format(wxConfig.getCodeUrl(), wxConfig.getAppId(), wxConfig.getSecret(), params.getCode());
-        // 通过codeUrl获取openid
-        JSONObject jsonObject = HttpUtil.httpGet(codeUrl);
-        log.warn("-----jsonObject:[{}]", jsonObject);
-
-        String openid = jsonObject.getStr("openid");
-        String unionid = jsonObject.getStr("unionid");
-        //判断是否注册过了
-        CareMemberInfo careMemberInfo = careMemberInfoService.detailByOpenid(openid);
-        if(careMemberInfo != null) {
-            if (StringUtils.isNotBlank(openid) && StringUtils.isNotBlank(unionid)) {
-                boolean updated = careMemberInfoService.modifyUnionId(openid, unionid);
-                if (!updated) {
-                    log.error("修改用户平台唯一标识出现错误, openId: " + openid + "; unionId: " + unionid);
-                }
-            } else {
-                log.error("未获取到用户" + careMemberInfo.getNickname() + " 的平台唯一标识, openId: " + openid);
-            }
-            return careMemberInfo;
-        } else { //没有注册，走第二步
-            String sessionKey = jsonObject.getStr("session_key");
-            log.warn("-----openid:[{}], session_key:[{}]", openid, sessionKey);
-
-            MemberInitParams memberInitParams = new MemberInitParams();
-            memberInitParams.setLoginType("wx");
-            memberInitParams.setOpenid(openid);
-            memberInitParams.setUnionid(unionid);
-            memberInitParams.setSessionKey(sessionKey);
-            redisUtil.hset(RedisKeyConstant.PINANBAO_WX_LOGIN_INFO, params.getCode(), memberInitParams, RedisKeyConstant.PINANBAO_WX_LOGIN_INFO_TIME);
-            return null;
-        }
-
-
-    }
-
-
-    public String accessToken() {
-        WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
-        String access_token = (String) redisUtil.hget(RedisKeyConstant.WX_ACCESS_TOKEN, wxConfig.getAppId());
-        if (access_token != null) {
-            return access_token;
-        }
-        return this.flushWxToken();
-    }
-
-    private String flushWxToken() {
-        WxConfig wxConfig = platformPinanbaoConfig.wxConfig();
-        // 解析codeUrl
-        String tokenUrl = MessageFormat.format(wxConfig.getTokenUrl(), wxConfig.getAppId(), wxConfig.getSecret());
-        // 通过codeUrl获取openid
-        JSONObject jsonObject = HttpUtil.httpGet(tokenUrl);
-        String access_token = jsonObject.getStr("access_token");
-        redisUtil.hset(RedisKeyConstant.WX_ACCESS_TOKEN, wxConfig.getAppId(), access_token, RedisKeyConstant.WX_ACCESS_TOKEN_TIME);
-        return access_token;
-    }
-
-}

src/main/java/com/care/client/vo/DeviceMonitorVO.java

@@ -1,63 +0,0 @@
-package com.care.client.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Author: lilt
- * @Date: 2021/6/8
- * @Desc:
- */
-@Data
-@ApiModel(description = "设备监测数据")
-public class DeviceMonitorVO {
-    private Long id;
-
-    @ApiModelProperty("设备场景：1客厅，2卫浴，3卧室，4其他")
-    private String devScene;
-    @ApiModelProperty("设备场景：1客厅，2卫浴，3卧室，4其他")
-    private String devSceneName;
-
-    @ApiModelProperty("呼吸频率")
-    private Integer breathRate;
-    @ApiModelProperty("呼吸频率单位")
-    private String breathRateUnit="次/分";
-
-    @ApiModelProperty("心跳频率")
-    private Integer heartRate;
-    @ApiModelProperty("心跳频率单位")
-    private String heartRateUnit="次/分";
-
-    @ApiModelProperty("移动状态：0无人, 1活动, 2静止")
-    private String moveStatu;
-    @ApiModelProperty("移动状态：0无人, 1活动, 2静止")
-    private String moveStatuName;
-
-    @ApiModelProperty("在床状态：1在床, 2离床（卧室）")
-    private String inbedStatus;
-    @ApiModelProperty("在床状态：1在床, 2离床（卧室）")
-    private String inbedStatusName;
-
-    @ApiModelProperty("卫生间进出次数")
-    private Integer toiletInoutFrequency;
-    @ApiModelProperty("卫生间平均停留时长（分钟）")
-    private Integer toiletStayDurationAvg;
-    @ApiModelProperty("卫生间最大停留时长（分钟）")
-    private Integer toiletStayDurationMax;
-
-    @ApiModelProperty("活动距离")
-    private Integer activityDistance;
-    @ApiModelProperty("活动距离单位")
-    private String activityDistanceUnit = "m";
-
-    @ApiModelProperty("活动时长-N小时")
-    private Integer activityTimeHour;
-    @ApiModelProperty("活动时长-N分钟")
-    private Integer activityTimeMinute;
-
-    @ApiModelProperty("睡眠时长-N小时")
-    private Integer sleepTimeHour;
-    @ApiModelProperty("睡眠时长-N分钟")
-    private Integer sleepTimeMinute;
-}

src/main/java/com/care/client/vo/DeviceVO.java

@@ -1,116 +0,0 @@
-package com.care.client.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-
-/**
- * @Author: lilt
- * @Date: 2021/6/7
- * @Desc:
- */
-@Data
-public class DeviceVO {
-
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    private Long stationId;
-
-    private String stationName;
-
-    @ApiModelProperty("房屋ID")
-    private Long houseId;
-    @ApiModelProperty("房屋地址")
-    private String houseAddr;
-
-    @ApiModelProperty("关联管家ID")
-    private Long chambId;
-
-    @ApiModelProperty("关联管家号码")
-    private String chambPhone;
-
-    @ApiModelProperty("关联管家姓名")
-    private String chambName;
-
-    @ApiModelProperty("设备名称")
-    private String devName;
-
-    @ApiModelProperty("设备编码")
-    private String devCode;
-
-
-    @ApiModelProperty("设备场景：1客厅，2卫浴，3卧室，4其他")
-    private String devScene;
-
-    private String devSceneName;
-
-    @ApiModelProperty("状态：1在线；2：离线")
-    private String status;
-
-    private String statusName;
-
-    @ApiModelProperty("激活状态：0未激活，1已激活")
-    private String activeStatus;
-
-    private String activeStatusName;
-
-    @ApiModelProperty("经度")
-    private Double longitude;
-
-
-    @ApiModelProperty("纬度")
-    private Double latitude;
-
-    @ApiModelProperty("跌到响应时间（分）")
-    private Integer fallResponseTime;
-
-    @ApiModelProperty("久滞响应时间（分）")
-    private Integer longlagResponseTime;
-
-    @ApiModelProperty("坠床响应时间（分）")
-    private Integer fallingbedResponseTime;
-
-    @ApiModelProperty("激活时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date activeTime;
-
-    @ApiModelProperty("createTime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("关联用户ID")
-    private Long memberId;
-
-    @ApiModelProperty("关联用户号码")
-    private String memberPhone;
-
-    @ApiModelProperty("标签是否设置")
-    private Boolean isHasScene;
-
-    @ApiModelProperty("被监护人是否设置")
-    private Boolean isHasOlder;
-
-    @ApiModelProperty("紧急联系人是否设置")
-    private Boolean isHasConnector;
-
-    @ApiModelProperty("响应时间是否设置")
-    private Boolean isHasResponseTime;
-}

src/main/java/com/care/client/vo/EventDetailVO.java

@@ -1,33 +0,0 @@
-package com.care.client.vo;
-
-import com.care.common.vo.order.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Author: stw
- * @Date: 2021/9/8
- * @Desc:
- */
-@Data
-@ApiModel(description = "事件工单详情")
-public class EventDetailVO {
-
-    @ApiModelProperty("基本信息")
-    private EventOrderVO eventOrderVO;
-
-    @ApiModelProperty("主管家和改派管家列表")
-    private List<ChamberlainVO>  chambList;
-
-    @ApiModelProperty("老人列表")
-    private List<OrderOlderVO>  olderList;
-
-    @ApiModelProperty("紧急联系人列表")
-    private List<OrderContactorVO> contactList;
-
-    @ApiModelProperty("历史处理记录")
-    private List<OrderHandleHisVO> orderHandleHisVOList;
-}

src/main/java/com/care/client/vo/HouseContactVO.java

@@ -1,83 +0,0 @@
-package com.care.client.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 被监护人紧急联系人(CareHouseContact)实体类
- *
- * @author makejava
- * @since 2021-06-02 21:54:55
- */
-
-@Data
-@ApiModel(value = "房屋紧急联系人", description = "")
-public class HouseContactVO implements Serializable {
-    private static final long serialVersionUID = -90072609726445263L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    private Long stationId;
-
-
-    @ApiModelProperty("频安宝用户ID")
-    private Long memberId;
-
-    @ApiModelProperty("姓名")
-    private String contactName;
-
-    @ApiModelProperty("性别：M：男 W：女")
-    private String gender;
-
-    @ApiModelProperty("电话")
-    private String contactPhone;
-
-
-    @ApiModelProperty("关系类别：kinsman亲属  neighbor：邻居")
-    private String relationType;
-
-    @ApiModelProperty("关系描述")
-    private String relationTypeDesc;
-
-    @ApiModelProperty("联系级别")
-    private Integer contactLevel;
-
-    @ApiModelProperty("地址")
-    private String addr;
-
-    @ApiModelProperty("经度")
-    private Double longitude;
-
-
-    @ApiModelProperty("纬度")
-    private Double latitude;
-
-    @ApiModelProperty("公众号OPENID")
-    private String openId;
-
-
-    @ApiModelProperty("createTime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date modifyTime;
-
-
-}

src/main/java/com/care/client/vo/MemberInfoVO.java

@@ -1,64 +0,0 @@
-package com.care.client.vo;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 用户登录信息(CareMemberInfo)实体类
- *
- * @author makejava
- * @since 2021-06-07 00:18:53
- */
-@ApiModel(description = "登陆人信息")
-@Data
-public class MemberInfoVO implements Serializable {
-    private static final long serialVersionUID = 676002338375207640L;
-
-    private Long id;
-
-
-    @ApiModelProperty("openId")
-    private String openId;
-
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-
-    @ApiModelProperty("昵称")
-    private String nickname;
-
-
-    @ApiModelProperty("电话")
-    private String phone;
-
-
-    @ApiModelProperty("头像")
-    private String profile;
-
-
-    @ApiModelProperty("邮箱")
-    private String email;
-
-
-    @ApiModelProperty("性别")
-    private String gender;
-
-
-    @ApiModelProperty("分享码")
-    private String shareCode;
-
-
-    @ApiModelProperty("状态")
-    private String status;
-
-    @ApiModelProperty("年龄")
-    private Integer age;
-
-    @ApiModelProperty("地址")
-    private String addr;
-}

src/main/java/com/care/client/vo/MemberInitParams.java

@@ -1,44 +0,0 @@
-package com.care.client.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@ApiModel(description = "登录参数")
-@Data
-public class MemberInitParams implements Serializable {
-
-    private static final long serialVersionUID = 2825354998621065333L;
-    @ApiModelProperty(name = "code", value = "授权码")
-    private String code;
-    @ApiModelProperty(name = "openid", value = "平台标识")
-    private String openid;
-    @ApiModelProperty(name = "unionid", value = "用户唯一标识")
-    private String unionid;
-    @ApiModelProperty(name = "sessionKey", value = "session_key")
-    private String sessionKey;
-
-    @ApiModelProperty(name = "nickname", value = "昵称")
-    private String nickname;
-
-    @ApiModelProperty(name = "profile", value = "头像")
-    private String profile;
-
-    @ApiModelProperty(name = "phone", value = "手机号码")
-    private String phone;
-
-    @ApiModelProperty(name = "password", value = "密码")
-    private String password;
-
-    @ApiModelProperty(name = "passwordAgain", value = "密码确认")
-    private String passwordAgain;
-
-
-    @ApiModelProperty(name = "vcode", value = "验证码")
-    private String vcode;
-
-    @ApiModelProperty(name = "loginType", value = "登录方式,微信：wx，密码：pwd")
-    private String loginType;
-}

src/main/java/com/care/client/vo/OlderVO.java

@@ -1,83 +0,0 @@
-package com.care.client.vo;
-
-import cn.hutool.core.date.DateUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Author: lilt
- * @Date: 2021/5/29
- * @Desc:
- */
-@Data
-@ApiModel(value = "老人详细信息", description = "老人详细信息响应类")
-public class OlderVO {
-
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    private Long stationId;
-
-    @ApiModelProperty("频安宝用户ID")
-    private Long memberId;
-
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-
-    @ApiModelProperty("电话")
-    private String phone;
-
-
-    @ApiModelProperty("姓名：M：男 W：女")
-    private String gender;
-
-
-    @ApiModelProperty("生日")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date birthday;
-
-
-    @ApiModelProperty("居住类别：1：独居 2：非独居 3：集中居住 4：其他")
-    private String liveType;
-
-    @ApiModelProperty("居住类别描述")
-    private String liveTypeDesc;
-
-    @ApiModelProperty("床号或者门牌号")
-    private String bedNumber;
-
-
-    @ApiModelProperty("安全级别： 1 ：一级 2：二级 3: 三级")
-    private String safeLevel;
-
-
-
-    @ApiModelProperty("状态：  0：未联系  1已联系 ")
-    private Integer status;
-
-    @ApiModelProperty("老人联系状态描述")
-    private String statusDesc;
-
-    @ApiModelProperty("年龄")
-    private Integer age;
-
-    public Integer getAge(){
-        if (this.getBirthday() != null){
-            return DateUtil.ageOfNow(this.getBirthday());
-        }else{
-            return null;
-        }
-    }
-
-}

src/main/java/com/care/client/vo/WxAccessTokenVO.java

@@ -1,31 +0,0 @@
-package com.care.client.vo;
-
-import java.io.Serializable;
-
-/**
- * 获取微信accessToken接口信息，参数封装
- */
-public class WxAccessTokenVO implements Serializable {
-
-    /** 获取到的凭证.*/
-    private String accessToken;
-
-    /** 凭证有效时间，单位：秒.*/
-    private Integer expiresIn;
-
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    public Integer getExpiresIn() {
-        return expiresIn;
-    }
-
-    public void setExpiresIn(Integer expiresIn) {
-        this.expiresIn = expiresIn;
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.care.common.cache;
-
-import lombok.Data;
-
-/**
- * 描述：
- *
- * @autho：java
- * @create 2021/5/25 0:55
- **/
-@Data
-public class RedisKeyConstant {
-
-    // 微信access_token 2h
-    public static final String WX_ACCESS_TOKEN = "WX:PINANBAO:TOKEN";
-    public static final int WX_ACCESS_TOKEN_TIME = (3600 - 2) * 2;
-
-    // 频安保用户登录信息 2days
-    public static final String PINANBAO_LOGIN_INFO = "PINANBAO:LOGIN";
-    public static final int PINANBAO_LOGIN_INFO_TIME = 3600 * 24 * 7;
-
-    // 后台登录信息 6 小时
-    public static final String BACK_LOGIN_INFO = "BACK:LOGIN";
-    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";
-    public static final int V_CODE_BIND_MSG_TIME = 60 * 5;
-
-    //工单处理，同一工单仅1个人处理
-    public static final String DO_ORDER = "SEAT_DO_ORDER:LOCK";
-
-    //生成工单，同一设备同时只能生成一个工单
-    public static final String CREATE_ORDER = "CREATE_ORDER:LOCK";
-
-    //设备监测信息
-    public static final String DEVICE_MONITOR = "DEVICE:MONITOR";
-    public static final int DEVICE_MONITOR_TIME = 60;
-
-    //频安守护 小程序用户 登陆信息 7days
-    public static final String PINANSHOUHU_LOGIN_INFO = "PINANSHOUHU:LOGIN";
-    public static final int PINANSHOUHU_LOGIN_INFO_TIME = 3600 * 24 * 7;
-
-    // 微信access_token 2h
-    public static final String WX_PINANSHOUHU_ACCESS_TOKEN = "WX:PINANSHOUHU:TOKEN";
-    public static final int WX_PINANSHOUHU_ACCESS_TOKEN_TIME = (3600 - 2) * 2;
-
-    public static final String KEY_APPLY_LOCAK = "KEY_APPLY:LOCK";
-
-    public static final String SWITCH_SMS = "SWITCH:SMS";
-    public static final String SWITCH_VOICE = "SWITCH:VOICE";
-
-    //存放语音通知信息callId和orderId用于回调 1h
-    public static final String VOICE_CALLBACK_INFO = "VOICE:CALLBACK";
-    public static final int VOICE_CALLBACK_INFO_TIME = 3600 * 1;
-
-    // 频安保用户微信登录信息 2h
-    public static final String PINANBAO_WX_LOGIN_INFO = "PINANBAO:WXLOGIN";
-    public static final int PINANBAO_WX_LOGIN_INFO_TIME = 3600 * 2;
-
-    // 频安管家微信登录信息 2h
-    public static final String PINANSHOUHU_WX_LOGIN_INFO = "PINANSHOUHU:WXLOGIN";
-    public static final int PINANSHOUHU_WX_LOGIN_INFO_TIME = 3600 * 2;
-
-    //设备Mqtt心跳信息 5m
-    public static final String MQTT_DEV_HEARBEAT_INFO = "MQTT:HEARBEAT";
-    public static final int MQTT_DEV_HEARBEAT_INFO_TIME = 60 * 5;
-
-    // 与安服务平台 -> 小程序, 请求TOKEN, 100m
-    public static final String YUANSERVICE_ACCESSTOKEN = "YUANSERVICE:ACCESSTOKEN";
-
-    //进出卫生间信息 2天
-    public static final String OPTINOUT_TOILET_INFO = "OPTINOUT:TOILET";
-    public static final int OPTINOUT_TOILET_INFO_TIME = 3600 * 24 * 2;
-
-    //进出卫生间信息 2天
-    public static final String OPTINOUT_BEDROOM_INFO = "OPTINOUT:BEDROOM";
-    public static final int OPTINOUT_BEDROOM_INFO_TIME = 3600 * 24 * 2;
-
-    //活动信息 20秒
-    public static final String PEOPLEEVENT_ACTIVE_INFO = "PEOPLEEVENT:ACTIVE";
-    public static final int PEOPLEEVENT_ACTIVE_INFO_TIME = 20;
-
-    //活动信息最近index 8小时
-    public static final String PEOPLEEVENT_ACTIVE_INFO_LAST_INDEX = "PEOPLEEVENT:ACTIVE_LAST_INDEX";
-    public static final int PEOPLEEVENT_ACTIVE_INFO_ACTIVE_LAST_INDEX_TIME = 3600 * 8;
-
-    // 与安服务平台 -> 小程序, QRCODE
-    public static final String YUANSERVICE_QRCODE = "YUANSERVICE:QRCODE";
-}

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

@@ -1,75 +0,0 @@
-package com.care.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 卧室在床明细表(CareBedroomInbedDetail)实体类
- *
- * @author makejava
- * @since 2021-11-16 19:30:41
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_bedroom_inbed_detail")
-@ApiModel(value = "卧室在床明细表", description = "")
-public class CareBedroomInbedDetail implements Serializable {
-    private static final long serialVersionUID = -74970592214079918L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("设备ID")
-    @TableField("DEV_ID")
-    private Long devId;
-
-
-    @ApiModelProperty("事件目标的id")
-    @TableField("TID")
-    private Integer tid;
-
-
-    @ApiModelProperty("在床时间")
-    @TableField("IN_TIME")
-    private Date inTime;
-
-
-    @ApiModelProperty("离床时间")
-    @TableField("OUT_TIME")
-    private Date outTime;
-
-
-    @ApiModelProperty("时长(秒)")
-    @TableField("DURATION")
-    private Long duration;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -1,65 +0,0 @@
-package com.care.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 每小时卧室在床统计表(CareBedroomInbedHourSta)实体类
- *
- * @author makejava
- * @since 2021-11-23 19:33:46
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_bedroom_inbed_hour_sta")
-@ApiModel(value = "每小时卧室在床统计表", description = "")
-public class CareBedroomInbedHourSta implements Serializable {
-    private static final long serialVersionUID = 319805412358752736L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("数据小时")
-    @TableField("DATA_HOUR")
-    private String dataHour;
-
-
-    @ApiModelProperty("设备ID")
-    @TableField("DEV_ID")
-    private Long devId;
-
-
-    @ApiModelProperty("时长(分钟)")
-    @TableField("DURATION")
-    private Long duration;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -1,68 +0,0 @@
-package com.care.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 每日安全事件统计表(CareDevEventDaySta)实体类
- *
- * @author makejava
- * @since 2021-11-16 19:31:49
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_dev_event_day_sta")
-@ApiModel(value = "每日安全事件统计表", description = "")
-public class CareDevEventDaySta implements Serializable {
-    private static final long serialVersionUID = -15158005495794907L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty("数据日期")
-    @TableField("DATA_DATE")
-    private String dataDate;
-
-    @ApiModelProperty("设备ID")
-    @TableField("DEV_ID")
-    private Long devId;
-
-
-    @ApiModelProperty("事件分类： 21：跌倒 22：久滞 23坠床 31主动呼叫")
-    @TableField("EVENT_TYPE")
-    private String eventType;
-
-
-    @ApiModelProperty("次数")
-    @TableField("FREQUENCY")
-    private Integer frequency;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -1,160 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 被监护人-设备(CareDevice)实体类
- *
- * @author makejava
- * @since 2021-06-08 22:26:07
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_device")
-@ApiModel(value = "被监护人-设备", description = "")
-public class CareDevice implements Serializable {
-    private static final long serialVersionUID = -22853591259670893L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty("房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-    @ApiModelProperty("管家ID")
-    @TableField("CHAMB_ID")
-    private Long chambId;
-
-    @ApiModelProperty("关联用户ID")
-    @TableField("MEMBER_ID")
-    private Long memberId;
-
-    @ApiModelProperty("关联用户号码")
-    @TableField("MEMBER_PHONE")
-    private String memberPhone;
-
-    @ApiModelProperty("设备名称")
-    @TableField("DEV_NAME")
-    private String devName;
-
-
-    @ApiModelProperty("设备编码")
-    @TableField("DEV_CODE")
-    private String devCode;
-
-
-    @ApiModelProperty("设备类别： 1：室内 2：户外")
-    @TableField("DEV_TYPE")
-    private String devType;
-
-
-    @ApiModelProperty("设备场景：1客厅，2卫浴，3卧室，4其他")
-    @TableField("DEV_SCENE")
-    private String devScene;
-
-    @ApiModelProperty("状态：1在线；2：离线")
-    @TableField("STATUS")
-    private String status;
-
-    @ApiModelProperty("激活状态：0未激活，1已激活")
-    @TableField("ACTIVE_STATUS")
-    private String activeStatus;
-
-    @ApiModelProperty("移动状态：0无人, 1活动, 2静止")
-    @TableField("MOVE_STATUS")
-    private String moveStatus;
-
-    @ApiModelProperty("在床状态：1在床, 2离床（卧室）")
-    @TableField("INBED_STATUS")
-    private String inbedStatus;
-
-    @ApiModelProperty("经度")
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-
-    @ApiModelProperty("纬度")
-    @TableField("LATITUDE")
-    private Double latitude;
-
-    @ApiModelProperty("跌到响应时间（分）")
-    @TableField("FALL_RESPONSE_TIME")
-    private Integer fallResponseTime;
-
-    @ApiModelProperty("久滞响应时间（分）")
-    @TableField("LONGLAG_RESPONSE_TIME")
-    private Integer longlagResponseTime;
-
-    @ApiModelProperty("坠床响应时间（分）")
-    @TableField("FALLINGBED_RESPONSE_TIME")
-    private Integer fallingbedResponseTime;
-
-    @ApiModelProperty("激活时间")
-    @TableField("ACTIVE_TIME")
-    private Date activeTime;
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("呼吸频率")
-    @TableField("BREATH_RATE")
-    private Integer breathRate;
-
-
-    @ApiModelProperty("心跳频率")
-    @TableField("HEART_RATE")
-    private Integer heartRate;
-
-
-    @ApiModelProperty("设备工作时接受mqtt消息的topic")
-    @TableField("TOPIC")
-    private String topic;
-
-    @ApiModelProperty("设备安装时发布房间信息的topic")
-    @TableField("TOPIC_INSTALL")
-    private String topicInstall;
-
-    @ApiModelProperty("设备工作时的mqtt的客户端ID")
-    @TableField("CLIENT_ID")
-    private String clientId;
-
-    @ApiModelProperty("设备安装时的mqtt的客户端ID")
-    @TableField("CLIENT_ID_INSTALL")
-    private String clientIdInstall;
-
-    @ApiModelProperty("备注")
-    @TableField("REMARK")
-    private String remark;
-}

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

@@ -1,143 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 事件定单表(CareEventOrder)实体类
- *
- * @author makejava
- * @since 2021-06-08 23:46:54
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_event_order")
-@ApiModel(value = "事件定单表", description = "")
-public class    CareEventOrder implements Serializable {
-    private static final long serialVersionUID = 580465519695293158L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    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("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("房屋名称")
-    @TableField("HOUSE_NAME")
-    private String houseName;
-
-    @ApiModelProperty("频安宝用户ID")
-    @TableField("MEMBER_ID")
-    private Long memberId;
-
-
-    @ApiModelProperty("设备ID")
-    @TableField("DEV_ID")
-    private Long devId;
-    @TableField("DEV_CODE")
-    private String devCode;
-
-
-    @ApiModelProperty("设备名称")
-    @TableField("DEV_NAME")
-    private String devName;
-
-
-    @ApiModelProperty("被监护人ID")
-    @TableField("OLDER_ID")
-    private Long olderId;
-
-
-    @ApiModelProperty("被监护人姓名")
-    @TableField("OLDER_NAME")
-    private String olderName;
-
-
-    @ApiModelProperty("工单标题")
-    @TableField("TITLE")
-    private String title;
-
-
-    @ApiModelProperty("工单分类： 21：跌倒 22：久滞 23坠床 31主动呼叫")
-    @TableField("ORDER_TYPE")
-    private String orderType;
-
-
-    @ApiModelProperty("语音URL，主动呼叫时有值")
-    @TableField("VOICE_URL")
-    private String voiceUrl;
-
-
-    @ApiModelProperty("状态：0未处理，1处理中，2已完成，3主动取消，4已归档")
-    @TableField("STATUS")
-    private String status;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("坐席ID")
-    @TableField("SEAT_ID")
-    private Long seatId;
-
-
-    @ApiModelProperty("坐席姓名")
-    @TableField("SEAT_NAME")
-    private String seatName;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("归档时间")
-    @TableField("FILING_TIME")
-    private Date filingTime;
-
-
-    @ApiModelProperty("完成时间")
-    @TableField("COMPLETE_TIME")
-    private Date completeTime;
-
-    @ApiModelProperty("事件目标的id")
-    @TableField("TID")
-    private Integer tid;
-}

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

@@ -1,108 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 管家工单(CareEventOrderChamb)实体类
- *
- * @author makejava
- * @since 2021-06-10 02:32:27
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_event_order_chamb")
-@ApiModel(value = "管家工单", description = "")
-public class CareEventOrderChamb implements Serializable {
-    private static final long serialVersionUID = -76114294392967396L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty("房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("工单ID")
-    @TableField("ORDER_ID")
-    private Long orderId;
-
-
-    @ApiModelProperty("管家ID")
-    @TableField("CHAMB_ID")
-    private Long chambId;
-
-
-    @ApiModelProperty("管家姓名")
-    @TableField("CHAMB_NAME")
-    private String chambName;
-
-
-    @ApiModelProperty("联系电话")
-    @TableField("PHONE")
-    private String phone;
-
-
-    @ApiModelProperty("状态： 0：待处理  1处理中  2 处理完成 3取消")
-    @TableField("STATUS")
-    private String status;
-
-    @ApiModelProperty("语音通知状态：1未联系,2未接通,3已联系")
-    @TableField("VOICE_CALL_STATUS")
-    private String voiceCallStatus;
-
-    @ApiModelProperty("到达时间")
-    @TableField("DAODA_TIME")
-    private Date daodaTime;
-
-
-    @ApiModelProperty("离开时间")
-    @TableField("LIKAI_TIME")
-    private Date likaiTime;
-
-
-    @ApiModelProperty("说明")
-    @TableField("REMARK")
-    private String remark;
-
-
-    @ApiModelProperty("现场图片 多个逗号分隔")
-    @TableField("SCENE_PIC")
-    private String scenePic;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -1,115 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 事件-紧急联系人/管家状态(CareEventOrderContactStatus)实体类
- *
- * @author makejava
- * @since 2021-06-02 21:42:11
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_event_order_contact_status")
-@ApiModel(value = "事件-紧急联系人/管家状态", description = "")
-public class CareEventOrderContactStatus implements Serializable {
-    private static final long serialVersionUID = 974899034224026188L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty("房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("工单ID")
-    @TableField("ORDER_ID")
-    private Long orderId;
-
-
-    @ApiModelProperty("联系角色 chanmb管家 contact紧联系人 older 老人")
-    @TableField("CONTACT_ROLE")
-    private String contactRole;
-
-
-    @ApiModelProperty("联系人ID")
-    @TableField("CONTACT_ID")
-    private Long contactId;
-
-
-    @ApiModelProperty("状态：1未联系,2未接通,3已联系 4无法赶往 5:已赶往 6:已到达 7申请钥匙 8已获取钥匙")
-    @TableField("STATUS")
-    private Integer status;
-
-
-    @ApiModelProperty("联系人姓名")
-    @TableField("CONTACT_NAME")
-    private String contactName;
-
-
-    @ApiModelProperty("联系电话")
-    @TableField("CONTACT_PHONE")
-    private String contactPhone;
-
-
-    @ApiModelProperty("坐席ID")
-    @TableField("SEAT_ID")
-    private Long seatId;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("关系类别")
-    @TableField("RELATION_TYPE_DESC")
-    private String relationTypeDesc;
-
-
-    @ApiModelProperty("联系级别")
-    @TableField("CONTACT_LEVEL")
-    private Integer contactLevel;
-
-
-    @ApiModelProperty("经度")
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-
-    @ApiModelProperty("纬度")
-    @TableField("LATITUDE")
-    private Double latitude;
-
-
-}

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

@@ -1,132 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 事件-处理历史(CareEventOrderHandleHis)实体类
- *
- * @author makejava
- * @since 2021-06-02 21:42:17
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_event_order_handle_his")
-@ApiModel(value = "事件-处理历史", description = "")
-public class CareEventOrderHandleHis implements Serializable {
-    private static final long serialVersionUID = 808847334145669603L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty(" 房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("工单ID")
-    @TableField("ORDER_ID")
-    private Long orderId;
-
-
-    @ApiModelProperty("日志类型：0: 老人事件  1：联系老人 2：联系紧急联系人 3联系管家 4联系120  5钥匙申请 6钥匙授权 7管家到达打卡 8管家归还钥匙 9管家离开打卡 10上报处理结果")
-    @TableField("LOG_TYPE")
-    private Integer logType;
-
-    @ApiModelProperty("工单分类： 21：跌倒 22：久滞 23坠床 31主动呼叫")
-    @TableField("ORDER_TYPE")
-    private String orderType;
-
-    @ApiModelProperty("工单分类： 21：跌倒 22：久滞 23坠床 31主动呼叫")
-    @TableField("log_object_type")
-    private String logObjectType;
-
-    @ApiModelProperty("操作对象")
-    @TableField("LOG_OBJECT_ID")
-    private Long logObjectId;
-
-
-    @ApiModelProperty("操作对象")
-    @TableField("LOG_OBJECT_NAME")
-    private String logObjectName;
-
-
-    @ApiModelProperty("操作结果")
-    @TableField("LOG_RESULT")
-    private String logResult;
-
-    @ApiModelProperty("语音通知 callid")
-    @TableField("VOICE_CALL_ID")
-    private String voiceCallId;
-
-    @ApiModelProperty("语音通知状态：1未联系,2未接通,3已联系")
-    @TableField("VOICE_CALL_STATUS")
-    private String voiceCallStatus;
-
-    @ApiModelProperty("操作结果")
-    @TableField("VOICE_FAILURE_REASON")
-    private String voiceFailureReason;
-
-    @ApiModelProperty("chanmb管家 contact紧联系人")
-    @TableField("OP_USER_ROLE")
-    private String opUserRole;
-
-
-    @ApiModelProperty("处理人ID")
-    @TableField("OP_USER_ID")
-    private Long opUserId;
-
-
-    @ApiModelProperty("处理人姓名")
-    @TableField("OP_USER_NAME")
-    private String opUserName;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("关系类别")
-    @TableField("RELATION_TYPE_DESC")
-    private String relationTypeDesc;
-
-
-    @ApiModelProperty("呼叫结果ID")
-    @TableField("CALL_RESULT_ID")
-    private Long callResultId;
-
-    @ApiModelProperty("日志步骤： 20：管家离开")
-    @TableField("log_step")
-    private String logStep;
-
-
-}

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

@@ -1,105 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 事件工单-钥匙申请记录(CareEventOrderKeyApply)实体类
- *
- * @author makejava
- * @since 2021-06-02 21:42:23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_event_order_key_apply")
-@ApiModel(value = "事件工单-钥匙申请记录", description = "")
-public class CareEventOrderKeyApply implements Serializable {
-    private static final long serialVersionUID = 149387485962236465L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty("房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("工单ID")
-    @TableField("ORDER_ID")
-    private Long orderId;
-
-
-    @ApiModelProperty("申请人角色 chanmb管家 contact紧联系人")
-    @TableField("APPLY_ROLE")
-    private String applyRole;
-
-
-    @ApiModelProperty("申请人ID")
-    @TableField("APPLY_USER_ID")
-    private Long applyUserId;
-
-
-    @ApiModelProperty("联系人姓名")
-    @TableField("APPLY_USER_NAME")
-    private String applyUserName;
-
-
-    @ApiModelProperty("状态：0:未处理 1 已授权 2已归还")
-    @TableField("STATUS")
-    private String status;
-
-
-    @ApiModelProperty("钥匙密码")
-    @TableField("KEY_PASS")
-    private String keyPass;
-
-
-    @ApiModelProperty("处理结果")
-    @TableField("HANDLE_RESULT")
-    private String handleResult;
-
-
-    @ApiModelProperty("坐席ID")
-    @TableField("SEAT_ID")
-    private Long seatId;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("关系类别")
-    @TableField("RELATION_TYPE_DESC")
-    private String relationTypeDesc;
-
-
-}

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

@@ -1,114 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 被监护人表(CareEventOrderOlder)实体类
- *
- * @author makejava
- * @since 2021-06-02 23:22:53
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_event_order_older")
-@ApiModel(value = "被监护人表", description = "")
-public class CareEventOrderOlder implements Serializable {
-    private static final long serialVersionUID = 142962079101236959L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty("房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("工单ID")
-    @TableField("ORDER_ID")
-    private Long orderId;
-
-    @ApiModelProperty("老人ID")
-    @TableField("OLDER_ID")
-    private Long olderId;
-
-
-    @ApiModelProperty("姓名")
-    @TableField("NAME")
-    private String name;
-
-
-    @ApiModelProperty("电话")
-    @TableField("PHONE")
-    private String phone;
-
-
-    @ApiModelProperty("姓名：M：男 W：女")
-    @TableField("GENDER")
-    private String gender;
-
-
-    @ApiModelProperty("生日")
-    @TableField("BIRTHDAY")
-    private Date birthday;
-
-
-    @ApiModelProperty("居住类别：1：独居 2：非独居 3：集中居住 4：其他")
-    @TableField("LIVE_TYPE")
-    private String liveType;
-
-
-    @ApiModelProperty("床号或者门牌号")
-    @TableField("BED_NUMBER")
-    private String bedNumber;
-
-
-    @ApiModelProperty("安全级别： 1 ：一级 2：二级 3: 三级")
-    @TableField("SAFE_LEVEL")
-    private String safeLevel;
-
-
-    @ApiModelProperty("状态： 0：未联系  1已联系")
-    @TableField("STATUS")
-    private Integer status;
-
-
-    @ApiModelProperty("是否主动呼叫  1是 0否")
-    @TableField("IS_ZHUDONG")
-    private Integer isZhudong;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}

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

@@ -1,116 +0,0 @@
-package com.care.common.entity;
-
-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;
-
-/**
- * 处理日志(CareHandleLog)实体类
- *
- * @author makejava
- * @since 2021-06-02 21:42:17
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_handle_log")
-@ApiModel(value = "处理日志", description = "")
-public class CareHandleLog implements Serializable {
-    private static final long serialVersionUID = 808847334145669603L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    @TableField("ORG_ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站ID")
-    @TableField("STATION_ID")
-    private Long stationId;
-
-
-    @ApiModelProperty(" 房屋ID")
-    @TableField("HOUSE_ID")
-    private Long houseId;
-
-
-    @ApiModelProperty("工单ID")
-    @TableField("ORDER_ID")
-    private Long orderId;
-
-
-    @ApiModelProperty("日志类型：0: 老人事件  1：联系老人 2：联系紧急联系人 3联系管家 4联系120  5钥匙申请 6钥匙授权 7管家到达打卡 8管家归还钥匙 9管家离开打卡 10上报处理结果")
-    @TableField("LOG_TYPE")
-    private Integer logType;
-
-    @ApiModelProperty("工单分类： 21：跌倒 22：久滞 23坠床 31主动呼叫")
-    @TableField("ORDER_TYPE")
-    private String orderType;
-
-    @ApiModelProperty("操作对象")
-    @TableField("LOG_OBJECT_ID")
-    private Long logObjectId;
-
-
-    @ApiModelProperty("操作对象")
-    @TableField("LOG_OBJECT_NAME")
-    private String logObjectName;
-
-
-    @ApiModelProperty("操作结果")
-    @TableField("LOG_RESULT")
-    private String logResult;
-
-    @ApiModelProperty("日志内容")
-    @TableField("LOG_CONTENT")
-    private String logContent;
-
-    @ApiModelProperty("chanmb管家 contact紧联系人")
-    @TableField("OP_USER_ROLE")
-    private String opUserRole;
-
-
-    @ApiModelProperty("处理人ID")
-    @TableField("OP_USER_ID")
-    private Long opUserId;
-
-
-    @ApiModelProperty("处理人姓名")
-    @TableField("OP_USER_NAME")
-    private String opUserName;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-    @ApiModelProperty("关系类别")
-    @TableField("RELATION_TYPE_DESC")
-    private String relationTypeDesc;
-
-
-    @ApiModelProperty("呼叫结果ID")
-    @TableField("CALL_RESULT_ID")
-    private Long callResultId;
-
-
-}

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

@@ -1,65 +0,0 @@
-package com.care.common.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 心率呼吸详细表(CareHeartBreathDetail)实体类
- *
- * @author makejava
- * @since 2021-11-24 00:02:00
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_heart_breath_detail")
-@ApiModel(value = "心率呼吸详细表", description = "")
-public class CareHeartBreathDetail implements Serializable {
-    private static final long serialVersionUID = -66960807410325953L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("设备ID")
-    @TableField("DEV_ID")
-    private Long devId;
-
-
-    @ApiModelProperty("心跳频率")
-    @TableField("HEART_RATE")
-    private Integer heartRate;
-
-
-    @ApiModelProperty("呼吸频率")
-    @TableField("BREATH_RATE")
-    private Integer breathRate;
-
-
-    @ApiModelProperty("createTime")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    @TableField("MODIFY_TIME")
-    private Date modifyTime;
-
-
-}