Procházet zdrojové kódy

初步整合完成

yq před 2 roky
rodič
revize
e5e06f5ebb
100 změnil soubory, kde provedl 6345 přidání a 25 odebrání
  1. 7 0
      service-dm/service-dm-biz/pom.xml
  2. 45 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaAhuInfoController.java
  3. 138 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaCwInfoController.java
  4. 46 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaJsjInfoController.java
  5. 47 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaPauInfoController.java
  6. 66 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BuildingController.java
  7. 88 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/CommunicationApiController.java
  8. 74 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/CompanyController.java
  9. 88 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DeviceChannelController.java
  10. 101 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DeviceController.java
  11. 101 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DeviceTypeController.java
  12. 77 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DevopsTeamController.java
  13. 40 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DevopsTeamRelationController.java
  14. 105 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/EventManageController.java
  15. 89 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/FacilityController.java
  16. 70 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/FloorController.java
  17. 87 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/InspectionPointController.java
  18. 72 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MaintianLogController.java
  19. 88 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MaintianPlanController.java
  20. 43 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MonitorDeviceController.java
  21. 92 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MonitorPointController.java
  22. 59 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/PlanChildController.java
  23. 72 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/PlanPathController.java
  24. 40 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/PlanSpotController.java
  25. 72 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/ProductController.java
  26. 73 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/RoomController.java
  27. 172 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TbAlarmController.java
  28. 97 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TbDeviceStatusController.java
  29. 39 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TbInfoController.java
  30. 0 21
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TestController.java
  31. 104 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/WorkOrderController.java
  32. 73 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/AccountLock.java
  33. 171 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaAhuInfo.java
  34. 67 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaCwInfo.java
  35. 66 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaJsjInfo.java
  36. 106 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaPauInfo.java
  37. 109 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Building.java
  38. 89 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/CommunicationApi.java
  39. 105 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Company.java
  40. 204 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Device.java
  41. 82 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DeviceChannel.java
  42. 77 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DeviceStatus.java
  43. 94 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DeviceType.java
  44. 72 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DevopsTeam.java
  45. 56 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DevopsTeamRelation.java
  46. 82 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/EventManage.java
  47. 172 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Facility.java
  48. 71 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Floor.java
  49. 99 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/InspectionPoint.java
  50. 148 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MaintianLog.java
  51. 108 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MaintianPlan.java
  52. 48 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MonitorDevice.java
  53. 78 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MonitorPoint.java
  54. 114 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/PlanChild.java
  55. 60 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/PlanPath.java
  56. 45 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/PlanSpot.java
  57. 66 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Product.java
  58. 83 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Room.java
  59. 144 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/TbAlarm.java
  60. 112 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/TbDeviceStatus.java
  61. 83 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/TbInfo.java
  62. 117 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/WorkOrder.java
  63. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaAhuInfoMapper.java
  64. 4 4
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaCwInfoMapper.java
  65. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaJsjInfoMapper.java
  66. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaPauInfoMapper.java
  67. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BuildingMapper.java
  68. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/CommunicationApiMapper.java
  69. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/CompanyMapper.java
  70. 22 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceChannelMapper.java
  71. 33 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceMapper.java
  72. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceStatusMapper.java
  73. 24 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceTypeMapper.java
  74. 23 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DevopsTeamMapper.java
  75. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DevopsTeamRelationMapper.java
  76. 25 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/EventManageMapper.java
  77. 24 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/FacilityMapper.java
  78. 23 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/FloorMapper.java
  79. 23 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/InspectionPointMapper.java
  80. 21 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MaintianLogMapper.java
  81. 22 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MaintianPlanMapper.java
  82. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MonitorDeviceMapper.java
  83. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MonitorPointMapper.java
  84. 23 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/PlanChildMapper.java
  85. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/PlanPathMapper.java
  86. 17 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/PlanSpotMapper.java
  87. 18 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/ProductMapper.java
  88. 24 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/RoomMapper.java
  89. 31 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TbAlarmMapper.java
  90. 30 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TbDeviceStatusMapper.java
  91. 24 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TbInfoMapper.java
  92. 22 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/WorkOrderMapper.java
  93. 78 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/AlertRequest.java
  94. 40 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/DeviceCollectVO.java
  95. 58 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/DeviceRequestVO.java
  96. 71 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/InfoRequest.java
  97. 61 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/MaintianLogRequest.java
  98. 62 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/WorkOrderRequest.java
  99. 22 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/service/BaAhuInfoService.java
  100. 40 0
      service-dm/service-dm-biz/src/main/java/com/usky/dm/service/BaCwInfoService.java

+ 7 - 0
service-dm/service-dm-biz/pom.xml

@@ -14,6 +14,13 @@
             <artifactId>common-cloud-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-spring-boot-starter</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

+ 45 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaAhuInfoController.java

@@ -0,0 +1,45 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.BaAhuInfo;
+import com.usky.dm.service.BaAhuInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * ba 空调机组
+ * @author ya
+ * @since 2022-05-25
+ */
+@RestController
+@RequestMapping("/baAhuInfo")
+public class BaAhuInfoController {
+
+
+    @Autowired
+    private BaAhuInfoService baAhuInfoService;
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BaAhuInfo>> page(@RequestParam Integer current,
+                                                 @RequestParam Integer size,
+                                                 @RequestParam(required = false) Date startTime,
+                                                 @RequestParam(required = false) Date endTime){
+        return ApiResult.success(baAhuInfoService.list(current, size, startTime, endTime));
+    }
+}
+

+ 138 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaCwInfoController.java

@@ -0,0 +1,138 @@
+package com.usky.dm.controller.web;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.BaCwInfo;
+import com.usky.dm.domain.WorkOrder;
+import com.usky.dm.service.BaCwInfoService;
+import com.usky.dm.service.vo.BaCwCollectVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * ba 厕位
+ * @author ya
+ * @since 2022-05-25
+ */
+@RestController
+@RequestMapping("/baCwInfo")
+public class BaCwInfoController {
+
+
+    @Autowired
+    private BaCwInfoService baCwInfoService;
+
+
+
+    @GetMapping("addByConfig")
+    public ApiResult<Void> addByConfig(){
+        baCwInfoService.addByConfig();
+        return ApiResult.success();
+    }
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param status 状态
+     * @param floor 楼层
+     * @param type 类型(male男厕,female女厕)
+     * @param isAlert true故障false正常
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BaCwInfo>> page(@RequestParam Integer current,
+                                                @RequestParam Integer size,
+                                                @RequestParam(required = false) Date startTime,
+                                                @RequestParam(required = false) Date endTime,
+                                                @RequestParam(required = false) String status,
+                                                @RequestParam(required = false) String floor,
+                                                @RequestParam(required = false) String type,
+                                                @RequestParam(required = false) Boolean isAlert,
+                                                @RequestParam(required = false) String name){
+        return ApiResult.success(baCwInfoService.list(current, size, startTime, endTime,status,floor,type,isAlert,name));
+    }
+
+    /**
+     * 查看全部厕位
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param status 状态
+     * @param floor 楼层
+     * @param type 类型(male男厕,female女厕)
+     * @return
+     */
+    @GetMapping("/all")
+    public ApiResult<List<BaCwInfo>> all(@RequestParam(required = false) String status,
+                                         @RequestParam(required = false) String floor,
+                                         @RequestParam(required = false) String type,
+                                         @RequestParam(required = false) Date startTime,
+                                         @RequestParam(required = false) Date endTime){
+        LambdaQueryWrapper<BaCwInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .between(null != startTime && null != endTime,BaCwInfo::getCreateTime,startTime,endTime)
+                .eq(StringUtils.isNotBlank(status),BaCwInfo::getStatus,status)
+                .eq(StringUtils.isNotBlank(floor),BaCwInfo::getFloor,floor)
+                .eq(StringUtils.isNotBlank(type),BaCwInfo::getWcType,type)
+                .orderByDesc(BaCwInfo::getId);
+        return ApiResult.success(baCwInfoService.list(queryWrapper));
+    }
+
+    /**
+     * 添加厕位告警
+     * @param workOrder
+     * @return
+     */
+    @PostMapping("/addAlert")
+    public ApiResult<Void> addAlert(@RequestBody WorkOrder workOrder){
+        baCwInfoService.addAlert(workOrder);
+        return ApiResult.success();
+    }
+
+    /**
+     * 处理告警
+     * @param workOrder
+     * @return
+     */
+    @PutMapping("/checkAlert")
+    public ApiResult<Void> checkAlert(@RequestBody WorkOrder workOrder){
+        baCwInfoService.checkAlert(workOrder);
+        return ApiResult.success();
+    }
+
+    /**
+     * 厕位状态统计
+     * @param floor 楼层
+     * @param type 类型
+     * @return
+     */
+    @GetMapping("/collect")
+    public ApiResult<BaCwCollectVO> collect(@RequestParam(required = false) String floor,
+                                            @RequestParam(required = false) String type){
+        return ApiResult.success(baCwInfoService.collect(floor,type));
+    }
+
+
+    /**
+     * 厕位状态楼层统计
+     * @param floor 楼层
+     * @param type 类型
+     * @return
+     */
+    @GetMapping("/collectByFloor")
+    public ApiResult<List<BaCwCollectVO>> collectByFloor(@RequestParam(required = false) String floor,
+                                            @RequestParam(required = false) String type){
+        return ApiResult.success(baCwInfoService.collectByFloor(floor,type));
+    }
+}
+

+ 46 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaJsjInfoController.java

@@ -0,0 +1,46 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.BaJsjInfo;
+import com.usky.dm.service.BaJsjInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * ba 集水井
+ * @author ya
+ * @since 2022-05-25
+ */
+@RestController
+@RequestMapping("/baJsjInfo")
+public class BaJsjInfoController {
+
+    @Autowired
+    private BaJsjInfoService baJsjInfoService;
+
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BaJsjInfo>> page(@RequestParam Integer current,
+                                                 @RequestParam Integer size,
+                                                 @RequestParam(required = false) Date startTime,
+                                                 @RequestParam(required = false) Date endTime){
+        return ApiResult.success(baJsjInfoService.list(current, size, startTime, endTime));
+    }
+}
+

+ 47 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaPauInfoController.java

@@ -0,0 +1,47 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.BaPauInfo;
+import com.usky.dm.service.BaPauInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * ba 新风机组
+ * @author ya
+ * @since 2022-05-25
+ */
+@RestController
+@RequestMapping("/baPauInfo")
+public class BaPauInfoController {
+
+
+
+    /**
+     * 分页
+     * @param current 页数
+     * @param size 条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @Autowired
+    private BaPauInfoService baPauInfoService;
+
+
+    @GetMapping("/page")
+    public ApiResult<CommonPage<BaPauInfo>> page(@RequestParam Integer current,
+                                                 @RequestParam Integer size,
+                                                 @RequestParam(required = false) Date startTime,
+                                                 @RequestParam(required = false) Date endTime){
+        return ApiResult.success(baPauInfoService.list(current, size, startTime, endTime));
+    }
+}
+

+ 66 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BuildingController.java

@@ -0,0 +1,66 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.Building;
+import com.usky.dm.service.BuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 建筑
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/building")
+public class BuildingController {
+
+
+    @Autowired
+    private BuildingService buildingService;
+    /**
+     * 新增记录
+     * @param building
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Boolean> add(@RequestBody Building building){
+        return ApiResult.success(buildingService.add(building));
+    }
+
+    /**
+     * 修改记录
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Boolean> update(@RequestBody Building building){
+        return ApiResult.success(buildingService.update(building));
+    }
+
+    /**
+     * 删除记录
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Boolean> delete(@PathVariable("id") Long id){
+        return ApiResult.success(buildingService.delete(id));
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("list")
+    public ApiResult<CommonPage<Building>> page(@RequestParam Integer current,
+                                                @RequestParam Integer size,
+                                                @RequestParam(required = false) String name){
+        return ApiResult.success(buildingService.page(current,size,name));
+    }
+}
+

+ 88 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/CommunicationApiController.java

@@ -0,0 +1,88 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.CommunicationApi;
+import com.usky.dm.service.CommunicationApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 通信接口
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/communicationApi")
+public class CommunicationApiController {
+
+
+    @Autowired
+    private CommunicationApiService communicationApiService;
+
+
+    /**
+     * 新增记录
+     * @param communicationApi
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody CommunicationApi communicationApi){
+        communicationApiService.add(communicationApi);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody CommunicationApi communicationApi)
+    {
+        communicationApiService.update(communicationApi);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param storeName 厂商名称
+     * @param transferType 传输方式
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<CommunicationApi>> list(@RequestParam Integer current,
+                                                        @RequestParam Integer size,
+                                                        @RequestParam(required = false) String storeName,
+                                                        @RequestParam(required = false) String transferType)
+    {
+        return ApiResult.success(communicationApiService.list(current,size,storeName,transferType));
+    }
+
+
+    /**
+     * 导出记录
+     * @param storeName 厂商名称
+     * @param transferType 传输方式
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(@RequestParam(required = false) String storeName,
+                                    @RequestParam(required = false) String transferType){
+        return ApiResult.success(communicationApiService.export(storeName,transferType));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        communicationApiService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 74 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/CompanyController.java

@@ -0,0 +1,74 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.Company;
+import com.usky.dm.service.CompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 单位表
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/company")
+public class CompanyController {
+
+
+    @Autowired
+    private CompanyService companyService;
+
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<Company>> list(@RequestParam Integer current,
+                                               @RequestParam Integer size,
+                                               @RequestParam(required = false) String name)
+    {
+        return ApiResult.success(companyService.list(current,size,name));
+    }
+
+
+    /**
+     * 新增记录
+     * @param company
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody @Validated Company company){
+        companyService.add(company);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody @Validated Company company)
+    {
+        companyService.update(company);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        companyService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 88 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DeviceChannelController.java

@@ -0,0 +1,88 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.DeviceChannel;
+import com.usky.dm.service.DeviceChannelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *  监测通道
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/deviceChannel")
+public class DeviceChannelController {
+
+    @Autowired
+    private DeviceChannelService deviceChannelService;
+
+
+
+    /**
+     * 新增记录
+     * @param deviceChannel
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody @Validated DeviceChannel deviceChannel){
+        deviceChannelService.add(deviceChannel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody @Validated DeviceChannel deviceChannel)
+    {
+        deviceChannelService.update(deviceChannel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 监测对象名称
+     * @param dwtype 通道类型名称
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<DeviceChannel>> list(@RequestParam Integer current,
+                                                     @RequestParam Integer size,
+                                                     @RequestParam(required = false) String name,
+                                                     @RequestParam(required = false) Integer dwtype)
+    {
+        return ApiResult.success(deviceChannelService.list(current,size,name,dwtype));
+    }
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param dwtype 通道名称
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(@RequestParam(required = false) String name,
+                                    @RequestParam(required = false) Integer dwtype){
+        return ApiResult.success(deviceChannelService.export(name,dwtype));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        deviceChannelService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 101 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DeviceController.java

@@ -0,0 +1,101 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.dm.domain.Device;
+import com.usky.dm.mapper.vo.DeviceCollectVO;
+import com.usky.dm.mapper.vo.DeviceRequestVO;
+import com.usky.dm.service.DeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ *  设备
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/device")
+public class DeviceController {
+
+
+    @Autowired
+    private DeviceService deviceService;
+
+
+    /**
+     * 新增记录
+     * @param device
+     * @return
+     */
+    @Log(title = "新增设备", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody @Validated Device device){
+        deviceService.add(device);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @Log(title = "修改设备", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody @Validated Device device)
+    {
+        deviceService.update(device);
+        return ApiResult.success();
+    }
+
+    /**
+     * 分页记录
+     * @param deviceRequestVO
+     * @return
+     */
+    @PostMapping("/list")
+    public ApiResult<CommonPage<Device>> list(@RequestBody DeviceRequestVO deviceRequestVO)
+    {
+        return ApiResult.success(deviceService.list(deviceRequestVO));
+    }
+
+    /**
+     * 导出记录
+     * @param deviceRequestVO
+     * @return
+     */
+    @PostMapping("/export")
+    public ApiResult<String> export(@RequestBody DeviceRequestVO deviceRequestVO){
+        return ApiResult.success(deviceService.export(deviceRequestVO));
+    }
+
+    /**
+     * 设备统计
+     * @param isLine 1是
+     * @return
+     */
+    @GetMapping("/collect")
+    public ApiResult<List<DeviceCollectVO>> getCollect(@RequestParam(required = false) Integer isLine){
+        return ApiResult.success(deviceService.getCollect(isLine));
+    }
+
+
+
+    /**
+     * 删除记录
+     */
+    @Log(title = "删除设备", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        deviceService.remove(id);
+        return ApiResult.success();
+    }
+
+}
+

+ 101 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DeviceTypeController.java

@@ -0,0 +1,101 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.DeviceType;
+import com.usky.dm.service.DeviceTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *  设备类型
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/deviceType")
+public class DeviceTypeController {
+
+
+    @Autowired
+    private DeviceTypeService deviceTypeService;
+
+
+    /**
+     * 新增记录
+     * @param deviceType
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody @Validated DeviceType deviceType){
+        deviceTypeService.add(deviceType);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody @Validated DeviceType deviceType)
+    {
+        deviceTypeService.update(deviceType);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param typeValue 备注
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<DeviceType>> list(@RequestParam Integer current,
+                                                  @RequestParam Integer size,
+                                                  @RequestParam(required = false) String name,
+                                                  @RequestParam(required = false) String typeValue)
+    {
+        return ApiResult.success(deviceTypeService.list(current,size,name,typeValue));
+    }
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param typeValue 备注
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(@RequestParam(required = false) String name, @RequestParam(required = false) String typeValue){
+        return ApiResult.success(deviceTypeService.export(name,typeValue));
+    }
+
+    /**
+     * 查询全部
+     * @param name 名称
+     * @param typeValue typeValue
+     * @return
+     */
+    @GetMapping("/all")
+    public ApiResult<List<DeviceType>> all(@RequestParam(required = false) String name,
+                                           @RequestParam(required = false) String typeValue){
+        return ApiResult.success(deviceTypeService.all(name,typeValue));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        deviceTypeService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 77 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DevopsTeamController.java

@@ -0,0 +1,77 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.DevopsTeam;
+import com.usky.dm.service.DevopsTeamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 班组团队
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/devopsTeam")
+public class DevopsTeamController {
+
+
+    @Autowired
+    private DevopsTeamService devopsTeamService;
+
+
+
+
+    /**
+     * 新增记录
+     * @param devopsTeam
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody DevopsTeam devopsTeam){
+        devopsTeamService.add(devopsTeam);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody DevopsTeam devopsTeam)
+    {
+        devopsTeamService.update(devopsTeam);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param userName 负责人
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<DevopsTeam>> list(@RequestParam Integer current,
+                                                  @RequestParam Integer size,
+                                                  @RequestParam(required = false) String name,
+                                                  @RequestParam(required = false) String userName)
+    {
+        return ApiResult.success(devopsTeamService.list(current,size,name,userName));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        devopsTeamService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 40 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/DevopsTeamRelationController.java

@@ -0,0 +1,40 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.dm.domain.DevopsTeamRelation;
+import com.usky.dm.service.DevopsTeamRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 团队-人员
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/devopsTeamRelation")
+public class DevopsTeamRelationController {
+
+
+    @Autowired
+    private DevopsTeamRelationService devopsTeamRelationService;
+
+    /**
+     * 记录查询
+     * @param teamId 团队编号
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<List<DevopsTeamRelation>> list(@RequestParam Integer teamId)
+    {
+        return ApiResult.success(devopsTeamRelationService.list(teamId));
+    }
+}
+

+ 105 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/EventManageController.java

@@ -0,0 +1,105 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.EventManage;
+import com.usky.dm.service.EventManageService;
+import com.usky.dm.service.vo.AlertCheckVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+/**
+ * 事件管理
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/eventManage")
+public class EventManageController {
+
+    @Autowired
+    private EventManageService eventManageService;
+
+
+    /**
+     * 新增
+     * @param eventManage
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody EventManage eventManage){
+        eventManageService.add(eventManage);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody EventManage eventManage)
+    {
+        eventManageService.update(eventManage);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param type 地址
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<EventManage>> list(@RequestParam Integer current,
+                                                   @RequestParam Integer size,
+                                                   @RequestParam(required = false) String name,
+                                                   @RequestParam(required = false) String type,
+                                                   @RequestParam(required = false) Date startTime,
+                                                   @RequestParam(required = false) Date endTime)
+    {
+        return ApiResult.success(eventManageService.list(current,size,name,type,startTime,endTime));
+    }
+
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param type 地址
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(@RequestParam(required = false) String name,
+                                                   @RequestParam(required = false) String type,
+                                    @RequestParam(required = false) Date startTime,
+                                    @RequestParam(required = false) Date endTime)
+    {
+        return ApiResult.success(eventManageService.export(name,type,startTime,endTime));
+    }
+
+
+
+    /**
+     * 事件汇总
+     * @return
+     */
+    @GetMapping("/collect")
+    public ApiResult<AlertCheckVO> getCollect(@RequestParam(required = false) Integer type){
+        return ApiResult.success(eventManageService.getCollect(type));
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        eventManageService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 89 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/FacilityController.java

@@ -0,0 +1,89 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.Facility;
+import com.usky.dm.service.FacilityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+/**
+ * 资产表
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/facility")
+public class FacilityController {
+
+    @Autowired
+    private FacilityService facilityService;
+
+
+    /**
+     * 新增记录
+     * @param facility
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody @Validated Facility facility){
+        facility.setCreatTime(new Date());
+        facility.setStatus(0);
+        facilityService.add(facility);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody @Validated Facility facility)
+    {
+        facilityService.update(facility);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param address 地址
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<Facility>> list(@RequestParam Integer current,
+                                                @RequestParam Integer size,
+                                                @RequestParam(required = false) String name,
+                                                @RequestParam(required = false) String address)
+    {
+        return ApiResult.success(facilityService.list(current,size,name,address));
+    }
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param address 地址
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(String name,String address){
+        return ApiResult.success(facilityService.export(name,address));
+    }
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        facilityService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 70 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/FloorController.java

@@ -0,0 +1,70 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.Floor;
+import com.usky.dm.service.FloorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 楼层
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/floor")
+public class FloorController {
+
+    @Autowired
+    private FloorService floorService;
+
+    /**
+     * 建筑新增
+     * @param floor
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Boolean> add(@RequestBody Floor floor){
+        return ApiResult.success(floorService.add(floor));
+    }
+
+    /**
+     * 建筑修改
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Boolean> update(@RequestBody Floor floor){
+        return ApiResult.success(floorService.update(floor));
+    }
+
+    /**
+     * 删除记录
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Boolean> delete(@PathVariable("id") Long id){
+        return ApiResult.success(floorService.delete(id));
+    }
+
+    /**
+     * 楼层查询
+     * @param buildName 建筑名称
+     * @param name 楼层名称
+     * @param buildId 建筑id
+     * @param current 页数
+     * @param size 条数
+     * @return
+     */
+    @GetMapping("list")
+    public ApiResult<CommonPage<Floor>> page(@RequestParam(required = false) String buildName,
+                                             @RequestParam(required = false) String name,
+                                             @RequestParam(required = false) Long buildId,
+                                             @RequestParam Integer current,
+                                             @RequestParam Integer size){
+        return ApiResult.success(floorService.page(name,buildName,buildId,current,size));
+    }
+}
+

+ 87 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/InspectionPointController.java

@@ -0,0 +1,87 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.InspectionPoint;
+import com.usky.dm.service.InspectionPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 维保点位
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/inspectionPoint")
+public class InspectionPointController {
+
+    @Autowired
+    private InspectionPointService inspectionPointService;
+
+
+    /**
+     * 新增记录
+     * @param inspectionPoint
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody InspectionPoint inspectionPoint){
+        inspectionPointService.add(inspectionPoint);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody InspectionPoint inspectionPoint)
+    {
+        inspectionPointService.update(inspectionPoint);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param address 地址
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<InspectionPoint>> list(@RequestParam Integer current,
+                                                       @RequestParam Integer size,
+                                                       @RequestParam(required = false) String name,
+                                                       @RequestParam(required = false) String address)
+    {
+        return ApiResult.success(inspectionPointService.list(current,size,name,address));
+    }
+
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param address 地址
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(@RequestParam(required = false) String name,
+                                    @RequestParam(required = false) String address){
+        return ApiResult.success(inspectionPointService.export(name,address));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        inspectionPointService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 72 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MaintianLogController.java

@@ -0,0 +1,72 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.MaintianLog;
+import com.usky.dm.domain.WorkOrder;
+import com.usky.dm.mapper.vo.MaintianLogRequest;
+import com.usky.dm.service.MaintianLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 维保记录
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/maintianLog")
+public class MaintianLogController {
+
+
+    @Autowired
+    private MaintianLogService maintianLogService;
+
+
+    /**
+     * 新增记录
+     * @param maintianLog
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody MaintianLog maintianLog){
+        maintianLogService.add(maintianLog);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody MaintianLog maintianLog)
+    {
+        maintianLogService.update(maintianLog);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 记录查询
+     * @param maintianLogRequest
+     * @return
+     */
+    @PostMapping("/list")
+    public ApiResult<CommonPage<MaintianLog>> list(@RequestBody MaintianLogRequest maintianLogRequest)
+    {
+        return ApiResult.success(maintianLogService.list(maintianLogRequest));
+    }
+
+    /**
+     * 处理告警
+     * @param workOrder
+     * @return
+     */
+    @PutMapping("/checkWorkOrder")
+    public ApiResult<Void> checkAlert(@RequestBody WorkOrder workOrder){
+        maintianLogService.checkWorkOrder(workOrder);
+        return ApiResult.success();
+    }
+}
+

+ 88 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MaintianPlanController.java

@@ -0,0 +1,88 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.MaintianPlan;
+import com.usky.dm.service.MaintianPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 维保计划
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/maintianPlan")
+public class MaintianPlanController {
+
+    @Autowired
+    private MaintianPlanService maintianPlanService;
+
+
+    /**
+     * 新增记录
+     * @param maintianPlan
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody MaintianPlan maintianPlan){
+        maintianPlanService.add(maintianPlan);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody MaintianPlan maintianPlan)
+    {
+        maintianPlanService.update(maintianPlan);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param dutyId 责任人
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<MaintianPlan>> list(@RequestParam Integer current,
+                                                    @RequestParam Integer size,
+                                                    @RequestParam(required = false) String name,
+                                                    @RequestParam(required = false) Integer dutyId)
+    {
+        return ApiResult.success(maintianPlanService.list(current,size,name,dutyId));
+    }
+
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param dutyId 地址
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(@RequestParam(required = false) String name,
+                                    @RequestParam(required = false) Integer dutyId){
+        return ApiResult.success(maintianPlanService.export(name,dutyId));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        maintianPlanService.remove(id);
+        return ApiResult.success();
+    }
+
+}
+

+ 43 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MonitorDeviceController.java

@@ -0,0 +1,43 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.dm.domain.MonitorDevice;
+import com.usky.dm.service.MonitorDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 监测点位-设备关联
+ *
+ * @author ya
+ * @since 2022-02-23
+ */
+@RestController
+@RequestMapping("/monitorDevice")
+public class MonitorDeviceController {
+
+
+    @Autowired
+    private MonitorDeviceService monitorDeviceService;
+
+
+
+    /**
+     * 分页记录
+     * @param pointId 点位id
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<List<MonitorDevice>> list(@RequestParam Integer pointId)
+    {
+        return ApiResult.success(monitorDeviceService.list(pointId));
+    }
+
+}
+

+ 92 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/MonitorPointController.java

@@ -0,0 +1,92 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.MonitorPoint;
+import com.usky.dm.service.MonitorPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+/**
+ * 监测点位
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/monitorPoint")
+public class MonitorPointController {
+
+    @Autowired
+    private MonitorPointService monitorPointService;
+
+
+
+    /**
+     * 新增记录
+     * @param monitorPoint
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody MonitorPoint monitorPoint){
+        monitorPointService.add(monitorPoint);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody MonitorPoint monitorPoint)
+    {
+        monitorPointService.update(monitorPoint);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<MonitorPoint>> list(@RequestParam Integer current,
+                                                    @RequestParam Integer size,
+                                                    @RequestParam(required = false) String name,
+                                                    @RequestParam(required = false)Date startTime,
+                                                    @RequestParam(required = false)Date endTime)
+    {
+        return ApiResult.success(monitorPointService.list(current,size,name,startTime,endTime));
+    }
+
+
+    /**
+     * 导出记录
+     * @param name 名称
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/export")
+    public ApiResult<String> export(String name,Date startTime,Date endTime){
+        return ApiResult.success(monitorPointService.export(name,startTime,endTime));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        monitorPointService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 59 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/PlanChildController.java

@@ -0,0 +1,59 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.PlanChild;
+import com.usky.dm.mapper.vo.MaintianLogRequest;
+import com.usky.dm.service.PlanChildService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 维保计划子表
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/planChild")
+public class PlanChildController {
+
+    @Autowired
+    private PlanChildService planChildService;
+
+    /**
+     * 记录查询
+     * @param maintianLogRequest
+     * @return
+     */
+    @PostMapping("/list")
+    public ApiResult<CommonPage<PlanChild>> list(@RequestBody MaintianLogRequest maintianLogRequest)
+    {
+        return ApiResult.success(planChildService.list(maintianLogRequest));
+    }
+
+
+    /**
+     * 汇总
+     * @return
+     */
+    @GetMapping("/collect")
+    public ApiResult<Map<String,Object>> getCollect(){
+        return ApiResult.success(planChildService.getCollect());
+    }
+
+    /**
+     * 导出
+     * @param maintianLogRequest
+     * @return
+     */
+    @PostMapping("/export")
+    public ApiResult<String> export(@RequestBody MaintianLogRequest maintianLogRequest)
+    {
+        return ApiResult.success(planChildService.export(maintianLogRequest));
+    }
+}
+

+ 72 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/PlanPathController.java

@@ -0,0 +1,72 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.PlanPath;
+import com.usky.dm.service.PlanPathService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 巡更路线
+ * @author ya
+ * @since 2022-04-25
+ */
+@RestController
+@RequestMapping("/planPath")
+public class PlanPathController {
+
+
+    @Autowired
+    private PlanPathService planPathService;
+
+
+    /**
+     * 新增记录
+     * @param planPath
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody PlanPath planPath){
+        planPathService.add(planPath);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody PlanPath planPath)
+    {
+        planPathService.update(planPath);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<PlanPath>> list(@RequestParam Integer current,
+                                                @RequestParam Integer size,
+                                                @RequestParam(required = false) String name)
+    {
+        return ApiResult.success(planPathService.list(current,size,name));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Long id)
+    {
+        planPathService.remove(id);
+        return ApiResult.success();
+    }
+}
+

+ 40 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/PlanSpotController.java

@@ -0,0 +1,40 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.dm.domain.PlanSpot;
+import com.usky.dm.service.PlanSpotService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 线路-点位 关联
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/planSpot")
+public class PlanSpotController {
+
+    @Autowired
+    private PlanSpotService planSpotService;
+
+
+    /**
+     * 记录查询
+     * @param pathId 线路编号
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<List<PlanSpot>> list(@RequestParam Integer pathId)
+    {
+        return ApiResult.success(planSpotService.list(pathId));
+    }
+}
+

+ 72 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/ProductController.java

@@ -0,0 +1,72 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.dm.domain.Product;
+import com.usky.dm.service.ProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 产品
+ * @author ya
+ * @since 2022-03-31
+ */
+@RestController
+@RequestMapping("/product")
+public class ProductController {
+
+    @Autowired
+    private ProductService productService;
+
+    /**
+     * 新增记录
+     * @param product
+     * @return
+     */
+    @PostMapping
+    public ApiResult add(@RequestBody Product product){
+        if (productService.checkNameUnique(product))
+        {
+            throw new BusinessException("新增产品信息'" + product.getName() + "'失败,产品信息已存在");
+        }
+        return ApiResult.success(productService.add(product));
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult edit(@RequestBody Product product)
+    {
+        return ApiResult.success(productService.update(product));
+    }
+
+    /**
+     * 记录查询
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<CommonPage<Product>> list(@RequestParam Integer current,
+                                               @RequestParam Integer size,
+                                               @RequestParam(required = false) String name)
+    {
+        return ApiResult.success(productService.list(current, size, name));
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult remove(@PathVariable("id") Long id)
+    {
+        return ApiResult.success(productService.remove(id));
+    }
+}
+

+ 73 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/RoomController.java

@@ -0,0 +1,73 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.Room;
+import com.usky.dm.service.RoomService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 房间
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/room")
+public class RoomController {
+
+
+    @Autowired
+    private RoomService roomService;
+
+    /**
+     * 房间新增
+     * @param room
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Boolean> add(@RequestBody Room room){
+        return ApiResult.success(roomService.add(room));
+    }
+
+    /**
+     * 房间修改
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Boolean> update(@RequestBody Room room){
+        return ApiResult.success(roomService.update(room));
+    }
+
+    /**
+     * 房间删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Boolean> delete(@PathVariable("id") Long id){
+        return ApiResult.success(roomService.delete(id));
+    }
+
+    /**
+     * 房间查询
+     * @param name 名称
+     * @param floorName 楼层名称
+     * @param floorId 楼层id
+     * @param current 页数
+     * @param size 条数
+     * @param buildName 建筑名称
+     * @return
+     */
+    @GetMapping("list")
+    public ApiResult<CommonPage<Room>> page(@RequestParam(required = false) String floorName,
+                                            @RequestParam(required = false) String name,
+                                            @RequestParam(required = false) Long floorId,
+                                            @RequestParam Integer current,
+                                            @RequestParam Integer size,
+                                            @RequestParam(required = false) String buildName){
+        return ApiResult.success(roomService.page(name,floorName,floorId,current,size,buildName));
+    }
+}
+

+ 172 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TbAlarmController.java

@@ -0,0 +1,172 @@
+package com.usky.dm.controller.web;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.util.StringUtils;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.dm.domain.TbAlarm;
+import com.usky.dm.domain.WorkOrder;
+import com.usky.dm.mapper.vo.AlertRequest;
+import com.usky.dm.service.TbAlarmService;
+import com.usky.dm.service.WorkOrderService;
+import com.usky.dm.service.enums.WorkOrderType;
+import com.usky.dm.service.vo.AlertCheckVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 设备告警表
+ *
+ * @author ya
+ * @since 2022-02-28
+ */
+@RestController
+@RequestMapping("/tbAlarm")
+public class TbAlarmController {
+
+
+    @Autowired
+    private TbAlarmService tbAlarmService;
+
+    @Autowired
+    private WorkOrderService workOrderService;
+
+
+    /**
+     * 告警统计
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("collect")
+    public ApiResult<AlertCheckVO> getCollect(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbAlarmService.selectCollect(alertRequest));
+    }
+
+    /**
+     * 记录查询
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("page")
+    public ApiResult<CommonPage<TbAlarm>> page(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbAlarmService.page(alertRequest));
+    }
+
+
+    /**
+     * 导出记录
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("export")
+    public ApiResult<String> export(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbAlarmService.export(alertRequest));
+    }
+
+    /**
+     * 图表汇总
+     * @param  alertRequest
+     * @return
+     */
+    @PostMapping("collectIco")
+    public ApiResult<List<Map<String,Object>>> getCollectIco(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbAlarmService.getCollectIco(alertRequest));
+    }
+
+    /**
+     * 图表汇总详情
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("collectIcoDetail")
+    public ApiResult<List<Map<String,Object>>> getCollectIcoDetail(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbAlarmService.getCollectIcoDetail(alertRequest));
+    }
+
+
+    /**
+     * 单个处理告警
+     * @param tbAlarm
+     * @return
+     */
+    @PutMapping("/checkWorkOrder")
+    public ApiResult<Void> checkAlert(@RequestBody TbAlarm tbAlarm){
+        tbAlarm.setUpdateTime(new Date());
+        tbAlarm.setUpdateBy(SecurityUtils.getUsername());
+        WorkOrder workOrder = new WorkOrder();
+        workOrder.setBusinessId(tbAlarm.getId().toString());
+        workOrder.setWorkOrderType(WorkOrderType.FIRE_ALERT.getCode());
+        workOrder.setClnr(tbAlarm.getCheckContent());
+        workOrderService.checkWorkOrder(workOrder,wo -> tbAlarmService.updateById(tbAlarm));
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 修改记录
+     * @param tbAlarm
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Boolean> update(@RequestBody @Validated TbAlarm tbAlarm){
+        tbAlarm.setUpdateTime(new Date());
+        tbAlarm.setUpdateBy(SecurityUtils.getUsername());
+        return ApiResult.success(tbAlarmService.updateById(tbAlarm));
+    }
+
+    /**
+     * 批量处理
+     * @param tbAlarm
+     * @return
+     */
+    @PutMapping("list")
+    public ApiResult<Boolean> updateList(@RequestBody @Validated TbAlarm tbAlarm){
+        tbAlarm.setUpdateTime(new Date());
+        tbAlarm.setUpdateBy(SecurityUtils.getUsername());
+        LambdaQueryWrapper<TbAlarm> query = Wrappers.lambdaQuery();
+        query.select(TbAlarm::getId)
+                .eq(StringUtils.isNotBlank(tbAlarm.getAddress()),TbAlarm::getAddress,tbAlarm.getAddress())
+                .isNull(StringUtils.isBlank(tbAlarm.getAddress()),TbAlarm::getAddress)
+                .eq(TbAlarm::getProperty,tbAlarm.getProperty())
+                .eq(TbAlarm::getDeviceId,tbAlarm.getDeviceId())
+                .eq(TbAlarm::getAlarmStatus,0);
+        List<TbAlarm> list = tbAlarmService.list(query);
+        for (TbAlarm tb:list) {
+            tb.setUpdateBy(SecurityUtils.getUsername());
+            tb.setUpdateTime(new Date());
+            tb.setIsAlarm(tbAlarm.getIsAlarm());
+            tb.setCheckContent(tbAlarm.getCheckContent());
+            tb.setAlarmStatus(tbAlarm.getAlarmStatus());
+        }
+        tbAlarmService.updateBatchById(list);
+        LambdaUpdateWrapper<WorkOrder> queryWrapper = Wrappers.lambdaUpdate();
+        queryWrapper
+                .set(WorkOrder::getClzt,1)
+                .set(WorkOrder::getCzTime,new Date())
+                .set(WorkOrder::getCzPeople,SecurityUtils.getUsername())
+                .set(WorkOrder::getClnr,tbAlarm.getCheckContent())
+                .in(WorkOrder::getBusinessId,list.stream().map(t -> t.getId().toString()).collect(Collectors.toList()));
+        return ApiResult.success(workOrderService.update(queryWrapper));
+    }
+
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public ApiResult<TbAlarm> byId(@PathVariable("id") Long id){
+        return ApiResult.success(tbAlarmService.getById(id));
+    }
+}
+

+ 97 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TbDeviceStatusController.java

@@ -0,0 +1,97 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.dm.domain.TbDeviceStatus;
+import com.usky.dm.mapper.vo.AlertRequest;
+import com.usky.dm.service.TbDeviceStatusService;
+import com.usky.dm.service.vo.AlertCheckVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 离线-故障数据
+ *
+ * @author ya
+ * @since 2022-03-14
+ */
+@RestController
+@RequestMapping("/tbDeviceStatus")
+public class TbDeviceStatusController {
+
+
+    @Autowired
+    private TbDeviceStatusService tbDeviceStatusService;
+
+
+
+
+    /**
+     * 告警统计
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("collect")
+    public ApiResult<AlertCheckVO> getCollect(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbDeviceStatusService.selectCollect(alertRequest));
+    }
+
+    /**
+     * 记录查询
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("page")
+    public ApiResult<CommonPage<TbDeviceStatus>> page(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbDeviceStatusService.page(alertRequest));
+    }
+
+    /**
+     * 导出记录
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("export")
+    public ApiResult<String> export(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbDeviceStatusService.export(alertRequest));
+    }
+
+    /**
+     * 图表汇总
+     * @param  alertRequest
+     * @return
+     */
+    @PostMapping("collectIco")
+    public ApiResult<List<Map<String,Object>>> getCollectIco(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbDeviceStatusService.getCollectIco(alertRequest));
+    }
+
+    /**
+     * 图表汇总详情
+     * @param alertRequest
+     * @return
+     */
+    @PostMapping("collectIcoDetail")
+    public ApiResult<List<Map<String,Object>>> getCollectIcoDetail(@RequestBody AlertRequest alertRequest){
+        return ApiResult.success(tbDeviceStatusService.getCollectIcoDetail(alertRequest));
+    }
+
+    /**
+     * 修改记录
+     * @param tbDeviceStatus
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Boolean> update(@RequestBody TbDeviceStatus tbDeviceStatus){
+        tbDeviceStatus.setUpdateBy(SecurityUtils.getUsername());
+        tbDeviceStatus.setUpdateTime(new Date());
+        return ApiResult.success(tbDeviceStatusService.updateById(tbDeviceStatus));
+    }
+}
+

+ 39 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TbInfoController.java

@@ -0,0 +1,39 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.TbInfo;
+import com.usky.dm.mapper.vo.InfoRequest;
+import com.usky.dm.service.TbInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备心跳表
+ *
+ * @author ya
+ * @since 2022-02-28
+ */
+@RestController
+@RequestMapping("/tbInfo")
+public class TbInfoController {
+
+    @Autowired
+    private TbInfoService tbInfoService;
+
+    /**
+     * 记录查询
+     * @param infoRequest
+     * @return
+     */
+    @PostMapping("/list")
+    public ApiResult<CommonPage<TbInfo>> list(@RequestBody InfoRequest infoRequest)
+    {
+        return ApiResult.success(tbInfoService.list(infoRequest));
+    }
+}
+

+ 0 - 21
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TestController.java

@@ -1,21 +0,0 @@
-package com.usky.dm.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-07-21
- */
-@Controller
-@RequestMapping("/test")
-public class TestController {
-
-}
-

+ 104 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/WorkOrderController.java

@@ -0,0 +1,104 @@
+package com.usky.dm.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.WorkOrder;
+import com.usky.dm.mapper.vo.WorkOrderRequest;
+import com.usky.dm.service.WorkOrderService;
+import com.usky.dm.service.vo.AlertCheckVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 工单
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("/workOrder")
+public class WorkOrderController {
+
+
+    @Autowired
+    private WorkOrderService workOrderService;
+
+
+    /**
+     * 新增记录
+     * @param workOrder
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody WorkOrder workOrder){
+        workOrderService.add(workOrder);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改记录
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@Validated @RequestBody WorkOrder workOrder)
+    {
+        workOrderService.update(workOrder);
+        return ApiResult.success();
+    }
+
+    /**
+     * 记录查询
+     * @param workOrderRequest 工单
+     * @return
+     */
+    @PostMapping("/list")
+    public ApiResult<CommonPage<WorkOrder>> list(@RequestBody WorkOrderRequest workOrderRequest)
+    {
+        return ApiResult.success(workOrderService.list(workOrderRequest));
+    }
+
+
+    /**
+     * 导出记录
+     * @param workOrderRequest 工单
+     * @return
+     */
+    @PostMapping("/export")
+    public ApiResult<String> export(@RequestBody WorkOrderRequest workOrderRequest)
+    {
+        return ApiResult.success(workOrderService.export(workOrderRequest));
+    }
+
+    /**
+     * 工单汇总
+     * @return
+     */
+    @GetMapping("/collect")
+    public ApiResult<AlertCheckVO> getCollect(){
+        return ApiResult.success(workOrderService.getCollect());
+    }
+
+
+    /**
+     * 删除记录
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 查看工单详情
+     * @param type 类型
+     * @param businessId 业务编号
+     * @return
+     */
+    @GetMapping("/oneByType")
+    public ApiResult<WorkOrder> oneByType(@RequestParam Integer type, @RequestParam String businessId){
+        return ApiResult.success(workOrderService.oneByTypeAndBusiness(type,businessId));
+    }
+}
+

+ 73 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/AccountLock.java

@@ -0,0 +1,73 @@
+package com.usky.dm.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class AccountLock implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 密码长度
+     */
+    private Integer pwdLength;
+
+    /**
+     * 失效时间
+     */
+    private Integer loseDate;
+
+    /**
+     * 锁定次数
+     */
+    private Integer lockNumber;
+
+    /**
+     * 是否默认
+     */
+    private Boolean isEnable;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+    /**
+     * 修改人
+     */
+    private Date updateBy;
+
+
+    private Boolean delFlag;
+
+}

+ 171 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaAhuInfo.java

@@ -0,0 +1,171 @@
+package com.usky.dm.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaAhuInfo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 运行状态
+     */
+    private String rs;
+
+    /**
+     * 故障状态
+     */
+    private String al;
+
+    /**
+     * 手自动
+     */
+    private String aom;
+
+    /**
+     * 启停控制
+     */
+    private String c;
+
+    /**
+     * 风机压差
+     */
+    private String jdps;
+
+    /**
+     * 滤网压差
+     */
+    private String zx;
+
+    /**
+     * 防冻报警
+     */
+    private String fd;
+
+    /**
+     * 送风温度
+     */
+    private String st;
+
+    /**
+     * 送风湿度
+     */
+    private String sh;
+
+    /**
+     * 回风温度
+     */
+    private String rt;
+
+    /**
+     * 回风湿度
+     */
+    private String rh;
+
+    /**
+     * 排风温度
+     */
+    private String pt;
+
+    /**
+     * 排风湿度
+     */
+    private String ph;
+
+    /**
+     * 新风阀反馈
+     */
+    private String xffb;
+
+    /**
+     * 新风阀开关控制
+     */
+    private String xfc;
+
+    /**
+     * 回风阀反馈
+     */
+    private String hffb;
+
+    /**
+     * 回风阀开关控制
+     */
+    private String hfc;
+
+    /**
+     * 排风阀反馈
+     */
+    private String pffb;
+
+    /**
+     * 排风阀开关控制
+     */
+    private String pfc;
+
+    /**
+     * 水阀调解控制
+     */
+    private String sfm;
+
+    /**
+     * 水阀反馈
+     */
+    private String sffb;
+
+    /**
+     * 风阀调解控制
+     */
+    private String ffm;
+
+    /**
+     * 风阀反馈
+     */
+    private String fffb;
+
+    /**
+     * 设定温度
+     */
+    private String sett;
+
+    /**
+     * 冬夏季切换
+     */
+    private String mode;
+
+    /**
+     * 总启停
+     */
+    private String setc;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

+ 67 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaCwInfo.java

@@ -0,0 +1,67 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaCwInfo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+    /**
+     * 厕所类型
+     */
+    private String wcType;
+
+    /**
+     * 是否故障
+     */
+    private Boolean isAlert;
+    /**
+     * 编号
+     */
+    private String wcCode;
+
+
+}

+ 66 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaJsjInfo.java

@@ -0,0 +1,66 @@
+package com.usky.dm.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaJsjInfo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 泵1运行状态
+     */
+    private String b1rs;
+
+    /**
+     * 泵1故障状态
+     */
+    private String b1al;
+
+    /**
+     * 泵2运行状态
+     */
+    private String b2rs;
+
+    /**
+     * 泵2故障状态
+     */
+    private String b2al;
+
+    /**
+     * 液位开关
+     */
+    private String yw;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

+ 106 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/BaPauInfo.java

@@ -0,0 +1,106 @@
+package com.usky.dm.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaPauInfo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 运行状态
+     */
+    private String rs;
+
+    /**
+     * 故障状态
+     */
+    private String al;
+
+    /**
+     * 手自动
+     */
+    private String aom;
+
+    /**
+     * 启停控制
+     */
+    private String c;
+
+    /**
+     * 风机压差
+     */
+    private String jdps;
+
+    /**
+     * 滤网压差
+     */
+    private String zx;
+
+    /**
+     * 送风温度
+     */
+    private String st;
+
+    /**
+     * 送风湿度
+     */
+    private String sh;
+
+    /**
+     * 水阀调解控制
+     */
+    private String fm;
+
+    /**
+     * 水阀反馈
+     */
+    private String sffb;
+
+    /**
+     * 设定温度
+     */
+    private String sett;
+
+    /**
+     * 冬夏季切换
+     */
+    private String mode;
+
+    /**
+     * 总启停
+     */
+    private String setc;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

+ 109 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Building.java

@@ -0,0 +1,109 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Building implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 建筑名称
+     */
+    private String buildName;
+
+    /**
+     * 地理坐标‘,’分隔
+     */
+    private String posistion;
+
+    /**
+     * 省
+     */
+    private String addr1;
+
+    /**
+     * 市
+     */
+    private String addr2;
+
+    /**
+     * 区、县
+     */
+    private String addr3;
+
+    /**
+     * 详情地址
+     */
+    private String address;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+
+    /**
+     * 添加人
+     */
+    private String addMan;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 逻辑删除表示 0 删除 1 未删除
+     */
+    private String data1;
+
+    /**
+     * 预留字段
+     */
+    private String data2;
+
+    /**
+     * 预留字段
+     */
+    private String data3;
+
+    /**
+     * 预留字段
+     */
+    private String data4;
+
+    /**
+     * 预留字段
+     */
+    private String data5;
+
+
+}

+ 89 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/CommunicationApi.java

@@ -0,0 +1,89 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 通信接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CommunicationApi implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 通信接口表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 通信接口名称
+     */
+    private String interfaceName;
+
+    /**
+     * 通信接口路径
+     */
+    private String interfaceRoute;
+
+    /**
+     * 通信接口参数
+     */
+    private String interfaceParameter;
+
+    /**
+     * 接口传输方式
+     */
+    private String interfaceTransmissionMode;
+
+    /**
+     * 接口说明
+     */
+    private String interfaceExplain;
+
+    /**
+     * 接口文档路径
+     */
+    private String interfaceFileRoute;
+
+    /**
+     * 接口所属商家
+     */
+    private String business;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 显示状态:0.不显示;1.显示;
+     */
+    private Integer eState;
+
+    /**
+     * 添加人
+     */
+    private String addPeople;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+
+
+}

+ 105 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Company.java

@@ -0,0 +1,105 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 单位表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Company implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位编号
+     */
+    private String ownerId;
+
+    /**
+     * 单位名称
+     */
+    @NotBlank(message = "产品名称不能为空")
+    @Size(min = 0, max = 100, message = "产品名称不能超过100个字符")
+    private String ownerName;
+
+    private String ownerAddress;
+
+    private String ownerOffice;
+
+    private String ownerMan;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人
+     */
+    private String createMan;
+
+    /**
+     * 所属建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 交通,办公,酒店旅馆,
+     */
+    private String xmlx;
+
+    /**
+     * rtmp协议地址
+     */
+    private String rtmp;
+
+    /**
+     * hls协议地址
+     */
+    private String hls;
+
+    /**
+     * 微信视频地址
+     */
+    private String h5;
+
+    /**
+     * 0已删除,1未删除 默认1
+     */
+    private String data1;
+
+    private String data2;
+
+    private String data3;
+
+    /**
+     * 联系人(责任人)
+     */
+    private String contacts;
+
+    /**
+     * 联系人手机号
+     */
+    private String contactsPhone;
+
+
+}

+ 204 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Device.java

@@ -0,0 +1,204 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Device implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    @Size(min = 0, max = 40, message = "设备编号不能超过50个字符")
+    private String ownerCode;
+
+    /**
+     * 设备名称
+     */
+    @Size(min = 0, max = 20, message = "设备名称不能超过50个字符")
+    private String ownerName;
+
+    /**
+     * 安装位置
+     */
+    private String unitinfo;
+
+    /**
+     * 楼层
+     */
+    private String louyu;
+
+    /**
+     * sim卡
+     */
+    private String sim;
+
+    /**
+     * 维保时间
+     */
+    @TableField("maintainTime")
+    private String maintainTime;
+
+    /**
+     * 对应方法
+     */
+    private Integer destAddress;
+
+    /**
+     * 省
+     */
+    private String addr1;
+
+    /**
+     * 市
+     */
+    private String addr2;
+
+    /**
+     * 区、县
+     */
+    private String addr3;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 位置
+     */
+    private String posistion;
+
+    /**
+     * 安装时间
+     */
+    private Date installTime;
+
+    /**
+     * 安装人
+     */
+    private String installMan;
+
+    /**
+     * 1火系统  2水系统 3烟感系统 4消防栓,5液位 6rtu 7电气火灾 8防火门 9气体灭火 10人脸识别 16视频监控 128井盖 
+     */
+    private Integer dwtype;
+
+    /**
+     * 建筑id
+     */
+    private String ownerXh;
+
+    /**
+     * 间隔时间
+     */
+    @TableField("s_interval")
+    private Integer nextTime;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * 所属单位
+     */
+    private String company;
+
+    /**
+     * 房间唯一编码
+     */
+    private String rtmp;
+
+    /**
+     * 设状态0删除1未删除 默认1
+     */
+    private String hls;
+
+    private String html5;
+
+    private String danwei;
+
+    /**
+     * 倍率
+     */
+    private String ownerBl;
+
+    /**
+     * 报告推送参数1
+     */
+    private Long pushParam1;
+
+    /**
+     * 报告推送参数2
+     */
+    private Long pushParam2;
+
+    /**
+     * 报告推送参数3
+     */
+    private Long pushParam3;
+
+    /**
+     * 报告推送参数4
+     */
+    private Long pushParam4;
+
+    /**
+     * 登录参数Json格式存储
+     */
+    private String loginParam;
+
+    /**
+     * 传输类型
+     */
+    private String transferType;
+
+    /**
+     * 设备状态(75:离 300:故 0:正)
+     */
+    @TableField(exist = false)
+    private Integer deviceStatus;
+
+
+    @TableField(exist = false)
+    private String deviceType;
+
+
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 建筑名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+
+}

+ 82 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DeviceChannel.java

@@ -0,0 +1,82 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceChannel implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备监测对象通道表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 通道名称
+     */
+    @NotBlank(message = "通道名称不能为空")
+    @Size(min = 0, max = 100, message = "通道名称不能超过100个字符")
+    private String passagewayName;
+
+    /**
+     * 类型为:1.用传(火系统) 2.水系统 3.烟感
+     */
+    private Integer dwtype;
+
+    /**
+     * dwtype为1通道类型:0.通信报警;1.主机报警;dwtype为2通道类型:1.状态;2.剩余电量;3.无线信号;4.水压/水位;dwtype为3通道类型:1.状态;2.剩余电量;3.无线信号;
+     */
+    private Integer passagewayType;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 状态:0.不显示;1.显示;
+     */
+    private Integer eState;
+
+    /**
+     * 添加人/创建人
+     */
+    private String addPeople;
+
+    /**
+     * 添加时间/创建时间
+     */
+    private Date addTime;
+
+    @TableField(exist = false)
+    private String companyName;
+
+
+}

+ 77 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DeviceStatus.java

@@ -0,0 +1,77 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceStatus implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备状态表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 所有者id
+     */
+    private String deviceid;
+
+    /**
+     * 子设备号
+     */
+    private Integer deviceno;
+
+    /**
+     * 设备状态(75:离 300:故 0:正)
+     */
+    private Integer devicestatus;
+
+    /**
+     * 发生时间
+     */
+    private Date statustime;
+
+    /**
+     * 烟感报警状态
+     */
+    private String fEvt;
+
+    /**
+     * 底座报警状态
+     */
+    private String cEvt;
+
+    /**
+     * 水压事件
+     */
+    private String wEvt;
+
+    /**
+     * 真实设备状态(0在线 不管是否故障,)
+     */
+    private String trueStatus;
+
+    private LocalDateTime lastcommtime;
+
+
+}

+ 94 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DeviceType.java

@@ -0,0 +1,94 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceType implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备类型表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类型名称
+     */
+    @NotBlank(message = "类型名称不能为空")
+    @Size(min = 0, max = 50, message = "类型名称不能超过50个字符")
+    private String typeName;
+
+    /**
+     * 类型值
+     */
+    @NotBlank(message = "类型值不能为空")
+    @Size(min = 0, max = 50, message = "类型值不能超过50个字符")
+    private String typeValue;
+
+    /**
+     * 传输方式:3.2G/4G/5G;1.NB-IOT;2.Lord-IOT;
+     */
+    @NotNull(message = "传输方式不能为空")
+    private Integer transmissionModel;
+
+    /**
+     * 厂家
+     */
+    @Size(min = 0, max = 50, message = "厂家不能超过50个字符")
+    private String business;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 状态:0.显示;1.不显示
+     */
+    private Boolean eState;
+
+    /**
+     * 添加人
+     */
+    private String addPeople;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+    /**
+     * 公司名称
+      */
+    @TableField(exist = false)
+    private String companyName;
+    /**
+     * 传输方式
+     */
+    @TableField(exist = false)
+    private String tm;
+
+
+}

+ 72 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DevopsTeam.java

@@ -0,0 +1,72 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 班组人员
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DevopsTeam implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 团队班组表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 团队/班组名称
+     */
+    private String teamName;
+
+    /**
+     * 状态:1显示;0不显示
+     */
+    private Integer eState;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 添加人
+     */
+    private String addPeople;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+
+
+    @TableField(exist = false)
+    private List<DevopsTeamRelation> userIds;
+
+    @TableField(exist = false)
+    private String companyName;
+
+    @TableField(exist = false)
+    private String dutyName;
+
+    @TableField(exist = false)
+    private String dutyPhone;
+}

+ 56 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/DevopsTeamRelation.java

@@ -0,0 +1,56 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 团队-人员
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DevopsTeamRelation implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 团队/班组关联人员表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 团队/班组主键ID
+     */
+    private Integer fid;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 标签:1.普通组员;2.责任人/队长
+     */
+    private Integer label;
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+}

+ 82 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/EventManage.java

@@ -0,0 +1,82 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 事件管理
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EventManage implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 事件管理主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String eventName;
+
+    /**
+     * 事件类型:1.消防隐患;2.消防告警;3.设备设施
+     */
+    private Integer eventType;
+
+    /**
+     * 报告内容
+     */
+    private String eventContent;
+
+    /**
+     * 上报时间
+     */
+    private Date reportingTime;
+
+    /**
+     * 状态:1.已处理; 0.未处理;
+     */
+    private Integer clzt;
+
+    /**
+     * 处理人
+     */
+    private String clPeople;
+
+    /**
+     * 处理内容
+     */
+    private String clContent;
+
+    /**
+     * 处理时间
+     */
+    private Date clTiem;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+
+}

+ 172 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Facility.java

@@ -0,0 +1,172 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Facility implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 资产编号
+     */
+    @NotBlank(message = "资产编号不能为空")
+    @Size(min = 0, max = 100, message = "资产编号不能超过100个字符")
+    private String facilityNo;
+
+    /**
+     * 资产名称
+     */
+    @NotBlank(message = "资产名称不能为空")
+    @Size(min = 0, max = 100, message = "设备名称不能超过100个字符")
+    private String facilityName;
+
+    /**
+     * 资产类别
+     */
+    @NotNull(message = "资产类别不能为空")
+    private Integer facilityType;
+
+    /**
+     * 使用单位
+     */
+    private String company;
+
+    /**
+     * 使用不部门
+     */
+    private String department;
+
+    /**
+     * 设备型号
+     */
+    private String facilityModel;
+
+    /**
+     * 计量单位
+     */
+    private String unit;
+
+    /**
+     * 负责人
+     */
+    private String man;
+
+    /**
+     * 购入方式
+     */
+    private String purchase;
+
+    /**
+     * 数量
+     */
+    @Min(value = 1,message = "资产数量不能小于1")
+    private Long number;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 存放地点
+     */
+    private String addrs;
+
+    /**
+     * 供应商
+     */
+    private String supplier;
+
+    /**
+     * 入账日期
+     */
+    private Date creatTime;
+
+    /**
+     * 购买日期
+     */
+    private Date buyTime;
+
+    /**
+     * 采购编号
+     */
+    @NotBlank(message = "采购编号不能为空")
+    @Size(min = 0, max = 200, message = "采购编号不能超过200个字符")
+    private String buyNo;
+
+    /**
+     * 发票编号
+     */
+    @NotBlank(message = "发票编号不能为空")
+    @Size(min = 0, max = 255, message = "发票编号不能超过255个字符")
+    private String invoice;
+
+    /**
+     * 登记编号 uuid
+     */
+    private String register;
+
+    /**
+     * 资产用途
+     */
+    private String purpose;
+
+    /**
+     * 保修天数
+     */
+    private Integer warranty;
+
+    /**
+     * 保修周期
+     */
+    private Integer warrantyPeriod;
+
+    /**
+     * 已使用年限
+     */
+    private String usedData;
+
+    /**
+     * 删除状态 0 删除 1未删除
+     */
+    private Integer status;
+
+    /**
+     * 二维码地址
+     */
+    private String qrurl;
+
+    @TableField(exist = false)
+    private String companyName;
+
+}

+ 71 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Floor.java

@@ -0,0 +1,71 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Floor implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 楼层id uuid
+     */
+    private String floorId;
+
+    /**
+     * 建筑id
+     */
+    private String buildId;
+
+    /**
+     * 楼层名称
+     */
+    private String floorName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime creatTime;
+
+    /**
+     * 创建人
+     */
+    private String creatMan;
+
+    /**
+     * 0删除 1 未删除
+     */
+    private Integer status;
+
+    /**
+     * 建筑名称
+     */
+    @TableField(exist = false)
+    private String buildName;
+}

+ 99 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/InspectionPoint.java

@@ -0,0 +1,99 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维保点位
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class InspectionPoint implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 点位名称
+     */
+    private String spotName;
+
+    /**
+     * 点位地址
+     */
+    private String spotAddress;
+
+    /**
+     * 巡检点标签解析:二维码解析
+     */
+    private String spotLabelAnalysis;
+
+    /**
+     * 巡检点标签路径:二维码图片储存路径
+     */
+    private String spotLabelRoute;
+
+    /**
+     * 点位图片路径
+     */
+    private String pictureRoute;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 最新改动时间
+     */
+    private Date latestChangeTime;
+
+    /**
+     * 设备编号
+     */
+    private String data1;
+
+    /**
+     * 状态:0.不显示;1.显示
+     */
+    private Boolean delFlag;
+
+    /**
+     * 留用
+     */
+    private String data3;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    private Integer spotType;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+}

+ 148 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MaintianLog.java

@@ -0,0 +1,148 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维保记录
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MaintianLog implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检计划ID子表
+     */
+    private Integer zbId;
+
+    /**
+     * 巡检点ID
+     */
+    private Integer spotId;
+
+    /**
+     * 责任人ID
+     */
+    private Integer peopleId;
+
+    /**
+     * 点位状态:0正常,1异常,2故障,3其他
+     */
+    private Integer spotAbnormal;
+
+    /**
+     * 应完成时间
+     */
+    private Date ywcTime;
+
+    /**
+     * 完成时间
+     */
+    private Date wcTime;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 备注
+     */
+    private String dwsbRemarks;
+
+    /**
+     * 留用
+     */
+    private String data1;
+
+    /**
+     * 留用
+     */
+    private String data2;
+
+    /**
+     * 留用
+     */
+    private String data3;
+
+    /**
+     * 维保人、巡检人id
+     */
+    private Integer wbrId;
+
+    private Integer recCount;
+
+    /**
+     * 维保人名称
+     */
+    private String wbUserName;
+
+    /**
+     * 是否处理
+     */
+    private Boolean isComplete;
+
+    /**
+     * 单位名称
+      */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 计划名称
+     */
+    @TableField(exist = false)
+    private String planName;
+
+    /**
+     * 团队名称
+     */
+    @TableField(exist = false)
+    private String teamName;
+
+    /**
+     * 点位名称
+     */
+    @TableField(exist = false)
+    private String pointName;
+
+
+    /**
+     * 线路名称
+     */
+    @TableField(exist = false)
+    private String planPathName;
+
+    /**
+     * 责任人
+     */
+    @TableField(exist = false)
+    private String dutyName;
+
+
+    /**
+     * 责任人联系方式
+     */
+    @TableField(exist = false)
+    private String dutyPhone;
+
+
+}

+ 108 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MaintianPlan.java

@@ -0,0 +1,108 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维保计划
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MaintianPlan implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 计划名称:任务名称
+     */
+    private String planName;
+
+    /**
+     * 团队id
+     */
+    private Integer teamId;
+
+    /**
+     * 线路id
+     */
+    private Long planPathId;
+
+    /**
+     * 周期:星期一、星期二、星期三、星期四、星期五、星期六、星期日
+     */
+    private String cycle;
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
+    /**
+     * 开始巡检时间
+     */
+    private LocalTime startInspectTime;
+
+    /**
+     * 结束巡检时间
+     */
+    private LocalTime endInspectTime;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 用户名称
+     */
+    private String data1;
+
+    /**
+     * 留用
+     */
+    private String data2;
+
+    /**
+     * 是否删除
+     */
+    private String data3;
+
+    /**
+     * 团队名称
+     */
+    @TableField(exist = false)
+    private String teamName;
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+    /**
+     * 线路名称
+     */
+    @TableField(exist = false)
+    private String planPathName;
+}

+ 48 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MonitorDevice.java

@@ -0,0 +1,48 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MonitorDevice implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 监测对象对照表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 监测对象主键ID
+     */
+    private Integer fid;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+
+}

+ 78 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/MonitorPoint.java

@@ -0,0 +1,78 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 监测点位
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MonitorPoint implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 监测对象配置表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 监测对象名称 
+     */
+    private String objectName;
+
+    /**
+     * 0显示1不显示
+     */
+    private Integer eState;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 添加人
+     */
+    private String addPeople;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+    /**
+     * 建筑
+     */
+    private String building;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+    /**
+     * 房间
+      */
+    private String room;
+    /**
+     * 设备集合
+     */
+    @TableField(exist = false)
+    private List<String> deviceList;
+
+}

+ 114 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/PlanChild.java

@@ -0,0 +1,114 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维保计划关联关系表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanChild implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检计划主表id
+     */
+    private Integer zbId;
+
+    /**
+     * 团队id
+     */
+    private Integer teamId;
+
+    /**
+     * 路线编号
+     */
+    private Long planPathId;
+
+    /**
+     * 巡检点ID
+     */
+    private Integer spotId;
+
+    /**
+     * 巡检日期
+     */
+    private Date inspectDate;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    private String companyCode;
+
+    /**
+     * 完成情况
+     */
+    private String completion;
+
+    /**
+     * 留用
+     */
+    private String data1;
+
+    /**
+     * 留用
+     */
+    private String data2;
+
+    /**
+     * 留用
+     */
+    private String data3;
+
+    private Boolean isComplete;
+
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 计划名称
+     */
+    @TableField(exist = false)
+    private String planName;
+
+    /**
+     * 团队名称
+     */
+    @TableField(exist = false)
+    private String teamName;
+
+    /**
+     * 线路名称
+     */
+    @TableField(exist = false)
+    private String planPathName;
+}

+ 60 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/PlanPath.java

@@ -0,0 +1,60 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanPath implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 路线名称
+     */
+    private String name;
+
+    /**
+     * 排序
+     */
+    private Integer iOrder;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+
+    private Boolean delFlag;
+
+
+    @TableField(exist = false)
+    private List<Integer> pointIds;
+
+
+}

+ 45 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/PlanSpot.java

@@ -0,0 +1,45 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 维保计划-点位 关联
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanSpot implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检计划主表id
+     */
+    private Integer zbId;
+
+    /**
+     * 巡检点ID
+     */
+    private Integer spotId;
+
+    /**
+     * 状态:0未巡检1已巡检
+     */
+    private Integer zt;
+
+
+}

+ 66 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Product.java

@@ -0,0 +1,66 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Product implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String name;
+
+    private String logo;
+
+    private String introduce;
+
+    private Integer delFlag;
+
+    private Integer enable;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

+ 83 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Room.java

@@ -0,0 +1,83 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Room implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 楼层id
+     */
+    private String floorId;
+
+    /**
+     * 房间id uuid
+     */
+    private String roomId;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 添加时间
+     */
+    private LocalDateTime creatTime;
+
+    /**
+     * 添加人
+     */
+    private String creatMan;
+
+    /**
+     * 0 删除 1 未删除
+     */
+    private Integer status;
+
+    /**
+     * 房间名称
+     */
+    @TableField(exist = false)
+    private String floorName;
+    /**
+     * 建筑名称
+     */
+    @TableField(exist = false)
+    private String buildName;
+
+    @TableField(exist = false)
+    private Long buildId;
+
+}

+ 144 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/TbAlarm.java

@@ -0,0 +1,144 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备告警表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TbAlarm implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备本地注册唯一编码
+     */
+    private String deviceId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 告警时间
+     */
+    private Date alarmTime;
+
+    /**
+     * 告警设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警内容
+     */
+    private String alarmContent;
+
+    /**
+     * 告警状态 0 未处理 1 已处理
+     */
+    private Integer alarmStatus;
+
+    /**
+     * 告警处理备注
+     */
+    private String remark;
+    /**
+     * 属性
+     */
+    private String  property;
+    /**
+     * value
+     */
+    private String  alertValue;
+    /**
+     * 状态
+     */
+    private String  status;
+    /**
+     * 报警内容运行状态
+     */
+    private String  alertType;
+    /**
+     * 序号
+     */
+    private String  serial;
+    /**
+     * 地址
+     */
+    private String  address;
+    /**
+     * 端口
+     */
+    private String  port;
+    /**
+     * 设备状态名称
+     */
+    private String  stuname;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+    /**
+     * 单位编码
+     */
+    private String companyCode;
+
+    /**
+     * 安装位置
+     */
+    private String unitInfo;
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+    /**
+     * 设备类型名称
+     */
+    private String deviceTypeName;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+    /**
+     * 修改人
+     */
+    private String updateBy;
+    /**
+     * 是否误报
+     */
+    private Boolean isAlarm;
+    /**
+     * 处置内容
+      */
+    @Size(min = 0, max = 255, message = "处理内容不能超过255个字符")
+    private String checkContent;
+    /**
+     * 工单编号
+     */
+    private Integer workId;
+}

+ 112 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/TbDeviceStatus.java

@@ -0,0 +1,112 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备心跳表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TbDeviceStatus implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备本地注册唯一编码
+     */
+    private String deviceId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 心跳时间
+     */
+    private Date alarmTime;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 心跳内容
+     */
+    private String alarmContent;
+
+    /**
+     * 心跳状态
+     */
+    private Integer alarmStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 类型
+     */
+    private Integer alarmType;
+
+    /**
+     * 0未处理1已处理
+     */
+    private Integer checkStatus;
+
+    /**
+     * 处理时间
+     */
+    private Date updateTime;
+
+    /**
+     * 处理人
+     */
+    private String updateBy;
+
+
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+    /**
+     * 单位编码
+     */
+    private String companyCode;
+
+    /**
+     * 安装位置
+     */
+    private String unitInfo;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+    /**
+     * 设备类型名称
+     */
+    private String deviceTypeName;
+}

+ 83 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/TbInfo.java

@@ -0,0 +1,83 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备心跳表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TbInfo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备本地注册唯一编码
+     */
+    private String deviceId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 心跳内容
+     */
+    private String pointCode;
+
+    /**
+     * 心跳状态
+     */
+    private String pointData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    
+    private Boolean isNew;
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 设备类型名称
+     */
+    private String deviceTypeName;
+}

+ 117 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/WorkOrder.java

@@ -0,0 +1,117 @@
+package com.usky.dm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 工单
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class WorkOrder implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 工单管理表主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 工单名称                                                                                                  
+     */
+    private String workOrderName;
+
+    /**
+     * 内容
+     */
+    private String workOrderContent;
+
+    /**
+     * 工单类型(1消防告警,2巡检计划,3ba厕位故障)
+     */
+    private Integer workOrderType;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 添加人
+     */
+    private String addPeople;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+
+    /**
+     * 状态(0未处理1已处理:通过2已处理:未通过)
+     */
+    private Integer clzt;
+
+    /**
+     * 处置时间
+     */
+    private Date czTime;
+
+    /**
+     * 处置人
+     */
+    private String czPeople;
+
+    /**
+     * 处理内容
+     */
+    @Size(min = 0, max = 100, message = "处理内容不能超过255个字符")
+    private String clnr;
+    /**
+     * 单位名称
+     */
+    private String companyName;
+    /**
+     * 业务标识
+      */
+    private String businessId;
+    /**
+     * 团队id
+     */
+    private Integer teamId;
+    /**
+     * 团队名称
+      */
+    @TableField(exist = false)
+    private String teamName;
+
+    /**
+     * 责任人
+     */
+    @TableField(exist = false)
+    private String dutyName;
+
+
+    /**
+     * 责任人联系方式
+     */
+    @TableField(exist = false)
+    private String dutyPhone;
+
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaAhuInfoMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.BaAhuInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+public interface BaAhuInfoMapper extends CrudMapper<BaAhuInfo> {
+
+}

+ 4 - 4
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TestMapper.java → service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaCwInfoMapper.java

@@ -1,8 +1,8 @@
 package com.usky.dm.mapper;
 
-import com.usky.common.mybatis.core.CrudMapper;
-import com.usky.dm.domain.Test;
 
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.BaCwInfo;
 
 /**
  * <p>
@@ -10,8 +10,8 @@ import com.usky.dm.domain.Test;
  * </p>
  *
  * @author ya
- * @since 2022-07-21
+ * @since 2022-05-25
  */
-public interface TestMapper extends CrudMapper<Test> {
+public interface BaCwInfoMapper extends CrudMapper<BaCwInfo> {
 
 }

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaJsjInfoMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.BaJsjInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+public interface BaJsjInfoMapper extends CrudMapper<BaJsjInfo> {
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BaPauInfoMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.BaPauInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+public interface BaPauInfoMapper extends CrudMapper<BaPauInfo> {
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/BuildingMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Building;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface BuildingMapper extends CrudMapper<Building> {
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/CommunicationApiMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.CommunicationApi;
+
+/**
+ * <p>
+ * 通信接口 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface CommunicationApiMapper extends CrudMapper<CommunicationApi> {
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/CompanyMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Company;
+
+/**
+ * <p>
+ * 单位表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface CompanyMapper extends CrudMapper<Company> {
+
+}

+ 22 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceChannelMapper.java

@@ -0,0 +1,22 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.DeviceChannel;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface DeviceChannelMapper extends CrudMapper<DeviceChannel> {
+
+
+    Page<DeviceChannel> page(IPage<DeviceChannel> page, @Param("name") String name,
+                             @Param("dwtype") Integer dwtype);
+}

+ 33 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceMapper.java

@@ -0,0 +1,33 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Device;
+import com.usky.dm.mapper.vo.DeviceCollectVO;
+import com.usky.dm.mapper.vo.DeviceRequestVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+
+@Repository
+public interface DeviceMapper extends CrudMapper<Device> {
+
+
+
+    List<DeviceCollectVO> getCollect();
+
+
+    Page<Device> list(IPage<Device> page, @Param("dr") DeviceRequestVO deviceRequestVO);
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceStatusMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.DeviceStatus;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-24
+ */
+public interface DeviceStatusMapper extends CrudMapper<DeviceStatus> {
+
+}

+ 24 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DeviceTypeMapper.java

@@ -0,0 +1,24 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.DeviceType;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Repository
+public interface DeviceTypeMapper extends CrudMapper<DeviceType> {
+
+
+    Page<DeviceType> page(IPage<DeviceType> page, @Param("name") String name,
+                          @Param("typeValue") String typeValue);
+}

+ 23 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DevopsTeamMapper.java

@@ -0,0 +1,23 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.DevopsTeam;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 班组人员 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface DevopsTeamMapper extends CrudMapper<DevopsTeam> {
+
+
+
+    Page<DevopsTeam> page(IPage<DevopsTeam> page, @Param("name") String name,
+                          @Param("userName") String userName);
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/DevopsTeamRelationMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.DevopsTeamRelation;
+
+/**
+ * <p>
+ * 团队-人员 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface DevopsTeamRelationMapper extends CrudMapper<DevopsTeamRelation> {
+
+}

+ 25 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/EventManageMapper.java

@@ -0,0 +1,25 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.EventManage;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 事件管理 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface EventManageMapper extends CrudMapper<EventManage> {
+
+
+    Page<EventManage> page(IPage<EventManage> page, @Param("name") String name, @Param("type") String type,
+                           @Param("startTime") Date startTime,
+                           @Param("endTime") Date endTime);
+}

+ 24 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/FacilityMapper.java

@@ -0,0 +1,24 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Facility;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 资产表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Repository
+public interface FacilityMapper extends CrudMapper<Facility> {
+
+
+    Page<Facility> page(IPage<Facility> page, @Param("name") String name,
+                        @Param("address") String address);
+}

+ 23 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/FloorMapper.java

@@ -0,0 +1,23 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Floor;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface FloorMapper extends CrudMapper<Floor> {
+
+
+    Page<Floor> page(IPage<Floor> page, @Param("name") String name,
+                     @Param("buildName") String buildName,
+                     @Param("buildId") Long buildId);
+}

+ 23 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/InspectionPointMapper.java

@@ -0,0 +1,23 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.InspectionPoint;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 维保点位 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Repository
+public interface InspectionPointMapper extends CrudMapper<InspectionPoint> {
+
+    Page<InspectionPoint> page(IPage<InspectionPoint> page, @Param("name") String name,
+                               @Param("address") String address);
+}

+ 21 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MaintianLogMapper.java

@@ -0,0 +1,21 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.MaintianLog;
+import com.usky.dm.mapper.vo.MaintianLogRequest;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 维保记录 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface MaintianLogMapper extends CrudMapper<MaintianLog> {
+
+    Page<MaintianLog> page(IPage<MaintianLog> page, @Param("ar") MaintianLogRequest maintianLogRequest);
+}

+ 22 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MaintianPlanMapper.java

@@ -0,0 +1,22 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.MaintianPlan;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 维保计划 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Repository
+public interface MaintianPlanMapper extends CrudMapper<MaintianPlan> {
+    Page<MaintianPlan> page(IPage<MaintianPlan> page, @Param("name") String name,
+                            @Param("dutyId") Integer dutyId);
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MonitorDeviceMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.MonitorDevice;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-23
+ */
+public interface MonitorDeviceMapper extends CrudMapper<MonitorDevice> {
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/MonitorPointMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.MonitorPoint;
+
+/**
+ * <p>
+ * 监测点位 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface MonitorPointMapper extends CrudMapper<MonitorPoint> {
+
+}

+ 23 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/PlanChildMapper.java

@@ -0,0 +1,23 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.PlanChild;
+import com.usky.dm.mapper.vo.MaintianLogRequest;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 维保计划关联关系表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+@Repository
+public interface PlanChildMapper extends CrudMapper<PlanChild> {
+
+    Page<PlanChild> page(IPage<PlanChild> page, @Param("ar") MaintianLogRequest maintianLogRequest);
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/PlanPathMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.PlanPath;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-25
+ */
+public interface PlanPathMapper extends CrudMapper<PlanPath> {
+
+}

+ 17 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/PlanSpotMapper.java

@@ -0,0 +1,17 @@
+package com.usky.dm.mapper;
+
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.PlanSpot;
+
+/**
+ * <p>
+ * 维保计划-点位 关联 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface PlanSpotMapper extends CrudMapper<PlanSpot> {
+
+}

+ 18 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/ProductMapper.java

@@ -0,0 +1,18 @@
+package com.usky.dm.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Product;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-31
+ */
+@Repository
+public interface ProductMapper extends CrudMapper<Product> {
+
+}

+ 24 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/RoomMapper.java

@@ -0,0 +1,24 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Room;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface RoomMapper extends CrudMapper<Room> {
+
+
+    Page<Room> page(IPage<Room> page, @Param("name") String name,
+                    @Param("floorName") String floorName,
+                    @Param("floorId") Long floorId,
+                    @Param("buildName") String buildName);
+}

+ 31 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TbAlarmMapper.java

@@ -0,0 +1,31 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.TbAlarm;
+import com.usky.dm.mapper.vo.AlertRequest;
+import com.usky.dm.mapper.vo.DeviceCollectVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备告警表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-28
+ */
+@Repository
+public interface TbAlarmMapper extends CrudMapper<TbAlarm> {
+
+
+
+    List<DeviceCollectVO> selectCollect(AlertRequest alertRequest);
+
+
+    Page<TbAlarm> page(IPage<TbAlarm> page, @Param("ar") AlertRequest alertRequest);
+}

+ 30 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TbDeviceStatusMapper.java

@@ -0,0 +1,30 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.TbDeviceStatus;
+import com.usky.dm.mapper.vo.AlertRequest;
+import com.usky.dm.mapper.vo.DeviceCollectVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备心跳表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-14
+ */
+@Repository
+public interface TbDeviceStatusMapper extends CrudMapper<TbDeviceStatus> {
+
+
+    List<DeviceCollectVO> selectCollect(AlertRequest alertRequest);
+
+
+    Page<TbDeviceStatus> page(IPage<TbDeviceStatus> page, @Param("ar") AlertRequest alertRequest);
+}

+ 24 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TbInfoMapper.java

@@ -0,0 +1,24 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.TbInfo;
+import com.usky.dm.mapper.vo.InfoRequest;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 设备心跳表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-28
+ */
+@Repository
+public interface TbInfoMapper extends CrudMapper<TbInfo> {
+
+
+    Page<TbInfo> page(IPage<TbInfo> page, @Param("ar") InfoRequest infoRequest);
+}

+ 22 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/WorkOrderMapper.java

@@ -0,0 +1,22 @@
+package com.usky.dm.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.WorkOrder;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 工单 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-02-22
+ */
+public interface WorkOrderMapper extends CrudMapper<WorkOrder> {
+
+
+    Page<WorkOrder> page(IPage<WorkOrder> page, @Param("wo") WorkOrder workOrder);
+
+}

+ 78 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/AlertRequest.java

@@ -0,0 +1,78 @@
+package com.usky.dm.mapper.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @author yq
+ * @date 2022/2/28 10:39
+ */
+@Data
+public class AlertRequest {
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 页数
+     */
+    @NotNull
+    @Min(value = 1,message = "页数不能为0")
+    private Integer current;
+    /**
+     * 条数
+     */
+    @NotNull
+    @Max(value = 500,message = "条数不能超过500")
+    private Integer size;
+
+    /**
+     * 1隐患2告警
+     */
+    private Integer type;
+
+    /**
+     * 单位编码
+     */
+    private String companyCode;
+
+    /**
+     * 设备状态
+     */
+    private Integer status;
+
+
+    /**
+     * 处理状态
+     */
+    private Integer checkStatus;
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 1火系统 2 水系统 3rtu 4电气火灾 5 视频监控
+     */
+    private Integer bigDeviceType;
+
+    /**
+     * 设备分类
+     */
+    private List<Integer> deviceTypes;
+    /**
+     * 序号(1061火点侦测,1602占道侦测)
+     */
+    private String serial;
+}

+ 40 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/DeviceCollectVO.java

@@ -0,0 +1,40 @@
+package com.usky.dm.mapper.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2022/2/24 14:16
+ */
+@Data
+public class DeviceCollectVO {
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+    /**
+     * 设备类型string
+     */
+    private String deviceTypeS;
+    /**
+     * 设备状态
+     */
+    private Integer deviceStatus;
+    /**
+     * 数量
+     */
+    private Integer deviceCount;
+    /**
+     * 时间
+     */
+    private String deviceTime;
+    /**
+     * 处理状态
+     */
+    private Integer clzt;
+    /**
+     * 工单编号
+     */
+    private Integer workId;
+}

+ 58 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/DeviceRequestVO.java

@@ -0,0 +1,58 @@
+package com.usky.dm.mapper.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2022/3/8 9:16
+ */
+@Data
+public class DeviceRequestVO {
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+    /**
+     * 大分类
+     */
+    private Integer bigDeviceType;
+    /**
+     * 详情分类
+     */
+    private List<Integer> deviceTypes;
+    /**
+     * 单位编码
+     */
+    private String companyCode;
+    /**
+     * 状态
+     */
+    private Integer status;
+    /**
+     * 0故障1正常
+     */
+    private Integer bigStatus;
+}

+ 71 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/InfoRequest.java

@@ -0,0 +1,71 @@
+package com.usky.dm.mapper.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2022/3/28 9:33
+ */
+@Data
+public class InfoRequest {
+
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 页数
+     */
+    @NotNull
+    @Min(value = 1,message = "页数不能为0")
+    private Integer current;
+    /**
+     * 条数
+     */
+    @NotNull
+    @Max(value = 500,message = "条数不能超过500")
+    private Integer size;
+
+    /**
+     * 单位编码
+     */
+    private String companyCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 1火系统 2 水系统 3rtu 4电气火灾 5 视频监控
+     */
+    private Integer bigDeviceType;
+
+    /**
+     * 设备分类
+     */
+    private List<Integer> deviceTypes;
+
+    private String pointCode;
+
+    private List<String> pointCodes;
+
+    /**
+     * 0否1是
+     */
+    private Boolean isNew;
+
+
+    private String deviceId;
+}

+ 61 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/MaintianLogRequest.java

@@ -0,0 +1,61 @@
+package com.usky.dm.mapper.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MaintianLogRequest {
+
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+      */
+    private Integer size;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 状态
+     */
+    private Integer status;
+    /**
+     * 计划编号
+     */
+    private Long planId;
+
+    /**
+     * 计划字表id
+     */
+    private Long planChildId;
+    /**
+     * 计划名称
+     */
+    private String planName;
+    /**
+     * 责任人
+     */
+    private Long dutyId;
+    /**
+     * 用户
+     */
+    private Long userId;
+
+    /**
+     * 单位名称
+     */
+    private String companyCode;
+    /**
+     * 是否完成
+      */
+    private Boolean isComplete;
+}

+ 62 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/vo/WorkOrderRequest.java

@@ -0,0 +1,62 @@
+package com.usky.dm.mapper.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2022/6/7 14:19
+ */
+@Data
+public class WorkOrderRequest {
+
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+    /**
+     * 工单名称
+     */
+    private  String name;
+    /**
+     * 状态(0未处理1已处理:通过2已处理:未通过)
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 团队编码
+     */
+    private Integer teamId;
+    /**
+     * 团队用户名称
+     */
+    private String userName;
+    /**
+     * 团队用户编号
+      */
+    private String userId;
+
+    /**
+     * 工单类型(1消防告警,2巡检计划,3ba厕位故障)
+     */
+    private Integer wokeOrderType;
+    /**
+     * 团队id集合
+     */
+    private List<Integer> teamIds;
+
+    private Integer id;
+}

+ 22 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/service/BaAhuInfoService.java

@@ -0,0 +1,22 @@
+package com.usky.dm.service;
+
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.dm.domain.BaAhuInfo;
+
+import java.util.Date;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+public interface BaAhuInfoService extends CrudService<BaAhuInfo> {
+
+
+    CommonPage<BaAhuInfo> list(Integer current, Integer size, Date startTime, Date endTime);
+}

+ 40 - 0
service-dm/service-dm-biz/src/main/java/com/usky/dm/service/BaCwInfoService.java

@@ -0,0 +1,40 @@
+package com.usky.dm.service;
+
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.dm.domain.BaCwInfo;
+import com.usky.dm.domain.WorkOrder;
+import com.usky.dm.service.vo.BaCwCollectVO;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-25
+ */
+public interface BaCwInfoService extends CrudService<BaCwInfo> {
+
+    void addByConfig();
+
+    CommonPage<BaCwInfo> list(Integer current, Integer size, Date startTime, Date endTime, String status, String floor,
+                              String type, Boolean isAlert, String name);
+
+
+    void addAlert(WorkOrder workOrder);
+
+
+    void checkAlert(WorkOrder workOrder);
+
+
+    BaCwCollectVO collect(String floor, String type);
+
+
+    List<BaCwCollectVO> collectByFloor(String floor, String type);
+
+}

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů