From dd6d72c1e24d7611a1858df7bd61b8fbcc6f374e Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 25 Aug 2023 17:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A0=86=E8=8A=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iflytop/nuclear/controller/NuclearCoreController.java    | 12 ++++++++++++
 src/main/java/com/iflytop/nuclear/model/NuclearCore.java     |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java
index d1c09b8..84c914d 100644
--- a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java
+++ b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java
@@ -2,8 +2,10 @@ package com.iflytop.nuclear.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.iflytop.nuclear.model.Camera;
 import com.iflytop.nuclear.model.NuclearCore;
 import com.iflytop.nuclear.model.NuclearStation;
+import com.iflytop.nuclear.service.CameraService;
 import com.iflytop.nuclear.service.NuclearCoreService;
 import com.iflytop.nuclear.service.NuclearStationService;
 import com.iflytop.nuclear.utils.ResponseData;
@@ -30,16 +32,26 @@ public class NuclearCoreController {
     @Autowired
     NuclearStationService nuclearStationService;
 
+    @Autowired
+    CameraService cameraService;
+
     @GetMapping("/list")
     public ResponseData list() {
         // 将数据中stationid转换为名称
         List<NuclearCore> list = nuclearCoreService.list();
         if (list.size() > 0){
             for (NuclearCore l : list) {
+                int id = l.getId();
+                // 根据id获取曝光时间等
+                Camera byId = cameraService.getById(id);
                 NuclearStation nuclearStation = nuclearStationService.getById(l.getStationId());
                 if(nuclearStation != null) {
                     l.setStationName(nuclearStation.getName());
                 }
+                if (byId != null) {
+                    l.setExposure(byId.getExposure());
+                    l.setBrightness(byId.getBrightness());
+                }
             }
         }
         JSONObject res = new JSONObject();
diff --git a/src/main/java/com/iflytop/nuclear/model/NuclearCore.java b/src/main/java/com/iflytop/nuclear/model/NuclearCore.java
index 24dcfa8..59f56fd 100644
--- a/src/main/java/com/iflytop/nuclear/model/NuclearCore.java
+++ b/src/main/java/com/iflytop/nuclear/model/NuclearCore.java
@@ -29,4 +29,10 @@ public class NuclearCore {
 
     @TableField(exist = false)
     private String stationName;
+
+    @TableField(exist = false)
+    private int brightness;
+
+    @TableField(exist = false)
+    private int exposure;
 }