From e468088052b2dea9837645eeed689ee9c5f0948d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 27 十月 2023 15:58:11 +0800
Subject: [PATCH] 油烟
---
ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java b/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
index 3939151..b88db48 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/controller/smoke/SmokeController.java
@@ -1,5 +1,6 @@
package com.ycl.smoke.controller.smoke;
+import com.alibaba.fastjson.JSON;
import com.ycl.service.redis.RedisService;
import com.ycl.smoke.dto.*;
import com.ycl.smoke.entity.OdsTenMinData;
@@ -27,46 +28,62 @@
@Resource
private RedisService redisService;
+ @GetMapping(value = "/login")
+ public String login() {
+
+ LoginParamDto loginParamDto = LoginParamDto.builder().username("閬傛槍鍩庣灞�").password("123456").noCode(true).build();
+ String json = smokeDetectionService.loginAction(loginParamDto);
+ SmokeResultResponseDto responseDto = JSON.parseObject(json, SmokeResultResponseDto.class);
+ if (responseDto.getStatus() == 200) {
+ LoginResponseDto loginResponseDto = JSON.parseObject(responseDto.getData().toString(), LoginResponseDto.class);
+ // System.out.println(loginResponseDto.getToken());
+ redisService.set(RedisKey.SMOKE_TOKEN, loginResponseDto.getToken());
+ return "鐧诲綍鎴愬姛";
+ } else {
+ return json;
+ }
+ }
+
@PostMapping(value = "/listAlarmMsg")
- public SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto params) {
+ public String getListAlarmMsg(@RequestBody AlarmMsgParamDto params) {
return smokeDetectionService.getListAlarmMsg(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/queryDataDetectorDaily2")
- public SmokeResultResponseDto<DetectorDailyResponseDto> queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto params) {
+ public String queryDataDetectorDaily2(@RequestBody DetectorDailyParamDto params) {
return smokeDetectionService.queryDataDetectorDaily2(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/queryTenMinData")
- public SmokeResultResponseDto<List<OdsTenMinData>> queryTenMinData(@RequestBody TenMinParamDto params) {
+ public String queryTenMinData(@RequestBody TenMinParamDto params) {
return smokeDetectionService.queryTenMinData(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/listDataIntime")
- public SmokeResultResponseDto<DataIntimeResponseDto> listDataIntime(@RequestBody DataIntimeParamDto params) {
+ public String listDataIntime(@RequestBody DataIntimeParamDto params) {
return smokeDetectionService.listDataIntime(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/listLocale")
- public SmokeResultResponseDto<LocaleResponseDto> listLocale(@RequestBody LocaleParamDto params) {
+ public String listLocale(@RequestBody LocaleParamDto params) {
return smokeDetectionService.listLocale(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/queryCustomer")
- public SmokeResultResponseDto<CustomerResponseDto> queryCustomer(@RequestBody CustomerParamDto params) {
+ public String queryCustomer(@RequestBody CustomerParamDto params) {
return smokeDetectionService.queryCustomer(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/listAlarmRecord")
- public SmokeResultResponseDto<AlarmRecordResponseDto> getListAlarmRecord(@RequestBody AlarmMsgParamDto params) {
+ public String getListAlarmRecord(@RequestBody AlarmMsgParamDto params) {
return smokeDetectionService.getListAlarmRecord(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
@PostMapping(value = "/listCurAlarm")
- public SmokeResultResponseDto<CurAlarmResponseDto> getListCurAlarm(@RequestBody CurAlarmParamDto params) {
+ public String getListCurAlarm(@RequestBody CurAlarmParamDto params) {
return smokeDetectionService.getListCurAlarm(params, redisService.get(RedisKey.SMOKE_TOKEN).toString());
}
--
Gitblit v1.8.0