From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 152 ++++++++++++--------------------------------------
1 files changed, 36 insertions(+), 116 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index 323c6eb..44e8bb1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -7,12 +7,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartBeatTimeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereOperationReportInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereQueryVersionReportInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereQueryHeartBeatTimeReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereQueryVersionReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereRebootReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereSetHeartBeatTimeReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
@@ -23,11 +18,11 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.StringUtil;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
-import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
import com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -50,7 +45,6 @@
public void addAirEquipment(AirEquipmentNongGeng airEquipmentNongGeng) {
AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
if (one == null) {
- //TODO
save(airEquipmentNongGeng);
/**
* 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
@@ -75,35 +69,28 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
List<AirEquipmentNongGengBo> airEquipmentBos;
-// if (SecurityUtils.getClientId() == null) {
-// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
-// } else {
-// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
-// }
-
if (SecurityUtils.getClientId() == null) {
airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
} else {
airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
}
- return null;
-// return airEquipmentBos;
+
+ return airEquipmentBos;
}
/**
* 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
*/
public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
-// List<AirEquipmentNongGengBo> airEquipmentBos;
-// if (SecurityUtils.getClientId() == null) {
-// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
-// } else {
-// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
-// }
+ List<AirEquipmentNongGengBo> airEquipmentBos;
+ if (SecurityUtils.getClientId() == null) {
+ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+ } else {
+ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+ }
-// return airEquipmentBos;
- return null;
+ return airEquipmentBos;
}
/**
@@ -138,6 +125,9 @@
*/
public AirEquipmentNongGeng getAirEquipment(String mac) {
AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, mac));
+ if (one == null) {
+ throw new BusinessException("澶ф皵璁惧涓嶅瓨鍦紒");
+ }
if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG_STATE.getCode() + mac) != null) {
one.setState(1);
} else {
@@ -183,98 +173,28 @@
throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
}
}
-//
-// /**
-// * 鏌ヨ澶ф皵璁惧蹇冭烦鍖呮椂闂�
-// */
-// public String QueryHeartBeatTime(String mac) {
-// if (StringUtil.strIsNullOrEmpty(mac)) {
-// throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
-// }
-// AirEquipmentNongGeng airEquipmentNongGeng = SpringContextHolder.getBean(AirEquipmentNongGengService.class).
-// getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, mac).last("limit 1"));
-// if (airEquipmentNongGeng == null) {
-// throw new BusinessException("澶ф皵璁惧涓嶅瓨鍦紒");
-// }
-//
-// AtmosphereQueryHeartBeatTimeReqInnerFrame atmosphereQueryHeartBeatTimeReqInnerFrame = new AtmosphereQueryHeartBeatTimeReqInnerFrame();
-// A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereQueryHeartBeatTimeReqInnerFrame);
-// System.out.println(a5Frame + " --------a5Frame");
-// CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
-// System.out.println(commonFrame + " -----------commonFrame");
-//
-// A5AtmosphereHeartBeatTimeReportInnerFrame a5AtmosphereHeartBeatTimeReportInnerFrame
-// = new A5AtmosphereHeartBeatTimeReportInnerFrame().transformFrame(commonFrame.getPayload());
-//
-// if (a5AtmosphereHeartBeatTimeReportInnerFrame != null && a5AtmosphereHeartBeatTimeReportInnerFrame.isValidate()) {
-// return "璇ュぇ姘旇澶囧績璺冲寘闂撮殧鏃堕棿涓猴細" + a5AtmosphereHeartBeatTimeReportInnerFrame.getIntervalTime() + "s";
-// } else {
-// throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
-// }
-// }
-//
-// /**
-// * 鏌ヨ杞‖浠剁増鏈�
-// *
-// * @param mac
-// * @return
-// */
-// public String QueryVersion(String mac) {
-// if (StringUtil.strIsNullOrEmpty(mac)) {
-// throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
-// }
-// AirEquipmentNongGeng airEquipmentNongGeng = SpringContextHolder.getBean(AirEquipmentNongGengService.class).
-// getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, mac).last("limit 1"));
-// if (airEquipmentNongGeng == null) {
-// throw new BusinessException("澶ф皵璁惧涓嶅瓨鍦紒");
-// }
-//
-// AtmosphereQueryVersionReqInnerFrame atmosphereQueryVersionReqInnerFrame = new AtmosphereQueryVersionReqInnerFrame();
-// A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereQueryVersionReqInnerFrame);
-// System.out.println(a5Frame + " --------a5Frame");
-// CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
-// System.out.println(commonFrame + " -----------commonFrame");
-//
-// A5AtmosphereQueryVersionReportInnerFrame a5AtmosphereQueryVersionReportInnerFrame =
-// new A5AtmosphereQueryVersionReportInnerFrame().transformFrame(commonFrame.getPayload());
-// if (a5AtmosphereQueryVersionReportInnerFrame != null && a5AtmosphereQueryVersionReportInnerFrame.isValidate()) {
-// return a5AtmosphereQueryVersionReportInnerFrame.getVersion();
-// } else {
-// throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
-// }
-// }
-//
-// /**
-// * 杞噸鍚�
-// *
-// * @param mac
-// * @return
-// */
-// public String Reboot(String mac) {
-// if (StringUtil.strIsNullOrEmpty(mac)) {
-// throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
-// }
-//
-// AirEquipmentNongGeng airEquipmentNongGeng = SpringContextHolder.getBean(AirEquipmentNongGengService.class).
-// getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, mac).last("limit 1"));
-// if (airEquipmentNongGeng == null) {
-// throw new BusinessException("澶ф皵璁惧涓嶅瓨鍦紒");
-// }
-//
-// AtmosphereRebootReqInnerFrame atmosphereRebootReqInnerFrame = new AtmosphereRebootReqInnerFrame();
-// A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereRebootReqInnerFrame);
-// System.out.println(a5Frame + " --------a5Frame");
-// CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(mac, a5Frame);
-// System.out.println(commonFrame + " -----------commonFrame");
-//
-// A5AtmosphereOperationReportInnerFrame a5AtmosphereOperationReportInnerFrame =
-// new A5AtmosphereOperationReportInnerFrame().transformFrame(commonFrame.getPayload());
-//
-// if (a5AtmosphereOperationReportInnerFrame != null && a5AtmosphereOperationReportInnerFrame.isValidate()) {
-// return a5AtmosphereOperationReportInnerFrame.getState();
-// } else {
-// throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
-// }
-// }
+
+ /**
+ * 璁剧疆绫诲瀷
+ *
+ * @param param
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public boolean setAirEquipmentType(AirEquipmentNongGeng param) {
+ if (param.getType() == null || param.getId() == null || param.getType().isEmpty()) {
+ throw new BusinessException("璁惧id鎴栫被鍨嬩笉鑳戒负绌�");
+ }
+ if (!"0".equals(param.getType()) && !"1".equals(param.getType()) && !"2".equals(param.getType())) {
+ throw new BusinessException("璁惧绫诲瀷涓嶆纭�");
+ }
+ AirEquipmentNongGeng byId = getById(param.getId());
+ if (byId == null) {
+ throw new BusinessException("璁惧id閿欒鎴栬澶囦笉瀛樺湪!");
+ }
+ byId.setType(param.getType());
+
+ return updateById(byId);
+ }
}
--
Gitblit v1.9.3