机构管理

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

@@ -132,4 +132,24 @@ public class DeviceController {
         }
     }
 
+    @GetMapping("/synDev")
+    @ApiOperation(value = "同步设备 -- 四期新增")
+    public Result<Object> synDev(@RequestHeader("token") String token,
+            @RequestParam(value = "companyId", required =  true) String companyId) {
+        try {
+            if (deviceService.synDev(companyId)){
+                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/MemberInfoController.java

@@ -85,7 +85,7 @@ public class MemberInfoController {
 
 
     @PostMapping("/updateMemberInfoStatus/{memberId}/{status}")
-    @ApiOperation(value = "修改用户状态，状态：0可用，1禁用   --二期新增")
+    @ApiOperation(value = "修改用户状态，状态：0可用，1停用   --二期新增")
     public Result<Object> updateMemberInfoStatus(@RequestHeader("token") String token,
                                                  @PathVariable("memberId") Long memberId,
                                                  @PathVariable("status") String status) {

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

@@ -1,15 +1,12 @@
 package com.care.bms.controller;
 
 
-import cn.hutool.core.bean.BeanUtil;
 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.CareOrganization;
 import com.care.common.entity.CareSysUser;
 import com.care.common.exception.BDException;
-import com.care.common.service.CareOrganizationService;
 import com.care.common.service.CareSysUserService;
 import com.care.common.util.PageResult;
 import com.care.common.util.Result;
@@ -46,10 +43,24 @@ public class OrganizationController {
     @Autowired
     private OrganizationService organizationService;
 
-    @Resource
-    private CareOrganizationService careOrganizationService;
     @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 {
+            List<OrganizationVO> datas = this.organizationService.queryOrgsForSelect();
+            return Result.success(datas);
+        }catch (Exception e) {
+            log.error("机构管理: 机构下拉列表查询出现异常",e);
+            return Result.error( "获取列表失败");
+        }
+    }
 
     @GetMapping("/listOrganization")
     @ApiOperation(value = "机构列表分页  --四期新增")
@@ -110,6 +121,22 @@ public class OrganizationController {
         }
     }
 
+    @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){
@@ -145,4 +172,6 @@ public class OrganizationController {
             return Result.error("重置密码失败！");
         }
     }
+
+
 }

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

@@ -12,7 +12,7 @@ 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.CareSysUserVO;
+import com.care.common.vo.sysuser.SysUserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -49,12 +49,12 @@ public class StationAccountController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "stationName", value = "服务站名称")
     })
-    public PageResult<List<CareSysUserVO>> listStationAccount(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                               @RequestParam(value = "stationName", required = false) String stationName,
-                                               PageReqVO pageReqVo){
+    public PageResult<List<SysUserVO>> listStationAccount(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                          @RequestParam(value = "stationName", required = false) String stationName,
+                                                          PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<CareSysUserVO> pageResponse = this.bmsSysUserService.listStationAccount(stationName,loginUser ,pageReqVo);
+            IPage<SysUserVO> pageResponse = this.bmsSysUserService.listStationAccount(stationName,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("服务站账号列表查询-分页列表出现异常",e);
@@ -69,7 +69,7 @@ public class StationAccountController {
     @PostMapping("/addStationAccount")
     @ApiOperation(value = "新增服务站账号 --四期新增")
     public Result<Object> addStationAccount(HttpServletRequest request,@RequestHeader("token") String token,
-                                   @RequestBody CareSysUserVO vo){
+                                   @RequestBody SysUserVO vo){
         try {
 
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
@@ -92,9 +92,9 @@ public class StationAccountController {
     }
 
     @PostMapping("/updateStationAccount")
-    @ApiOperation(value = "修改服务站账号 （启用禁用也用这个接口，设置id和validStatus（0启用，1禁用）） --四期新增")
+    @ApiOperation(value = "修改服务站账号 （启用停用也用这个接口，只设置id和validStatus（0启用，1停用）） --四期新增")
     public Result<Object> updateStationAccount(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @RequestBody CareSysUserVO vo){
+                                 @RequestBody SysUserVO vo){
         try {
             this.bmsSysUserService.updateStationAccount(vo);
             return  Result.success("修改成功！");
@@ -134,8 +134,8 @@ public class StationAccountController {
 
     @GetMapping("/getStationAccountInfo/{stationAccountId}")
     @ApiOperation(value = "服务站账号详情  --四期新增")
-    public Result<CareSysUserVO> getStationAccountInfo(@RequestHeader("token") String token,@PathVariable("stationAccountId") Long stationAccountId){
-        CareSysUserVO orderInfo = this.bmsSysUserService.getStationAccountById(stationAccountId);
+    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

@@ -19,8 +19,8 @@ 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.device.StationVO;
-import com.care.common.vo.station.CareStationVO;
+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;
@@ -79,7 +79,7 @@ public class StationController {
     @PostMapping("/addStation")
     @ApiOperation(value = "新增服务站 -- 四期新增")
     public Result<Object> addStation(HttpServletRequest request,@RequestHeader("token") String token,
-                                     @RequestBody CareStationVO vo){
+                                     @RequestBody StationVO vo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             vo.setOrgId(loginUser.getOrgId());
@@ -99,7 +99,7 @@ public class StationController {
     @PostMapping("/updateStation")
     @ApiOperation(value = "修改服务站 --四期新增")
     public Result<Object> updateStation(@RequestHeader("token") String token,
-                                        @RequestBody CareStationVO vo){
+                                        @RequestBody StationVO vo){
         try {
             CareStation careStation = new CareStation();
             BeanUtil.copyProperties(vo,careStation);
@@ -116,10 +116,8 @@ public class StationController {
 
     @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);
+    public Result<StationVO> getStationInfo(@RequestHeader("token") String token,@PathVariable("stationId") Long stationId){
+        StationVO vo = this.stationService.getStationInfo(stationId);
         return  Result.success("查询成功！",vo);
     }
 
@@ -128,12 +126,12 @@ public class StationController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "name", value = "服务站名称")
     })
-    public PageResult<List<CareStationVO>> listStation(HttpServletRequest request, @RequestHeader(value = "token") String token,
+    public PageResult<List<StationVO>> 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.listStation(name,loginUser ,pageReqVo);
+            IPage<StationVO> pageResponse = this.stationService.listStation(name,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("服务站列表查询-分页列表出现异常",e);

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

@@ -1,11 +1,8 @@
 package com.care.bms.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.care.bms.service.BmsSysUserService;
 import com.care.common.annotation.Permission;
-import com.care.common.entity.CareDevice;
-import com.care.common.entity.CareSysUser;
 import com.care.common.exception.BDException;
 import com.care.common.util.PageResult;
 import com.care.common.util.Result;
@@ -13,7 +10,7 @@ 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.CareSysUserVO;
+import com.care.common.vo.sysuser.SysUserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -48,8 +45,8 @@ public class SysUserController {
      */
     @GetMapping("/listKeeper4Select")
     @ApiOperation(value = "登陆人所属机构、服务站下的管家下拉列表")
-    public Result<List<CareSysUserVO>> listNotHandle(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                                     @RequestParam(name = "stationId", required = false) Long stationId){
+    public Result<List<SysUserVO>> listNotHandle(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                 @RequestParam(name = "stationId", required = false) Long stationId){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
             Long orgId = loginUser.getOrgId();
@@ -57,7 +54,7 @@ public class SysUserController {
                 stationId = loginUser.getStationId();
             }
 
-            List<CareSysUserVO> datas = this.bmsSysUserService.queryKeeperListByStationId(orgId,stationId);
+            List<SysUserVO> datas = this.bmsSysUserService.queryKeeperListByStationId(orgId,stationId);
             return Result.success(datas);
         }catch (Exception e) {
             log.error("某个服务站下的管家下拉列表出现异常",e);
@@ -73,14 +70,14 @@ public class SysUserController {
             @ApiImplicitParam(paramType = "query", name = "phone", value = "电话"),
             @ApiImplicitParam(paramType = "query", name = "stationId", value = "服务站ID"),
     })
-    public PageResult<List<CareSysUserVO>> 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){
+    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<CareSysUserVO> pageResponse = this.bmsSysUserService.listCareSysUser(name,phone,stationId,loginUser ,pageReqVo);
+            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);
@@ -102,7 +99,7 @@ public class SysUserController {
     @PostMapping("/addKeeper")
     @ApiOperation(value = "新增管家 --二期新增")
     public Result<Object> addKeeper(HttpServletRequest request,@RequestHeader("token") String token,
-                                   @RequestBody CareSysUserVO vo){
+                                   @RequestBody SysUserVO vo){
         try {
 
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
@@ -129,7 +126,7 @@ public class SysUserController {
     @PostMapping("/updateKeeper")
     @ApiOperation(value = "修改管家 --二期新增")
     public Result<Object> updateKeeper(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @RequestBody CareSysUserVO vo){
+                                 @RequestBody SysUserVO vo){
         try {
             this.bmsSysUserService.updateCareSysUser(vo);
             return  Result.success("修改成功！");
@@ -144,9 +141,9 @@ public class SysUserController {
 
     @GetMapping("/getKeeperInfo/{chambId}")
     @ApiOperation(value = "管家详情  --二期新增")
-    public Result<CareSysUserVO> getKeeperInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("chambId") Long chambId){
+    public Result<SysUserVO> getKeeperInfo(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("chambId") Long chambId){
         UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-        CareSysUserVO orderInfo = this.bmsSysUserService.getCareSysUserById(chambId,loginUser);
+        SysUserVO orderInfo = this.bmsSysUserService.getCareSysUserById(chambId,loginUser);
         return  Result.success("查询成功！",orderInfo);
     }
 

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.care.common.entity.*;
 
 import com.care.common.enums.DeviceActiveStatusEnum;
-import com.care.common.enums.OlderLiveTypeEnum;
 import com.care.common.enums.UserRoleEnum;
 import com.care.common.enums.ValidStatusEnum;
 import com.care.common.exception.BDException;
@@ -19,7 +18,7 @@ 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 com.care.common.vo.sysuser.SysUserVO;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -68,6 +67,22 @@ public class BmsSysUserService{
         if (user != 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();
+            Date now = DateUtils.strToDate(DateUtils.getCurrYyyy_MM_ddDate(),"yyyy-MM-dd");
+            if(servEndDate0 != null || servEndDate0 != null) {
+                if ( now.before(servStartDate0) || now.after(servEndDate0)) {
+                    throw new BDException("该用户所属机构没在有效期");
+                }
+            }
+
+            if (ValidStatusEnum.INVALID.getValue().equals(org.getValidStatus())) {
+                throw new BDException("该用户所属机构已经停用");
+            }
 
             userLogindConvertVO = new UserLogindConvertVO();
             BeanUtil.copyProperties(user,userLogindConvertVO);
@@ -79,11 +94,10 @@ public class BmsSysUserService{
                 throw new BDException("用户名或密码错误");
             }
             if (ValidStatusEnum.INVALID.getValue().equals(user.getValidStatus())) {
-                throw new BDException("用户已经禁用");
+                throw new BDException("用户已经停用");
             }
             Date servStartDate = user.getServStartDate();
             Date servEndDate = user.getServEndDate();
-            Date now = DateUtils.strToDate(DateUtils.getCurrYyyy_MM_ddDate(),"yyyy-MM-dd");
             if(servStartDate != null || servEndDate != null) {
                 if ( now.before(servStartDate) || now.after(servEndDate)) {
                     throw new BDException("用户没在有效期");
@@ -98,8 +112,8 @@ public class BmsSysUserService{
      * @param stationId
      * @return
      */
-    public List<CareSysUserVO> queryKeeperListByStationId(Long orgId,Long stationId){
-        List<CareSysUserVO> datas = new ArrayList<>();
+    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(CareSysUser::getStationId,stationId)
                 .eq(CareSysUser::getRole, UserRoleEnum.CHANMB.getValue())
@@ -107,7 +121,7 @@ public class BmsSysUserService{
         List<CareSysUser> users = this.careSysUserService.list(userQueryWrapper);
         if (users != null){
             users.forEach(item -> {
-                CareSysUserVO vo = new CareSysUserVO();
+                SysUserVO vo = new SysUserVO();
                 BeanUtil.copyProperties(item,vo);
                 datas.add(vo);
             });
@@ -120,7 +134,7 @@ public class BmsSysUserService{
      * @param stationId
      * @return
              */
-    public IPage<CareSysUserVO> listCareSysUser(String name,String phone, Long stationId,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    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)
@@ -132,11 +146,11 @@ public class BmsSysUserService{
                     .orderByAsc(CareSysUser::getName);
 
             IPage<CareSysUser> pageRes = this.careSysUserService.page(page, queryWrapper);
-            IPage<CareSysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+            IPage<SysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
             if(CollUtil.isNotEmpty(pageRes.getRecords())){
-                List<CareSysUserVO> list = new ArrayList<>();
+                List<SysUserVO> list = new ArrayList<>();
                 pageRes.getRecords().forEach(item -> {
-                    CareSysUserVO  resVO = new CareSysUserVO();
+                    SysUserVO resVO = new SysUserVO();
                     BeanUtils.copyProperties(item,resVO);
                     //服务设备数量
                     QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
@@ -185,10 +199,10 @@ public class BmsSysUserService{
      * @param id
      * @return
      */
-    public CareSysUserVO getCareSysUserById(Long id,UserLogindConvertVO loginUser){
+    public SysUserVO getCareSysUserById(Long id, UserLogindConvertVO loginUser){
         CareSysUser careSysUser = this.careSysUserService.getById(id);
         if (careSysUser!=null){
-            CareSysUserVO resVO = new CareSysUserVO();
+            SysUserVO resVO = new SysUserVO();
             BeanUtil.copyProperties(careSysUser,resVO);
 
             //服务设备数量和列表
@@ -264,7 +278,7 @@ public class BmsSysUserService{
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createCareSysUser(CareSysUserVO vo,UserLogindConvertVO loginUser){
+    public int createCareSysUser(SysUserVO vo, UserLogindConvertVO loginUser){
         QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareSysUser::getPhone,vo.getPhone());
         if(careSysUserService.count(queryWrapper) > 0){
@@ -297,7 +311,7 @@ public class BmsSysUserService{
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateCareSysUser(CareSysUserVO vo){
+    public void updateCareSysUser(SysUserVO vo){
         //保存管家
         CareSysUser careSysUser = this.careSysUserService.getById(vo.getId());
         MyBeanUtils.copyProperties(vo,careSysUser);
@@ -344,7 +358,7 @@ public class BmsSysUserService{
      * @param stationName
      * @return
      */
-    public IPage<CareSysUserVO> listStationAccount(String stationName,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<SysUserVO> listStationAccount(String stationName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         Long stationId = null;
 
         QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
@@ -361,11 +375,11 @@ public class BmsSysUserService{
                 .orderByAsc(CareSysUser::getName);
 
         IPage<CareSysUser> pageRes = this.careSysUserService.page(page, queryWrapper);
-        IPage<CareSysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+        IPage<SysUserVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
         if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<CareSysUserVO> list = new ArrayList<>();
+            List<SysUserVO> list = new ArrayList<>();
             pageRes.getRecords().forEach(item -> {
-                CareSysUserVO  resVO = new CareSysUserVO();
+                SysUserVO resVO = new SysUserVO();
                 BeanUtils.copyProperties(item,resVO);
                 //服务设备数量
                 QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
@@ -386,10 +400,10 @@ public class BmsSysUserService{
      * @param id
      * @return
      */
-    public CareSysUserVO getStationAccountById(Long id){
+    public SysUserVO getStationAccountById(Long id){
         CareSysUser careSysUser = this.careSysUserService.getById(id);
         if (careSysUser!=null){
-            CareSysUserVO resVO = new CareSysUserVO();
+            SysUserVO resVO = new SysUserVO();
             BeanUtil.copyProperties(careSysUser,resVO);
 
             //服务设备列表
@@ -426,7 +440,7 @@ public class BmsSysUserService{
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public int createStationAccount(CareSysUserVO vo,UserLogindConvertVO loginUser){
+    public int createStationAccount(SysUserVO vo, UserLogindConvertVO loginUser){
         QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareSysUser::getPhone,vo.getPhone());
         if(careSysUserService.count(queryWrapper) > 0){
@@ -451,7 +465,7 @@ public class BmsSysUserService{
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateStationAccount(CareSysUserVO vo){
+    public void updateStationAccount(SysUserVO vo){
         //保存服务站账号
         CareSysUser careSysUser = this.careSysUserService.getById(vo.getId());
         BeanUtil.copyProperties(vo,careSysUser);

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

@@ -3,12 +3,15 @@ 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;
@@ -23,10 +26,7 @@ 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;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @Author: lilt
@@ -56,11 +56,15 @@ public class DeviceService {
     @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
@@ -371,4 +375,46 @@ public class DeviceService {
     public IPage<DeviceVO> listDeviceNonStation(UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         return this.careDeviceService.listDeviceNonStation(pageReqVo,loginUser);
     }
+
+    /**
+     * 同步机构
+     */
+    public boolean synDev(String companyId) {
+
+        try {
+            // 通过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();
+
+                while (it.hasNext()) {
+                    JSONObject obj = (JSONObject) it.next();
+
+                    QueryWrapper<CareOrganization> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.lambda().eq(CareOrganization::getCompanyId,companyId);
+                    CareOrganization careOrganization = this.careOrganizationService.getOne(queryWrapper1);
+                    if(careOrganization != null) {
+                        CareDevice careDevice = new CareDevice();
+                        careDevice.setDevCode(obj.getStr("mdid"));
+                        careDevice.setOrgId(careOrganization.getId());
+                        careDeviceService.synDev(careDevice);
+                    } else {
+                        continue;
+                    }
+                }
+
+                return true;
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+
 }

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

@@ -3,16 +3,12 @@ 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.crypto.SecureUtil;
 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.CareMemberInfo;
 import com.care.common.entity.CareStation;
-import com.care.common.entity.CareSysUser;
 import com.care.common.enums.KeyEscrowTypeEnum;
-import com.care.common.exception.BDException;
 import com.care.common.service.CareHouseService;
 import com.care.common.service.CareMemberInfoService;
 import com.care.common.service.CareStationService;
@@ -20,7 +16,6 @@ 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 com.care.common.vo.sysuser.CareSysUserVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -26,9 +26,10 @@ 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.CareStationVO;
-import com.care.common.vo.sysuser.CareSysUserVO;
+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;
@@ -67,6 +68,25 @@ public class OrganizationService {
     @Value("${syn.org.url:#{null}}")
     private String synOrgUrl;
 
+
+    /**
+     * 查询登陆人，所能看到的 机构列表
+     * @return
+     */
+    public List<OrganizationVO> queryOrgsForSelect(){
+        List<OrganizationVO> datas = Lists.newArrayList();
+
+        List<CareOrganization> organizations = this.careOrganizationService.list();
+        if (CollUtil.isNotEmpty(organizations)){
+            organizations.forEach(item -> {
+                OrganizationVO vo = new OrganizationVO();
+                BeanUtil.copyProperties(item,vo);
+                datas.add(vo);
+            });
+        }
+        return datas;
+    }
+
     /**
      * 查询服务站列表
      *
@@ -119,9 +139,9 @@ public class OrganizationService {
         QueryWrapper<CareSysUser> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.lambda().eq(CareSysUser::getOrgId, organizationId).eq(CareSysUser::getRole,UserRoleEnum.ORG);
         CareSysUser careSysUser = this.careSysUserService.getOne(queryWrapper2);
-        CareSysUserVO careSysUserVO = new CareSysUserVO();
-        BeanUtil.copyProperties(careSysUser,careSysUserVO);
-        vo.setCareSysUserVO(careSysUserVO);
+        SysUserVO sysUserVO = new SysUserVO();
+        BeanUtil.copyProperties(careSysUser, sysUserVO);
+        vo.setSysUserVO(sysUserVO);
 
         return vo;
     }
@@ -168,7 +188,7 @@ public class OrganizationService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateOrganization(OrganizationVO vo) throws Exception {
-        Result<Object> ret = Result.success("修改成功！");
+
         MultipartFile logoImg = vo.getLogoImg();
         if (logoImg != null) {
             //获取文件名
@@ -194,20 +214,20 @@ public class OrganizationService {
         }
 
         //机构账号
-        CareSysUserVO careSysUserVO = vo.getCareSysUserVO();
+        SysUserVO sysUserVO = vo.getSysUserVO();
         QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareSysUser::getPhone,careSysUserVO.getPhone());
+        queryWrapper.lambda().eq(CareSysUser::getPhone, sysUserVO.getPhone());
         CareSysUser careSysUserDb = careSysUserService.getOne(queryWrapper);
         if(careSysUserDb != null){
-            careSysUserVO.setId(careSysUserDb.getId());
+            sysUserVO.setId(careSysUserDb.getId());
             CareSysUser careSysUser = new CareSysUser();
-            BeanUtil.copyProperties(careSysUserVO,careSysUser);
+            BeanUtil.copyProperties(sysUserVO,careSysUser);
             if(!this.careSysUserService.updateById(careSysUser)){
                 throw new BDException("机构账号修改失败！");
             };
         } else {
             CareSysUser careSysUser = new CareSysUser();
-            BeanUtil.copyProperties(careSysUserVO,careSysUser);
+            BeanUtil.copyProperties(sysUserVO,careSysUser);
             careSysUser.setName(vo.getShortName() + "管理账号");
             careSysUser.setCreateTime(new Date());
             careSysUser.setRole(UserRoleEnum.ORG.getValue());
@@ -217,10 +237,8 @@ public class OrganizationService {
             this.careSysUserService.save(careSysUser);
 
             //创建一个默认服务站
-
             CareOrganization careOrganizationDb = this.careOrganizationService.getById(vo.getId());
-
-            CareStationVO careStationVO = new CareStationVO();
+            StationVO careStationVO = new StationVO();
             careStationVO.setOrgId(vo.getId());
             careStationVO.setName(careOrganizationDb.getName());
             careStationVO.setShortName(careOrganizationDb.getShortName());
@@ -229,6 +247,19 @@ public class OrganizationService {
         }
 
     }
+    /**
+     * 启用停用机构
+     * @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

@@ -8,16 +8,16 @@ 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.enums.DeviceActiveStatusEnum;
 import com.care.common.exception.BDException;
 import com.care.common.service.CareDeviceService;
 import com.care.common.service.CareStationService;
 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 com.care.common.vo.device.DeviceVO;
+import com.care.common.vo.station.StationVO;
+import com.care.common.vo.station.StationVO;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -41,7 +41,7 @@ public class StationService {
      * 查询服务站列表
      * @return
      */
-    public IPage<CareStationVO> listStation(String name, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<StationVO> listStation(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)
@@ -49,11 +49,11 @@ public class StationService {
                 .orderByAsc(CareStation::getName);
 
         IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);
-        IPage<CareStationVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+        IPage<StationVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
         if(CollUtil.isNotEmpty(pageRes.getRecords())){
-            List<CareStationVO> list = new ArrayList<>();
+            List<StationVO> list = new ArrayList<>();
             pageRes.getRecords().forEach(item -> {
-                CareStationVO  resVO = new CareStationVO();
+                StationVO  resVO = new StationVO();
                 BeanUtils.copyProperties(item,resVO);
                 //服务设备数量
                 QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
@@ -66,6 +66,25 @@ public class StationService {
         return results;
     }
 
+    public StationVO getStationInfo(Long stationId) {
+        StationVO vo = new StationVO();
+        CareStation stationInfo = this.careStationService.getById(stationId);
+        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()));
+                deviceVOList.add(deviceVO);
+            });
+            vo.setDeviceVOList(deviceVOList);
+        }
+        return vo;
+    }
 
     /**
      * 查询登陆人，所能看到的 服务站列表
@@ -91,7 +110,7 @@ public class StationService {
         return datas;
     }
 
-    public void addStation(CareStationVO vo) throws Exception {
+    public void addStation(StationVO vo) throws Exception {
         QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareStation::getName,vo.getName());
         int count = this.careStationService.count(queryWrapper);

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

@@ -8,7 +8,7 @@ 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.device.StationVO;
+import com.care.common.vo.station.StationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -47,7 +47,7 @@ public class AbstractPassportService {
                 }
             }
             if (ValidStatusEnum.INVALID.getValue().equals(member.getStatus())){
-                return Result.error("用户已经禁用");
+                return Result.error("用户已经停用");
             }
         } else if ("pwd".equalsIgnoreCase(params.getLoginType())) {
             member = careMemberInfoService.detailByPhone(params.getPhone());
@@ -55,7 +55,7 @@ public class AbstractPassportService {
                 return Result.error("账号不存在");
             }
             if (ValidStatusEnum.INVALID.getValue().equals(member.getStatus())){
-                return Result.error("用户已经禁用");
+                return Result.error("用户已经停用");
             }
             if (!StrUtil.equalsIgnoreCase(SecureUtil.md5(params.getPassword()), member.getPassword())) {
                 return Result.error("账号密码不匹配");

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

@@ -41,7 +41,7 @@ public class PassportService extends AbstractPassportService {
 
             if(careMemberInfo != null){
                 if (ValidStatusEnum.INVALID.getValue().equals(careMemberInfo.getStatus())){
-                    return Result.error("用户已经禁用");
+                    return Result.error("用户已经停用");
                 }
                 params.setPhone(careMemberInfo.getPhone());
                 params.setOpenid(careMemberInfo.getOpenId());

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

@@ -10,7 +10,7 @@ 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.device.StationVO;
+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;

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

@@ -80,7 +80,7 @@ public class CareMemberInfo implements Serializable {
     private String shareCode;
 
 
-    @ApiModelProperty("状态：0可用，1禁用")
+    @ApiModelProperty("状态：0可用，1停用")
     @TableField("STATUS")
     private String status;
 

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

@@ -70,6 +70,18 @@ public class CareOrganization implements Serializable {
     private String logo;
 
 
+    @ApiModelProperty("启用状态：启用状态：0启用，1停用")
+    @TableField("VALID_STATUS")
+    private String validStatus;
+
+    @ApiModelProperty("服务有效期开始日期")
+    @TableField("SERV_START_DATE")
+    private Date servStartDate;
+
+    @ApiModelProperty("服务有效期结束日期")
+    @TableField("SERV_END_DATE")
+    private Date servEndDate;
+
     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")
     private Date createTime;

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

@@ -66,7 +66,7 @@ public class CareSysUser implements Serializable {
     @TableField("STATUS")
     private String status;
 
-    @ApiModelProperty("启用状态：启用状态：0启用，1禁用")
+    @ApiModelProperty("启用状态：启用状态：0启用，1停用")
     @TableField("VALID_STATUS")
     private String validStatus;
 

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

@@ -32,7 +32,7 @@ public class SysDimCode implements Serializable {
     private Long id;
 
 
-    @ApiModelProperty("0:禁用  1 启用")
+    @ApiModelProperty("0:停用  1 启用")
     @TableField("STATUS")
     private String status;
 

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

@@ -9,10 +9,10 @@ import cn.hutool.core.util.StrUtil;
  */
 public enum ValidStatusEnum {
     /**
-     * 启用禁用
+     * 启用停用
      */
     VALID("0","启用"),
-    INVALID("1","禁用");
+    INVALID("1","停用");
     private String value;
     private String name;
     ValidStatusEnum(String value, String name) {

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

@@ -35,4 +35,6 @@ public interface CareDeviceMapper extends BaseMapper<CareDevice> {
                               @Param("userOrgId") Long userOrgId
     );
     void updateDevChamb(@Param("id") Long id);
+
+    void synDev(CareDevice careDevice);
 }

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

@@ -30,4 +30,6 @@ public interface CareDeviceService extends IService<CareDevice> {
     Map<String,String> get3dUrl(Long deviceId);
 
     void updateDevChamb(Long id);
+
+    void synDev(CareDevice careDevice);
 }

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

@@ -106,7 +106,14 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
         this.baseMapper.updateDevChamb(id);
     }
 
+    @Override
+    public void synDev(CareDevice careDevice){
+        this.baseMapper.synDev(careDevice);
+    }
+
     public static void main(String[] args) throws UnsupportedEncodingException {
         System.out.println(java.net.URLEncoder.encode("5JPD/monitor/f1/event","UTF-8"));
     }
+
+
 }

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

@@ -28,7 +28,7 @@ public class DimCodeVO implements Serializable {
     private Long id;
 
 
-    @ApiModelProperty("0:禁用  1 启用")
+    @ApiModelProperty("0:停用  1 启用")
     private String status;
 
 

src/main/java/com/care/common/vo/memberinfo/MemberInfoVO.java

@@ -58,7 +58,7 @@ public class MemberInfoVO implements Serializable {
     private String shareCode;
 
 
-    @ApiModelProperty("状态：0可用，1禁用")
+    @ApiModelProperty("状态：0可用，1停用")
     private String status;
 
     @ApiModelProperty("createTime")

src/main/java/com/care/common/vo/org/OrganizationVO.java

@@ -1,7 +1,7 @@
 package com.care.common.vo.org;
 
 
-import com.care.common.vo.sysuser.CareSysUserVO;
+import com.care.common.vo.sysuser.SysUserVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,6 +55,18 @@ public class OrganizationVO implements Serializable {
     @ApiModelProperty("系统名称")
     private String systemName;
 
+    @ApiModelProperty("启用状态：启用状态：0启用，1停用")
+    private String validStatus;
+
+    @ApiModelProperty("启用状态名：启用状态：0启用，1停用")
+    private String validStatusName;
+
+    @ApiModelProperty("服务有效期开始日期")
+    private Date servStartDate;
+
+    @ApiModelProperty("服务有效期结束日期")
+    private Date servEndDate;
+
     @ApiModelProperty("log")
     private String logo;
 
@@ -84,7 +96,7 @@ public class OrganizationVO implements Serializable {
     private String servValidPeriod ;
 
     @ApiModelProperty("机构账号")
-    private CareSysUserVO careSysUserVO ;
+    private SysUserVO sysUserVO;
 
 
 }

src/main/java/com/care/common/vo/station/CareStationVO.java

@@ -1,67 +0,0 @@
-package com.care.common.vo.station;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@ApiModel(value = "服务站信息", description = "")
-public class CareStationVO implements Serializable {
-    private static final long serialVersionUID = 278407010051454823L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("机构ID")
-    private Long orgId;
-
-
-    @ApiModelProperty("服务站名称")
-    private String name;
-
-
-    @ApiModelProperty("服务站简称")
-    private String shortName;
-
-    @ApiModelProperty("服务站编码")
-    private String code;
-
-    @ApiModelProperty("负责人")
-    private String director;
-
-
-    @ApiModelProperty("联系电话")
-    private String phone;
-
-
-    @ApiModelProperty("地址")
-    private String addr;
-
-
-    @ApiModelProperty("经度")
-    private Double longitude;
-
-
-    @ApiModelProperty("纬度")
-    private Double latitude;
-
-    @ApiModelProperty("简介")
-    private String introduction;
-
-    @ApiModelProperty("服务设备数量")
-    private Integer devCount;
-
-    @ApiModelProperty("createTime")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    private Date modifyTime;
-
-}

src/main/java/com/care/common/vo/device/StationVO.java

@@ -1,5 +1,6 @@
-package com.care.common.vo.device;
+package com.care.common.vo.station;
 
+import com.care.common.vo.device.DeviceVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 服务站(CareStation)实体类
@@ -34,6 +36,8 @@ public class StationVO implements Serializable {
     @ApiModelProperty("服务站简称")
     private String shortName;
 
+    @ApiModelProperty("服务站编码")
+    private String code;
 
     @ApiModelProperty("负责人")
     private String director;
@@ -57,6 +61,8 @@ public class StationVO implements Serializable {
     @ApiModelProperty("简介")
     private String introduction;
 
+    @ApiModelProperty("服务设备数量")
+    private Integer devCount;
     @ApiModelProperty("createTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
@@ -66,5 +72,6 @@ public class StationVO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date modifyTime;
 
-
+    @ApiModelProperty("关联的设备列表")
+    private List<DeviceVO> deviceVOList;
 }

src/main/java/com/care/common/vo/sysuser/CareSysUserVO.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 
 @Data
-public class CareSysUserVO implements Serializable {
+public class SysUserVO implements Serializable {
     private static final long serialVersionUID = -32919685706503729L;
 
     private Long id;
@@ -55,10 +55,10 @@ public class CareSysUserVO implements Serializable {
     @ApiModelProperty("状态：1正常；2：休假")
     private String status;
 
-    @ApiModelProperty("启用状态：启用状态：0启用，1禁用")
+    @ApiModelProperty("启用状态：启用状态：0启用，1停用")
     private String validStatus;
 
-    @ApiModelProperty("启用状态名：启用状态：0启用，1禁用")
+    @ApiModelProperty("启用状态名：启用状态：0启用，1停用")
     private String validStatusName;
 
     @ApiModelProperty("经度")

src/main/resources/mybatis/CareDeviceMapper.xml

@@ -77,4 +77,11 @@
      <update id="updateDevChamb">
         update care_device set chamb_id=null where id=#{id}
      </update>
+
+    <insert id = "synDev">
+        insert into care_device(org_id,dev_code,create_time)
+        values(#{orgId},#{devCode},now())
+        on duplicate key update
+        org_id = values(org_id)
+    </insert>
 </mapper>