From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java | 77 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
index b9c0fbd..4642a8d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
@@ -6,61 +6,60 @@
*/
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
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;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataNewReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
+import com.sandu.ximon.admin.security.PermissionConfig;
+import com.sandu.ximon.admin.service.AirDataNongGengService;
+import com.sandu.ximon.dao.bo.AirDataNongGengBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import lombok.extern.slf4j.Slf4j;
+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.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+
/**
* 澶ф皵鏁版嵁
*/
@RestController
@AllArgsConstructor
+@Slf4j
@RequestMapping("/v1/admin/airdata_nonggeng")
public class AirDataNongGengController {
+ private PermissionConfig permissionConfig;
+ private final AirDataNongGengService airDataNongGengService;
- @PostMapping("/updateAirEquipmentInfo")
- public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
- AirDataNewReqInnerFrame airDataNewReqInnerFrame = new AirDataNewReqInnerFrame();
- A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataNewReqInnerFrame);
- System.out.println(a5Frame + " --------a5Frame");
- List<String> success = new ArrayList<>();
- List<String> failed = new ArrayList<>();
- listMac.parallelStream().forEach(macStr -> {
- try {
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
+ *
+ * @param keyword 鍏抽敭瀛�
+ * @return
+ */
+ @GetMapping("/listAirData")
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
+ , @RequestParam(value = "type", required = false) String type) {
+ if (type == null || type.isEmpty()) {
+ throw new BusinessException("鏁版嵁绫诲瀷涓嶈兘涓虹┖");
+ }
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword, type);
+ return ResponseUtil.success(list);
+ }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
- System.out.println(commonFrame + " -----------commonFrame");
- AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
- if (commonFrame != null) {
- success.add(macStr);
- } else {
- failed.add(macStr);
- }
- } catch (Exception e) {
- failed.add(macStr);
- }
- });
-
- Map<String, List> resultMap = new HashMap<>();
- resultMap.put("success", success);
- resultMap.put("failed", failed);
- return ResponseUtil.success(resultMap);
-
+ @GetMapping("/historyData")
+ public ResponseVO<Object> historyData(BaseConditionVO baseConditionVO, @RequestParam(value = "mac", required = false) String mac) {
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<AirDataNongGengBo> list = airDataNongGengService.historyData(baseConditionVO, mac);
+ return ResponseUtil.success(list);
}
}
--
Gitblit v1.9.3