计量集抄设备和告警

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/AlarmTypeDetailsController.java

@@ -19,8 +19,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 /**
- * @description
  * @author andy
+ * @description
  * @data 2020-11-16 11:05
  */
 @RestController
@@ -32,14 +32,14 @@ public class AlarmTypeDetailsController {
     @Autowired
     private AlarmTypeDetailsService alarmTypeDetailsService;
 
-    @GetMapping(value="selectPage" )
+    @GetMapping(value = "selectPage")
     @ApiOperation(value = "分页查询报警详情信息")
-    public AjaxMessage selectPage(@Valid AlarmTypeDetailsDto dto, BasePageDto page){
+    public AjaxMessage selectPage(@Valid AlarmTypeDetailsDto dto, BasePageDto page) {
 
-        return AjaxMessage.success(alarmTypeDetailsService.selectPage(dto,page));
+        return AjaxMessage.success(alarmTypeDetailsService.selectPage(dto, page));
     }
 
-    @RequestMapping(value="export" , method = RequestMethod.GET)
+    @GetMapping(value = "export")
     @ApiOperation(value = "导出告警信息")
     public void exportRealTime(AlarmTypeDetailsDto dto, HttpServletResponse response) throws Exception {
         EasyExcelUtil.excelWrite(response, AlarmTypeDetailsEntityVo.class, "告警记录", alarmTypeDetailsService.selectList(dto));

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -186,7 +186,6 @@ public class DeviceController {
 
     @GetMapping(value="edit/status")
     @ApiOperation(value = "修改状态")
-    @LogAnnotation(module = "【设备管理】修改状态")
     public AjaxMessage editStatus(@ApiParam(value = "设备id") @RequestParam Long id, @ApiParam(value = "状态") @RequestParam int state){
         deviceService.updateDeviceState(id, state);
         return AjaxMessage.success();

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/TestController.java

@@ -77,7 +77,6 @@ public class TestController {
         List<List<Device>> subList2 =  ListUtil.split(list, 5000);
 
         for (List<Device> devices : subList2) {
-            System.out.println("===========");
             deviceMapper.batchInsert(devices);
         }
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -638,6 +638,7 @@ public class DeviceServiceImpl implements DeviceService{
             device.setId(deviceId);
             device.setDeviceStatus(state);
             updateByPrimaryKeySelective(DeviceUpdate);
+            return;
         }
         throw BusinessException.builder(500, "同步更新物联网失败");
     }