XMPoleManager.git

			@@ -2,7 +2,6 @@

			import com.sandu.common.domain.ResponseVO;
			import com.sandu.common.object.BaseConditionVO;
			import com.sandu.common.security.annotation.AnonymousAccess;
			import com.sandu.common.util.ResponseUtil;
			import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
			import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
			@@ -12,6 +11,7 @@
			import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
			import com.sandu.ximon.admin.security.PermissionConfig;
			import com.sandu.ximon.admin.service.AirDataService;
			import com.sandu.ximon.admin.utils.RedisUtils;
			import com.sandu.ximon.dao.bo.AirDataBo;
			import com.sandu.ximon.dao.enums.MenuEnum;
			import lombok.AllArgsConstructor;
			@@ -31,6 +31,7 @@
			public class AirDataController {
			private final AirDataService airDataService;
			private PermissionConfig permissionConfig;
			private RedisUtils redisUtils;

			/**
			* 查询大气数据模糊查询
			@@ -65,6 +66,7 @@
			System.out.println(commonFrame + " -----------commonFrame");
			AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
			if (commonFrame != null) {

			success.add(macStr);
			} else {
			failed.add(macStr);

			@@ -153,9 +153,9 @@
			*/
			@PostMapping("/updateNotes")
			public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
			// if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
			// return ResponseUtil.fail("缺少对应用户权限");
			// }
			if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
			return ResponseUtil.fail("缺少对应用户权限");
			}
			boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
			if (flag) {
			return ResponseUtil.success("修改备注成功！");

			@@ -1,6 +1,5 @@
			package com.sandu.ximon.admin.service;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.github.pagehelper.PageHelper;
			import com.sandu.common.execption.BusinessException;
			@@ -53,6 +52,10 @@
			if (poleGroup == null) {
			throw new BusinessException("未找到该分组");
			}
			/**
			* 刪除
			*/
			poleGroupRelationService.remove(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, groupId));
			return removeById(groupId);
			}

	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史