controller层的添加

pole-service/src/main/java/com/zksy/pole/controller/DgEquipmentAlarmController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/DgEquipmentAlarm")
 @Api(tags = "灯控设备告警信息", description = "灯控设备告警信息")
@@ -24,4 +26,10 @@ public class DgEquipmentAlarmController {
         Page<DgEquipmentAlarm> page = dgEquipmentAlarmService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
         return Result.ok(page);
     }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgEquipmentAlarmService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
 }

pole-service/src/main/java/com/zksy/pole/controller/DgEquipmentStatusController.java

@@ -0,0 +1,37 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgEquipmentStatusService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgEquipmentStatus")
+@Api(tags = "灯控设备状态信息", description = "灯控设备状态信息")
+public class DgEquipmentStatusController {
+
+    @Autowired
+    private DgEquipmentStatusService dgEquipmentStatusService;
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgEquipmentStatusService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgEquipmentStatusService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgGatewayRegistrationController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgGatewayRegistrationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgGatewayRegistration")
+@Api(tags = "网关注册信息", description = "网关注册信息")
+public class DgGatewayRegistrationController {
+    @Autowired
+    private DgGatewayRegistrationService dgGatewayRegistrationService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgGatewayRegistrationService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgGatewayRegistrationService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgGatewayStrategyController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgGatewayStrategyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgGatewayStrategy")
+@Api(tags = "网关策略信息", description = "网关策略信息")
+public class DgGatewayStrategyController {
+    @Autowired
+    private DgGatewayStrategyService dgGatewayStrategyService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgGatewayStrategyService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgGatewayStrategyService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgLampControlledHeartbeatController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgLampControlledHeartbeatService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgLampControlledHeartbeat")
+@Api(tags = "灯控设备心跳信息", description = "灯控设备心跳信息")
+public class DgLampControlledHeartbeatController {
+    @Autowired
+    private DgLampControlledHeartbeatService dgLampControlledHeartbeatService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgLampControlledHeartbeatService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgLampControlledHeartbeatService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgRelayControlController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgRelayControlService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgRelayControl")
+@Api(tags = "继电器控制信息", description = "继电器控制信息")
+public class DgRelayControlController {
+    @Autowired
+    private DgRelayControlService dgRelayControlService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgRelayControlService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgRelayControlService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgRelayTimingStrategyController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgRelayTimingStrategyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgRelayTimingStrategy")
+@Api(tags = "继电器定时策略信息", description = "继电器定时策略信息")
+public class DgRelayTimingStrategyController {
+    @Autowired
+    private DgRelayTimingStrategyService dgRelayTimingStrategyService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgRelayTimingStrategyService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgRelayTimingStrategyService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgReportEnvironmentalDataController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgReportEnvironmentalDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgReportEnvironmentalData")
+@Api(tags = "网关以固定频率上报环境数据", description = "网关以固定频率上报环境数据")
+public class DgReportEnvironmentalDataController {
+    @Autowired
+    private DgReportEnvironmentalDataService dgReportEnvironmentalDataService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgReportEnvironmentalDataService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgReportEnvironmentalDataService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/controller/DgTimelyControlController.java

@@ -0,0 +1,35 @@
+package com.zksy.pole.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.pole.domain.po.DgEquipmentAlarm;
+import com.zksy.pole.service.DgTimelyControlService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/DgTimelyControl")
+@Api(tags = "灯具及时控制信息", description = "灯具及时控制信息")
+public class DgTimelyControlController {
+    @Autowired
+    private DgTimelyControlService dgTimelyControlService;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getByConditionJsonPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<DgEquipmentAlarm> page = dgTimelyControlService.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<DgEquipmentAlarm> list = dgTimelyControlService.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

pole-service/src/main/java/com/zksy/pole/service/impl/InstructionIssuanceServerImpl.java

@@ -5,6 +5,7 @@ import com.zksy.pole.MQTTServer.request.MqttRequest;
 import com.zksy.pole.MQTTServer.server.MQTTServer;
 import com.zksy.pole.domain.dto.*;
 import com.zksy.pole.service.InstructionIssuanceServer;
+import com.zksy.pole.utils.LockUtils;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelId;