第二版

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

@@ -37,7 +37,7 @@ public class DeviceController {
     private DeviceService deviceService;
 
     @GetMapping("/list")
-    @ApiOperation(value = "设备列表分页")
+    @ApiOperation(value = "设备列表分页--二期修改")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "stationId", value = "服务站ID"),
             @ApiImplicitParam(paramType = "query", name = "devCode", value = "设备编码"),
@@ -90,7 +90,7 @@ public class DeviceController {
 //    }
 
     @PostMapping("/update")
-    @ApiOperation(value = "更新设备")
+    @ApiOperation(value = "更新设备--二期修改")
     public Result<Object> update(HttpServletRequest request,@RequestHeader("token") String token,
                                    @RequestBody DeviceVO vo){
         try {
@@ -107,7 +107,7 @@ public class DeviceController {
 
 
     @GetMapping("/getDeviceInfo/{deviceId}")
-    @ApiOperation(value = "详情")
+    @ApiOperation(value = "详情--二期修改")
     public Result<DeviceVO> getDeviceInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("deviceId") Long deviceId){
         DeviceVO orderInfo = this.deviceService.getDevById(deviceId);
         return  Result.success("查询成功！",orderInfo);

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

@@ -73,7 +73,7 @@ public class EventHandleController {
      * @return
      */
     @GetMapping("/not-handle/getCount")
-    @ApiOperation(tags = {"未处理事件"},value = "未处理事件数量查询")
+    @ApiOperation(tags = {"未处理事件"},value = "未处理事件数量查询  --二期新增")
     public Result<Integer> getNotHandleCount(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
@@ -137,7 +137,7 @@ public class EventHandleController {
      * @return
      */
     @GetMapping("/recent-handle/list")
-    @ApiOperation(tags = {"近期处理事件"},value = "近期处理事件（只有坐席能用）")
+    @ApiOperation(tags = {"近期处理事件"},value = "近期处理事件（只有坐席能用）--二期新增")
     public Result<List<EventOrderVO>> listRecentHandle(HttpServletRequest request, @RequestHeader(value = "token") String token){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
@@ -167,7 +167,7 @@ public class EventHandleController {
     }
 
     @GetMapping("/getChambList/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "主管家和改派管家列表查询")
+    @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);
@@ -298,7 +298,7 @@ public class EventHandleController {
     }
 
     @GetMapping("/getFreeKeeperList/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "获取空闲管家列表")
+    @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)) {
@@ -310,7 +310,7 @@ public class EventHandleController {
 
 
     @PostMapping("/assignKeeper/{orderId}/{chambId}")
-    @ApiOperation(tags = {"事件处理"},value = "指派管家")
+    @ApiOperation(tags = {"事件处理"},value = "指派管家  --二期新增")
     public Result<Object> assignKeeper(HttpServletRequest request,@RequestHeader("token") String token,
                                                    @PathVariable("orderId") Long orderId,
                                                    @PathVariable("chambId") Long chambId){

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

@@ -27,7 +27,7 @@ import java.util.List;
  * @Desc:
  */
 @RestController
-@Api(value = "HouseController", tags = { "房屋管理" })
+@Api(value = "HouseController", tags = { "房屋管理---二期去除" })
 @Slf4j
 @RequestMapping("/bms/house")
 @Permission

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

@@ -35,7 +35,7 @@ public class LoginController {
     BmsSysUserService careSysUserService;
 
     @PostMapping(value = "/login", produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiOperation(value = "登陆", notes = "登陆")
+    @ApiOperation(value = "登陆", notes = "登陆--二期修改")
     public Result<Object> login(HttpServletRequest request, @RequestBody UserLoginParams userLoginParams) {
         try {
             //验证用户名密码

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

@@ -35,7 +35,7 @@ public class MemberInfoController {
 
 
     @GetMapping("/listMemberInfo")
-    @ApiOperation(value = "用户列表分页")
+    @ApiOperation(value = "用户列表分页--二期新增")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "name", value = "用户名"),
             @ApiImplicitParam(paramType = "query", name = "phone", value = "电话"),
@@ -76,7 +76,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/SysUserController.java

@@ -57,7 +57,7 @@ public class SysUserController {
 
 
     @GetMapping("/listKeeper")
-    @ApiOperation(value = "管家列表分页")
+    @ApiOperation(value = "管家列表分页  --二期新增")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "name", value = "管家姓名"),
             @ApiImplicitParam(paramType = "query", name = "phone", value = "电话"),
@@ -82,14 +82,14 @@ public class SysUserController {
     }
 
     @GetMapping("/getKeeperFreeDev")
-    @ApiOperation(value = "获取没分配给管家的空闲设备列表")
+    @ApiOperation(value = "获取没分配给管家的空闲设备列表 --二期新增")
     public Result<List<DeviceVO>> getKeeperFreeDev(HttpServletRequest request, @RequestHeader("token") String token){
         List<DeviceVO> list = this.bmsSysUserService.getFreeDeviceVOList();
         return  Result.success("查询成功！",list);
     }
 
     @PostMapping("/addKeeper")
-    @ApiOperation(value = "新增管家")
+    @ApiOperation(value = "新增管家 --二期新增")
     public Result<Object> addKeeper(HttpServletRequest request,@RequestHeader("token") String token,
                                    @RequestBody CareSysUserVO vo){
         try {
@@ -106,7 +106,7 @@ public class SysUserController {
     }
 
     @PostMapping("/updateKeeper")
-    @ApiOperation(value = "修改管家")
+    @ApiOperation(value = "修改管家 --二期新增")
     public Result<Object> updateKeeper(HttpServletRequest request,@RequestHeader("token") String token,
                                  @RequestBody CareSysUserVO vo){
         try {
@@ -122,7 +122,7 @@ public class SysUserController {
     }
 
     @GetMapping("/getKeeperInfo/{chambId}")
-    @ApiOperation(value = "管家详情")
+    @ApiOperation(value = "管家详情  --二期新增")
     public Result<CareSysUserVO> getKeeperInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("chambId") Long chambId){
         CareSysUserVO orderInfo = this.bmsSysUserService.getCareSysUserById(chambId);
         return  Result.success("查询成功！",orderInfo);

src/main/resources/common.properties

@@ -14,4 +14,4 @@ mqtt.port=8083
 mqtt.username=test
 mqtt.password=public
 #是否开启mqtt消息接受服务，开启：1，不开启：0
-mqtt.on=1
+mqtt.on=0

src/main/resources/mybatis/BigSreenMapper.xml

@@ -345,8 +345,8 @@
         <!--(case when (select count(1) from care_device b where b.dev_type='2' and b.id in (select c.dev_id from care_older_device_rel c where c.older_id = a.id)) > 0 then 'Y' else 'N' end)  has_our_door_device,-->
         (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='older_status') olderStatus,
         (select c.status from care_event_order c where c.older_id = a.id order by c.create_time desc limit 1) olderEventStatus
-        FROM care_older a
-        left join care_house ch on ch.id=a.house_id
+        FROM care_older a left join care_house_older_rel rel on a.id=older_id
+        left join care_house ch on ch.id=rel.house_id
         where a.station_id = #{stationId}
         <if test="olderName != null and olderName != ''">
             AND a.name like CONCAT('%',#{olderName},'%')