运营平台-服务站管理

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

@@ -1,9 +1,13 @@
 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;
@@ -19,6 +23,7 @@ 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;
 
 /**
@@ -35,6 +40,8 @@ public class DeviceController {
 
     @Autowired
     private DeviceService deviceService;
+    @Autowired
+    private CareDeviceService careDeviceService;
 
     @GetMapping("/list")
     @ApiOperation(value = "设备列表分页--二期修改")
@@ -125,5 +132,48 @@ public class DeviceController {
             return Result.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<DeviceVO> vos) {
+        try {
+
+            if (CollUtil.isEmpty(vos)) {
+                return Result.error("分配设备列表不能为空！");
+            }
+            List<CareDevice> careDevices = new ArrayList<>();
+            for (DeviceVO 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/operate/controller/OpSysUserController.java

@@ -1,7 +1,8 @@
-package com.care.operate.controller;
+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;
@@ -12,7 +13,6 @@ import com.care.common.util.WebPageUtils;
 import com.care.common.vo.PageReqVO;
 import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.vo.sysuser.CareSysUserVO;
-import com.care.operate.service.OpSysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -32,14 +32,14 @@ import java.util.List;
  * @Desc:
  */
 @RestController
-@Api(value = "OpSysUserController", tags = { "运营端-服务站账号管理" })
+@Api(value = "StationAccountController", tags = { "服务站账号管理" })
 @Slf4j
-@RequestMapping("/operate/sysuser")
+@RequestMapping("/bms/sysuser")
 @Permission
-public class OpSysUserController {
+public class StationAccountController {
 
     @Autowired
-    private OpSysUserService opSysUserService;
+    private BmsSysUserService bmsSysUserService;
 
     @Autowired
     private CareSysUserService careSysUserService;
@@ -54,7 +54,7 @@ public class OpSysUserController {
                                                PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<CareSysUserVO> pageResponse = this.opSysUserService.listStationAccount(stationName,loginUser ,pageReqVo);
+            IPage<CareSysUserVO> pageResponse = this.bmsSysUserService.listStationAccount(stationName,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("服务站账号列表查询-分页列表出现异常",e);
@@ -75,7 +75,7 @@ public class OpSysUserController {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             String md5Password = DigestUtils.md5Hex("123456");
             vo.setPassword(md5Password);
-            int flag = this.opSysUserService.createCareSysUser(vo,loginUser);
+            int flag = this.bmsSysUserService.createStationAccount(vo,loginUser);
             if (flag == 1) {
                 return  Result.error("电话已存在！");
             } else if (flag == 0) {
@@ -98,7 +98,7 @@ public class OpSysUserController {
     public Result<Object> updateStationAccount(HttpServletRequest request,@RequestHeader("token") String token,
                                  @RequestBody CareSysUserVO vo){
         try {
-            this.opSysUserService.updateCareSysUser(vo);
+            this.bmsSysUserService.updateStationAccount(vo);
             return  Result.success("修改成功！");
         }catch (BDException e) {
             log.error("修改服务站账号-出现异常",e);
@@ -137,7 +137,7 @@ public class OpSysUserController {
     @GetMapping("/getStationAccountInfo/{stationAccountId}")
     @ApiOperation(value = "服务站账号详情  --四期新增")
     public Result<CareSysUserVO> getStationAccountInfo(@RequestHeader("token") String token,@PathVariable("stationAccountId") Long stationAccountId){
-        CareSysUserVO orderInfo = this.opSysUserService.getCareSysUserById(stationAccountId);
+        CareSysUserVO orderInfo = this.bmsSysUserService.getStationAccountById(stationAccountId);
         return  Result.success("查询成功！",orderInfo);
     }
 

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

@@ -1,19 +1,32 @@
 package com.care.bms.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.care.bms.service.StationService;
 import com.care.common.annotation.Permission;
+import com.care.common.entity.CareStation;
+import com.care.common.exception.BDException;
+import com.care.common.service.CareStationService;
+import com.care.common.util.PageResult;
+import com.care.common.util.RandomCodeUtil;
 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.StationVO;
+import com.care.common.vo.station.CareStationVO;
 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.List;
 
@@ -32,6 +45,11 @@ public class StationController {
     @Autowired
     private StationService stationService;
 
+    @Resource
+    private CareStationService careStationService;
+
+
+
     /**
      *服务站下拉列表
      * @param request
@@ -50,4 +68,96 @@ public class StationController {
         }
     }
 
+    @PostMapping("/addStation")
+    @ApiOperation(value = "新增服务站 -- 四期新增")
+    public Result<Object> addStation(HttpServletRequest request,@RequestHeader("token") String token,
+                                     @RequestBody CareStationVO vo){
+        try {
+            QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(CareStation::getName,vo.getName());
+            CareStation careStationDb = this.careStationService.getOne(queryWrapper);
+            if(careStationDb != null ){
+                return  Result.error("名称已经存在已存在！");
+            }
+
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            CareStation careStation = new CareStation();
+            BeanUtil.copyProperties(vo,careStation);
+            careStation.setOrgId(loginUser.getOrgId());
+            careStation.setCode(getCode());
+            boolean flag = this.careStationService.save(careStation);
+            if (flag) {
+                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("新增失败！");
+        }
+    }
+
+    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();
+        }
+    }
+
+    @PostMapping("/updateStation")
+    @ApiOperation(value = "修改服务站 --四期新增")
+    public Result<Object> updateStation(@RequestHeader("token") String token,
+                                        @RequestBody CareStationVO 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<CareStationVO> getStationInfo(@RequestHeader("token") String token,@PathVariable("stationId") Long stationId){
+        CareStationVO vo = new CareStationVO();
+        CareStation stationInfo = this.careStationService.getById(stationId);
+        BeanUtil.copyProperties(stationInfo,vo);
+        return  Result.success("查询成功！",vo);
+    }
+
+    @GetMapping("/listStation")
+    @ApiOperation(value = "服务站列表分页  --四期新增")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(paramType = "query", name = "name", value = "服务站名称")
+    })
+    public PageResult<List<CareStationVO>> listStation(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                       @RequestParam(value = "name", required = false) String name,
+                                                       PageReqVO pageReqVo){
+        try {
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            IPage<CareStationVO> pageResponse = this.stationService.listCareStation(name,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( "获取列表失败");
+        }
+    }
 }

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

@@ -338,4 +338,123 @@ public class BmsSysUserService{
 
     }
 
+
+    /**
+     * 服务站账号列表分页
+     * @param stationName
+     * @return
+     */
+    public IPage<CareSysUserVO> listStationAccount(String stationName,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+        Long stationId = null;
+
+        QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
+        queryWrapper0.lambda().like(StrUtil.isNotEmpty(stationName),CareStation::getName,stationName);
+        CareStation careStation = careStationService.getOne(queryWrapper0);
+        if (careStation != null){
+            stationId = careStation.getId();
+        }
+        IPage<CareSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
+        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda() .eq(stationId != null,CareSysUser::getStationId,stationId)
+                .eq(CareSysUser::getOrgId,loginUser.getOrgId())
+                .eq(CareSysUser::getRole,UserRoleEnum.STATION.getValue())
+                .orderByAsc(CareSysUser::getName);
+
+        IPage<CareSysUser> pageRes = this.careSysUserService.page(page, queryWrapper);
+        IPage<CareSysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+        if(CollUtil.isNotEmpty(pageRes.getRecords())){
+            List<CareSysUserVO> list = new ArrayList<>();
+            pageRes.getRecords().forEach(item -> {
+                CareSysUserVO  resVO = new CareSysUserVO();
+                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()));
+                list.add(resVO);
+            });
+            results.setRecords(list);
+        }
+        return results;
+    }
+
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    public CareSysUserVO getStationAccountById(Long id){
+        CareSysUser careSysUser = this.careSysUserService.getById(id);
+        if (careSysUser!=null){
+            CareSysUserVO resVO = new CareSysUserVO();
+            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(CareSysUserVO 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.STATION.getValue());
+        careSysUser.setOrgId(loginUser.getOrgId());
+
+        this.careSysUserService.save(careSysUser);
+
+        return 0;
+    }
+
+    /**
+     * 修改服务站账号
+     * @param vo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStationAccount(CareSysUserVO 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/StationService.java

@@ -2,15 +2,24 @@ 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.CareStation;
+import com.care.common.service.CareDeviceService;
 import com.care.common.service.CareStationService;
+import com.care.common.vo.PageReqVO;
 import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.vo.device.StationVO;
+import com.care.common.vo.station.CareStationVO;
 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.List;
 
 /**
@@ -22,6 +31,37 @@ import java.util.List;
 public class StationService {
     @Resource
     private CareStationService careStationService;
+    @Resource
+    private CareDeviceService careDeviceService;
+    /**
+     * 查询服务站列表
+     * @return
+     */
+    public IPage<CareStationVO> listCareStation(String name, 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(CareStation::getOrgId,loginUser.getOrgId())
+                .orderByAsc(CareStation::getName);
+
+        IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);
+        IPage<CareStationVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+        if(CollUtil.isNotEmpty(pageRes.getRecords())){
+            List<CareStationVO> list = new ArrayList<>();
+            pageRes.getRecords().forEach(item -> {
+                CareStationVO  resVO = new CareStationVO();
+                BeanUtils.copyProperties(item,resVO);
+                //服务设备数量
+                QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.lambda().eq(CareDevice::getOrgId,loginUser.getOrgId());
+                resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
+                list.add(resVO);
+            });
+            results.setRecords(list);
+        }
+        return results;
+    }
+
 
     /**
      * 查询登陆人，所能看到的 服务站列表

src/main/java/com/care/operate/controller/OpDeviceController.java

@@ -1,131 +0,0 @@
-package com.care.operate.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: stw
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "OpDeviceController", tags = { "运营端-设备管理" })
-@Slf4j
-@RequestMapping("/operate/device")
-@Permission
-public class OpDeviceController {
-
-    @Autowired
-    private DeviceService deviceService;
-    @Autowired
-    private CareDeviceService careDeviceService;
-
-    @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"),
-    })
-    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,
-                                                 PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<DeviceVO> pageResponse = this.deviceService.listDevice(stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,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<DeviceVO> vos){
-        try {
-
-            if(CollUtil.isEmpty(vos)){
-                return  Result.error("分配设备列表不能为空！");
-            }
-            List<CareDevice> careDevices = new ArrayList<>();
-            for (DeviceVO 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/operate/controller/OpEventHandleController.java

@@ -1,416 +0,0 @@
-package com.care.operate.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.annotation.Permission;
-import com.care.common.entity.CareEventOrderChamb;
-import com.care.common.enums.CallResultEnum;
-import com.care.common.enums.OrderStatusEnum;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareEventOrderChambService;
-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.order.*;
-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 = "OpEventHandleController", tags = { "运营端-事件处理" })
-@Slf4j
-@RequestMapping("/operate/event")
-@Permission
-public class OpEventHandleController {
-
-    @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/operate/controller/OpMemberInfoController.java

@@ -1,82 +0,0 @@
-package com.care.operate.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 = "OpMemberInfoController", tags = { "运营端-后台用户管理" })
-@Slf4j
-@RequestMapping("/operate/memberinfo")
-@Permission
-public class OpMemberInfoController {
-
-    @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 null;
-            }
-
-        }catch (BDException e) {
-            log.error("用户列表查询-分页列表出现异常",e);
-            return  PageResult.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("用户管理: 用户列表查询出现异常",e);
-            return PageResult.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("更新失败！");
-        }
-    }
-
-
-}

src/main/java/com/care/operate/controller/OpStationController.java

@@ -1,142 +0,0 @@
-package com.care.operate.controller;
-
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.common.annotation.Permission;
-import com.care.common.entity.CareStation;
-import com.care.common.exception.BDException;
-import com.care.common.service.CareStationService;
-import com.care.common.util.PageResult;
-import com.care.common.util.RandomCodeUtil;
-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.station.CareStationVO;
-import com.care.operate.service.OpStationService;
-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.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-
-/**
- * @Author: stw
- * @Date: 2021/5/26
- * @Desc:
- */
-@RestController
-@Api(value = "OpStationController", tags = { "运营端-服务站管理" })
-@Slf4j
-@RequestMapping("/operate/station")
-@Permission
-public class OpStationController {
-
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private OpStationService opStationService;
-
-    @PostMapping("/addStation")
-    @ApiOperation(value = "新增服务站 -- 四期新增")
-    public Result<Object> addStation(HttpServletRequest request,@RequestHeader("token") String token,
-                                    @RequestBody CareStationVO vo){
-        try {
-            QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(CareStation::getName,vo.getName());
-            CareStation careStationDb = this.careStationService.getOne(queryWrapper);
-            if(careStationDb != null ){
-                return  Result.error("名称已经存在已存在！");
-            }
-
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            CareStation careStation = new CareStation();
-            BeanUtil.copyProperties(vo,careStation);
-            careStation.setOrgId(loginUser.getOrgId());
-            careStation.setCode(getCode());
-            boolean flag = this.careStationService.save(careStation);
-            if (flag) {
-                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("新增失败！");
-        }
-    }
-
-    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();
-        }
-    }
-
-    @PostMapping("/updateStation")
-    @ApiOperation(value = "修改服务站 --四期新增")
-    public Result<Object> updateStation(@RequestHeader("token") String token,
-                                       @RequestBody CareStationVO 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<CareStationVO> getStationInfo(@RequestHeader("token") String token,@PathVariable("stationId") Long stationId){
-        CareStationVO vo = new CareStationVO();
-        CareStation stationInfo = this.careStationService.getById(stationId);
-        BeanUtil.copyProperties(stationInfo,vo);
-        return  Result.success("查询成功！",vo);
-    }
-
-    @GetMapping("/listStation")
-    @ApiOperation(value = "服务站列表分页  --四期新增")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "name", value = "服务站名称")
-    })
-    public PageResult<List<CareStationVO>> listStation(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                      @RequestParam(value = "name", required = false) String name,
-                                                      PageReqVO pageReqVo){
-        try {
-            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<CareStationVO> pageResponse = this.opStationService.listCareStation(name,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( "获取列表失败");
-        }
-    }
-}

src/main/java/com/care/operate/service/OpStationService.java

@@ -1,64 +0,0 @@
-package com.care.operate.service;
-
-
-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.CareStation;
-import com.care.common.service.CareDeviceService;
-import com.care.common.service.CareStationService;
-import com.care.common.vo.PageReqVO;
-import com.care.common.vo.UserLogindConvertVO;
-
-import com.care.common.vo.station.CareStationVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: lilt
- * @Date: 2021/7/14
- * @Desc:
- */
-@Service
-public class OpStationService {
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    /**
-     * 查询服务站列表
-     * @return
-     */
-    public IPage<CareStationVO> listCareStation(String name, 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(CareStation::getOrgId,loginUser.getOrgId())
-                .orderByAsc(CareStation::getName);
-
-        IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);
-        IPage<CareStationVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-        if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<CareStationVO> list = new ArrayList<>();
-            pageRes.getRecords().forEach(item -> {
-                CareStationVO  resVO = new CareStationVO();
-                BeanUtils.copyProperties(item,resVO);
-                //服务设备数量
-                QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.lambda().eq(CareDevice::getOrgId,loginUser.getOrgId());
-                resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
-                list.add(resVO);
-            });
-            results.setRecords(list);
-        }
-        return results;
-    }
-
-}

src/main/java/com/care/operate/service/OpSysUserService.java

@@ -1,171 +0,0 @@
-package com.care.operate.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.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.CareSysUserVO;
-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 OpSysUserService {
-
-    @Resource
-    private CareOrganizationService careOrganizationService;
-    @Resource
-    private CareStationService careStationService;
-    @Resource
-    private CareSysUserService careSysUserService;
-    @Resource
-    private CareDeviceService careDeviceService;
-    @Resource
-    private CareEventOrderChambService careEventOrderChambService;
-    @Resource
-    private CareHouseService careHouseService;
-
-
-    /**
-     * 服务站账号列表分页
-     * @param stationName
-     * @return
-             */
-    public IPage<CareSysUserVO> listStationAccount(String stationName,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-        Long stationId = null;
-
-        QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
-        queryWrapper0.lambda().like(StrUtil.isNotEmpty(stationName),CareStation::getName,stationName);
-        CareStation careStation = careStationService.getOne(queryWrapper0);
-        if (careStation != null){
-            stationId = careStation.getId();
-        }
-        IPage<CareSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda() .eq(stationId != null,CareSysUser::getStationId,stationId)
-                .eq(CareSysUser::getOrgId,loginUser.getOrgId())
-                .eq(CareSysUser::getRole,UserRoleEnum.STATION.getValue())
-                .orderByAsc(CareSysUser::getName);
-
-        IPage<CareSysUser> pageRes = this.careSysUserService.page(page, queryWrapper);
-        IPage<CareSysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
-        if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<CareSysUserVO> list = new ArrayList<>();
-            pageRes.getRecords().forEach(item -> {
-                CareSysUserVO  resVO = new CareSysUserVO();
-                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()));
-                list.add(resVO);
-            });
-            results.setRecords(list);
-        }
-        return results;
-    }
-
-
-    /**
-     * 详情
-     * @param id
-     * @return
-     */
-    public CareSysUserVO getCareSysUserById(Long id){
-        CareSysUser careSysUser = this.careSysUserService.getById(id);
-        if (careSysUser!=null){
-            CareSysUserVO resVO = new CareSysUserVO();
-            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 createCareSysUser(CareSysUserVO 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.STATION.getValue());
-        careSysUser.setOrgId(loginUser.getOrgId());
-
-        this.careSysUserService.save(careSysUser);
-
-        return 0;
-    }
-
-    /**
-     * 修改服务站账号
-     * @param vo
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCareSysUser(CareSysUserVO vo){
-        //保存服务站账号
-        CareSysUser careSysUser = this.careSysUserService.getById(vo.getId());
-        BeanUtil.copyProperties(vo,careSysUser);
-        careSysUser.setModifyTime(new Date());
-        this.careSysUserService.updateById(careSysUser);
-     }
-
-}