dev 光谱辐射-辐射亮度

meas-system/src/main/java/com/meas/system/controller/MeasSpectralRadiationController.java

@@ -1,26 +1,19 @@
 package com.meas.system.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.meas.common.annotation.Log;
 import com.meas.common.core.controller.BaseController;
 import com.meas.common.core.domain.AjaxResult;
+import com.meas.common.core.page.TableDataInfo;
 import com.meas.common.enums.BusinessType;
+import com.meas.common.utils.poi.ExcelUtil;
 import com.meas.system.domain.MeasSpectralRadiation;
 import com.meas.system.service.IMeasSpectralRadiationService;
-import com.meas.common.utils.poi.ExcelUtil;
-import com.meas.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 光谱辐射Controller

meas-system/src/main/java/com/meas/system/controller/MeasSpectralRadiationRadianceController.java

@@ -0,0 +1,107 @@
+package com.meas.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.meas.common.annotation.Log;
+import com.meas.common.core.controller.BaseController;
+import com.meas.common.core.domain.AjaxResult;
+import com.meas.common.enums.BusinessType;
+import com.meas.system.domain.MeasSpectralRadiationRadiance;
+import com.meas.system.service.IMeasSpectralRadiationRadianceService;
+import com.meas.common.utils.poi.ExcelUtil;
+import com.meas.common.core.page.TableDataInfo;
+
+/**
+ * 光谱辐射-辐射亮度Controller
+ *
+ * @author Allen
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/meas/radiance")
+public class MeasSpectralRadiationRadianceController extends BaseController {
+    @Autowired
+    private IMeasSpectralRadiationRadianceService measSpectralRadiationRadianceService;
+
+/**
+ * 查询光谱辐射-辐射亮度列表
+ */
+@PreAuthorize("@ss.hasPermi('system:radiance:list')")
+@GetMapping("/list")
+    public TableDataInfo list(MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        startPage();
+        List<MeasSpectralRadiationRadiance> list = measSpectralRadiationRadianceService.selectMeasSpectralRadiationRadianceList(measSpectralRadiationRadiance);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出光谱辐射-辐射亮度列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:radiance:export')")
+    @Log(title = "光谱辐射-辐射亮度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        List<MeasSpectralRadiationRadiance> list = measSpectralRadiationRadianceService.selectMeasSpectralRadiationRadianceList(measSpectralRadiationRadiance);
+        ExcelUtil<MeasSpectralRadiationRadiance> util = new ExcelUtil<MeasSpectralRadiationRadiance>(MeasSpectralRadiationRadiance. class);
+        util.exportExcel(response, list, "光谱辐射-辐射亮度数据");
+    }
+
+    /**
+     * 获取光谱辐射-辐射亮度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:radiance:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(measSpectralRadiationRadianceService.selectMeasSpectralRadiationRadianceById(id));
+    }
+
+    /**
+     * 新增光谱辐射-辐射亮度
+     */
+    @PreAuthorize("@ss.hasPermi('system:radiance:add')")
+    @Log(title = "光谱辐射-辐射亮度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        return toAjax(measSpectralRadiationRadianceService.insertMeasSpectralRadiationRadiance(measSpectralRadiationRadiance));
+    }
+
+    /**
+     * 修改光谱辐射-辐射亮度
+     */
+    @PreAuthorize("@ss.hasPermi('system:radiance:edit')")
+    @Log(title = "光谱辐射-辐射亮度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        return toAjax(measSpectralRadiationRadianceService.updateMeasSpectralRadiationRadiance(measSpectralRadiationRadiance));
+    }
+
+    /**
+     * 删除光谱辐射-辐射亮度
+     */
+    @PreAuthorize("@ss.hasPermi('system:radiance:remove')")
+    @Log(title = "光谱辐射-辐射亮度", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(measSpectralRadiationRadianceService.deleteMeasSpectralRadiationRadianceByIds(ids));
+    }
+
+    /**
+     * 通过测量批次、型号、光阑、标定温度获取光谱辐射-辐射亮度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:radiance:query')")
+    @PostMapping(value = "/getInfoByCondition")
+    public AjaxResult getInfoByCondition(@RequestBody MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        return success(measSpectralRadiationRadianceService.getInfoByCondition(measSpectralRadiationRadiance));
+    }
+}

meas-system/src/main/java/com/meas/system/domain/MeasSpectralRadiation.java

@@ -2,8 +2,6 @@ package com.meas.system.domain;
 
 import com.meas.common.annotation.Excel;
 import com.meas.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 
@@ -75,6 +73,8 @@ public class MeasSpectralRadiation extends BaseEntity {
     @Excel(name = "增益")
     private Long gain;
 
+    private Long radianceId;
+
     /**
      * 背景数据
      */
@@ -90,8 +90,13 @@ public class MeasSpectralRadiation extends BaseEntity {
     /**
      * 标定曲线
      */
-    @Excel(name = "标定曲线")
+    @Excel(name = "3~5μm 标定曲线")
     private String calCurve;
+    /**
+     * 标定曲线
+     */
+    @Excel(name = "8~14μm 标定曲线")
+    private String calCurve2;
 
     /**
      * 原始数据
@@ -235,6 +240,14 @@ public class MeasSpectralRadiation extends BaseEntity {
         this.gain = gain;
     }
 
+    public Long getRadianceId() {
+        return radianceId;
+    }
+
+    public void setRadianceId(Long radianceId) {
+        this.radianceId = radianceId;
+    }
+
     public String getBackgroundData() {
         return backgroundData;
     }
@@ -259,6 +272,14 @@ public class MeasSpectralRadiation extends BaseEntity {
         this.calCurve = calCurve;
     }
 
+    public String getCalCurve2() {
+        return calCurve2;
+    }
+
+    public void setCalCurve2(String calCurve2) {
+        this.calCurve2 = calCurve2;
+    }
+
     public String getRawData() {
         return rawData;
     }
@@ -282,70 +303,79 @@ public class MeasSpectralRadiation extends BaseEntity {
     public void setRadiance2(String radiance2) {
         this.radiance2 = radiance2;
     }
-    public void setCalTempEk(String calTempEk) {
-        this.calTempEk = calTempEk;
-    }
 
     public String getCalTempEk() {
         return calTempEk;
     }
-    public void setRawTarget1(String rawTarget1) {
-        this.rawTarget1 = rawTarget1;
+
+    public void setCalTempEk(String calTempEk) {
+        this.calTempEk = calTempEk;
     }
 
     public String getRawTarget1() {
         return rawTarget1;
     }
-    public void setRawTarget2(String rawTarget2) {
-        this.rawTarget2 = rawTarget2;
+
+    public void setRawTarget1(String rawTarget1) {
+        this.rawTarget1 = rawTarget1;
     }
 
     public String getRawTarget2() {
         return rawTarget2;
     }
-    public void setRawBackground1(String rawBackground1) {
-        this.rawBackground1 = rawBackground1;
+
+    public void setRawTarget2(String rawTarget2) {
+        this.rawTarget2 = rawTarget2;
     }
 
     public String getRawBackground1() {
         return rawBackground1;
     }
-    public void setRawBackground2(String rawBackground2) {
-        this.rawBackground2 = rawBackground2;
+
+    public void setRawBackground1(String rawBackground1) {
+        this.rawBackground1 = rawBackground1;
     }
 
     public String getRawBackground2() {
         return rawBackground2;
     }
-    public void setTackleTarget1(String tackleTarget1) {
-        this.tackleTarget1 = tackleTarget1;
+
+    public void setRawBackground2(String rawBackground2) {
+        this.rawBackground2 = rawBackground2;
     }
 
     public String getTackleTarget1() {
         return tackleTarget1;
     }
-    public void setTackleTarget2(String tackleTarget2) {
-        this.tackleTarget2 = tackleTarget2;
+
+    public void setTackleTarget1(String tackleTarget1) {
+        this.tackleTarget1 = tackleTarget1;
     }
 
     public String getTackleTarget2() {
         return tackleTarget2;
     }
-    public void setTackleBackground1(String tackleBackground1) {
-        this.tackleBackground1 = tackleBackground1;
+
+    public void setTackleTarget2(String tackleTarget2) {
+        this.tackleTarget2 = tackleTarget2;
     }
 
     public String getTackleBackground1() {
         return tackleBackground1;
     }
-    public void setTackleBackground2(String tackleBackground2) {
-        this.tackleBackground2 = tackleBackground2;
+
+    public void setTackleBackground1(String tackleBackground1) {
+        this.tackleBackground1 = tackleBackground1;
     }
 
     public String getTackleBackground2() {
         return tackleBackground2;
     }
 
+    public void setTackleBackground2(String tackleBackground2) {
+        this.tackleBackground2 = tackleBackground2;
+    }
+
     @Override
     public String toString() {
         return "MeasSpectralRadiation{" +
@@ -360,9 +390,11 @@ public class MeasSpectralRadiation extends BaseEntity {
                 ", model='" + model + '\'' +
                 ", lensFView=" + lensFView +
                 ", gain=" + gain +
+                ", radianceId=" + radianceId +
                 ", backgroundData='" + backgroundData + '\'' +
-                ", calTemp=" + calTemp +
+                ", calTemp='" + calTemp + '\'' +
                 ", calCurve='" + calCurve + '\'' +
+                ", calCurve2='" + calCurve2 + '\'' +
                 ", rawData='" + rawData + '\'' +
                 ", radiance1='" + radiance1 + '\'' +
                 ", radiance2='" + radiance2 + '\'' +

meas-system/src/main/java/com/meas/system/domain/MeasSpectralRadiationRadiance.java

@@ -0,0 +1,124 @@
+package com.meas.system.domain;
+
+import java.math.BigDecimal;
+
+import com.meas.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.meas.common.annotation.Excel;
+
+/**
+ * 光谱辐射-辐射亮度对象 meas_spectral_radiation_radiance
+ *
+ * @author Allen
+ * @date 2025-07-08
+ */
+public class MeasSpectralRadiationRadiance extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+        /** 编号 */
+        private Long id;
+
+        /** 测量批次id */
+        private Long measurementBatchId;
+
+        /** 型号 */
+                @Excel(name = "型号")
+        private String model;
+
+        /** 镜头视场角 */
+                @Excel(name = "镜头视场角")
+        private BigDecimal lensFView;
+
+        /** 光阑 */
+                @Excel(name = "光阑")
+        private BigDecimal gain;
+
+        /** 标定温度 */
+                @Excel(name = "标定温度")
+        private String calTemp;
+
+        /** 标定曲线（3~5μm） */
+                @Excel(name = "标定曲线", readConverterExp = "3=~5μm")
+        private String calCurve;
+
+        /** 标定曲线（8~14μm） */
+                @Excel(name = "标定曲线", readConverterExp = "8=~14μm")
+        private String calCurve2;
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public Long getId() {
+            return id;
+        }
+        public void setMeasurementBatchId(Long measurementBatchId) {
+            this.measurementBatchId = measurementBatchId;
+        }
+
+        public Long getMeasurementBatchId() {
+            return measurementBatchId;
+        }
+        public void setModel(String model) {
+            this.model = model;
+        }
+
+        public String getModel() {
+            return model;
+        }
+        public void setLensFView(BigDecimal lensFView) {
+            this.lensFView = lensFView;
+        }
+
+        public BigDecimal getLensFView() {
+            return lensFView;
+        }
+        public void setGain(BigDecimal gain) {
+            this.gain = gain;
+        }
+
+        public BigDecimal getGain() {
+            return gain;
+        }
+        public void setCalTemp(String calTemp) {
+            this.calTemp = calTemp;
+        }
+
+        public String getCalTemp() {
+            return calTemp;
+        }
+        public void setCalCurve(String calCurve) {
+            this.calCurve = calCurve;
+        }
+
+        public String getCalCurve() {
+            return calCurve;
+        }
+        public void setCalCurve2(String calCurve2) {
+            this.calCurve2 = calCurve2;
+        }
+
+        public String getCalCurve2() {
+            return calCurve2;
+        }
+
+@Override
+public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("id", getId())
+        .append("measurementBatchId", getMeasurementBatchId())
+        .append("model", getModel())
+        .append("lensFView", getLensFView())
+        .append("gain", getGain())
+        .append("calTemp", getCalTemp())
+        .append("calCurve", getCalCurve())
+        .append("calCurve2", getCalCurve2())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+            .toString();
+}
+}

meas-system/src/main/java/com/meas/system/mapper/MeasSpectralRadiationRadianceMapper.java

@@ -0,0 +1,63 @@
+package com.meas.system.mapper;
+
+import java.util.List;
+
+import com.meas.system.domain.MeasSpectralRadiationRadiance;
+
+/**
+ * 光谱辐射-辐射亮度Mapper接口
+ *
+ * @author Allen
+ * @date 2025-07-08
+ */
+public interface MeasSpectralRadiationRadianceMapper {
+    /**
+     * 查询光谱辐射-辐射亮度
+     *
+     * @param id 光谱辐射-辐射亮度主键
+     * @return 光谱辐射-辐射亮度
+     */
+    public MeasSpectralRadiationRadiance selectMeasSpectralRadiationRadianceById(Long id);
+
+    /**
+     * 查询光谱辐射-辐射亮度列表
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 光谱辐射-辐射亮度集合
+     */
+    public List<MeasSpectralRadiationRadiance> selectMeasSpectralRadiationRadianceList(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+
+    /**
+     * 新增光谱辐射-辐射亮度
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 结果
+     */
+    public int insertMeasSpectralRadiationRadiance(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+
+    /**
+     * 修改光谱辐射-辐射亮度
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 结果
+     */
+    public int updateMeasSpectralRadiationRadiance(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+
+    /**
+     * 删除光谱辐射-辐射亮度
+     *
+     * @param id 光谱辐射-辐射亮度主键
+     * @return 结果
+     */
+    public int deleteMeasSpectralRadiationRadianceById(Long id);
+
+    /**
+     * 批量删除光谱辐射-辐射亮度
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMeasSpectralRadiationRadianceByIds(Long[] ids);
+
+    MeasSpectralRadiationRadiance getInfoByCondition(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+}

meas-system/src/main/java/com/meas/system/service/IMeasSpectralRadiationRadianceService.java

@@ -0,0 +1,63 @@
+package com.meas.system.service;
+
+import java.util.List;
+
+import com.meas.system.domain .MeasSpectralRadiationRadiance;
+
+/**
+ * 光谱辐射-辐射亮度Service接口
+ *
+ * @author Allen
+ * @date 2025-07-08
+ */
+public interface IMeasSpectralRadiationRadianceService {
+    /**
+     * 查询光谱辐射-辐射亮度
+     *
+     * @param id 光谱辐射-辐射亮度主键
+     * @return 光谱辐射-辐射亮度
+     */
+    public MeasSpectralRadiationRadiance selectMeasSpectralRadiationRadianceById(Long id);
+
+    /**
+     * 查询光谱辐射-辐射亮度列表
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 光谱辐射-辐射亮度集合
+     */
+    public List<MeasSpectralRadiationRadiance> selectMeasSpectralRadiationRadianceList(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+
+    /**
+     * 新增光谱辐射-辐射亮度
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 结果
+     */
+    public int insertMeasSpectralRadiationRadiance(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+
+    /**
+     * 修改光谱辐射-辐射亮度
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 结果
+     */
+    public int updateMeasSpectralRadiationRadiance(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+
+    /**
+     * 批量删除光谱辐射-辐射亮度
+     *
+     * @param ids 需要删除的光谱辐射-辐射亮度主键集合
+     * @return 结果
+     */
+    public int deleteMeasSpectralRadiationRadianceByIds(Long[] ids);
+
+    /**
+     * 删除光谱辐射-辐射亮度信息
+     *
+     * @param id 光谱辐射-辐射亮度主键
+     * @return 结果
+     */
+    public int deleteMeasSpectralRadiationRadianceById(Long id);
+
+    MeasSpectralRadiationRadiance getInfoByCondition(MeasSpectralRadiationRadiance measSpectralRadiationRadiance);
+}

meas-system/src/main/java/com/meas/system/service/impl/MeasSpectralRadiationRadianceServiceImpl.java

@@ -0,0 +1,94 @@
+package com.meas.system.service.impl;
+
+import java.util.List;
+        import com.meas.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.meas.system.mapper.MeasSpectralRadiationRadianceMapper;
+import com.meas.system.domain.MeasSpectralRadiationRadiance;
+import com.meas.system.service.IMeasSpectralRadiationRadianceService;
+
+/**
+ * 光谱辐射-辐射亮度Service业务层处理
+ *
+ * @author Allen
+ * @date 2025-07-08
+ */
+@Service
+public class MeasSpectralRadiationRadianceServiceImpl implements IMeasSpectralRadiationRadianceService {
+    @Autowired
+    private MeasSpectralRadiationRadianceMapper measSpectralRadiationRadianceMapper;
+
+    /**
+     * 查询光谱辐射-辐射亮度
+     *
+     * @param id 光谱辐射-辐射亮度主键
+     * @return 光谱辐射-辐射亮度
+     */
+    @Override
+    public MeasSpectralRadiationRadiance selectMeasSpectralRadiationRadianceById(Long id) {
+        return measSpectralRadiationRadianceMapper.selectMeasSpectralRadiationRadianceById(id);
+    }
+
+    /**
+     * 查询光谱辐射-辐射亮度列表
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 光谱辐射-辐射亮度
+     */
+    @Override
+    public List<MeasSpectralRadiationRadiance> selectMeasSpectralRadiationRadianceList(MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        return measSpectralRadiationRadianceMapper.selectMeasSpectralRadiationRadianceList(measSpectralRadiationRadiance);
+    }
+
+    /**
+     * 新增光谱辐射-辐射亮度
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 结果
+     */
+    @Override
+    public int insertMeasSpectralRadiationRadiance(MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+                measSpectralRadiationRadiance.setCreateTime(DateUtils.getNowDate());
+            return measSpectralRadiationRadianceMapper.insertMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+    }
+
+    /**
+     * 修改光谱辐射-辐射亮度
+     *
+     * @param measSpectralRadiationRadiance 光谱辐射-辐射亮度
+     * @return 结果
+     */
+    @Override
+    public int updateMeasSpectralRadiationRadiance(MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+                measSpectralRadiationRadiance.setUpdateTime(DateUtils.getNowDate());
+        return measSpectralRadiationRadianceMapper.updateMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+    }
+
+    /**
+     * 批量删除光谱辐射-辐射亮度
+     *
+     * @param ids 需要删除的光谱辐射-辐射亮度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeasSpectralRadiationRadianceByIds(Long[] ids) {
+        return measSpectralRadiationRadianceMapper.deleteMeasSpectralRadiationRadianceByIds(ids);
+    }
+
+    /**
+     * 删除光谱辐射-辐射亮度信息
+     *
+     * @param id 光谱辐射-辐射亮度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeasSpectralRadiationRadianceById(Long id) {
+        return measSpectralRadiationRadianceMapper.deleteMeasSpectralRadiationRadianceById(id);
+    }
+
+    @Override
+    public MeasSpectralRadiationRadiance getInfoByCondition(MeasSpectralRadiationRadiance measSpectralRadiationRadiance) {
+        return measSpectralRadiationRadianceMapper.getInfoByCondition(measSpectralRadiationRadiance);
+    }
+}

meas-system/src/main/java/com/meas/system/service/impl/MeasSpectralRadiationServiceImpl.java

@@ -1,8 +1,11 @@
 package com.meas.system.service.impl;
 
 import com.meas.common.utils.DateUtils;
+import com.meas.common.utils.bean.BeanUtils;
 import com.meas.system.domain.MeasSpectralRadiation;
+import com.meas.system.domain.MeasSpectralRadiationRadiance;
 import com.meas.system.mapper.MeasSpectralRadiationMapper;
+import com.meas.system.service.IMeasSpectralRadiationRadianceService;
 import com.meas.system.service.IMeasSpectralRadiationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +22,8 @@ import java.util.List;
 public class MeasSpectralRadiationServiceImpl implements IMeasSpectralRadiationService {
     @Autowired
     private MeasSpectralRadiationMapper measSpectralRadiationMapper;
+    @Autowired
+    private IMeasSpectralRadiationRadianceService measSpectralRadiationRadianceService;
 
     /**
      * 查询光谱辐射
@@ -51,6 +56,18 @@ public class MeasSpectralRadiationServiceImpl implements IMeasSpectralRadiationS
     @Override
     public MeasSpectralRadiation insertMeasSpectralRadiation(MeasSpectralRadiation measSpectralRadiation) {
         measSpectralRadiation.setCreateTime(DateUtils.getNowDate());
+
+        MeasSpectralRadiationRadiance measSpectralRadiationRadiance = new MeasSpectralRadiationRadiance();
+        BeanUtils.copyProperties(measSpectralRadiationRadiance, measSpectralRadiation);
+        measSpectralRadiationRadiance.setId(null);
+        MeasSpectralRadiationRadiance infoByCondition = measSpectralRadiationRadianceService.getInfoByCondition(measSpectralRadiationRadiance);
+        if (infoByCondition == null) {
+            measSpectralRadiationRadianceService.insertMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+        }
+        measSpectralRadiation.setRadianceId(infoByCondition.getId());
+        measSpectralRadiation.setCalTemp("");
+        measSpectralRadiation.setCalCurve("");
+        measSpectralRadiation.setCalCurve2("");
         int i = measSpectralRadiationMapper.insertMeasSpectralRadiation(measSpectralRadiation);
         if (i > 0) {
             return measSpectralRadiation;

meas-system/src/main/resources/mapper/meas/MeasDataResultsMapper.xml

@@ -11,7 +11,7 @@
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="measurementBatch" column="measurement_batch"/>
-        <result property="engineStatus" column="measurement_batch"/>
+        <result property="engineStatus" column="engine_status"/>
         <result property="angle" column="angle"/>
         <result property="specIrr1" column="spec_irr_1"/>
         <result property="specIrr2" column="spec_irr_2"/>

meas-system/src/main/resources/mapper/meas/MeasSpectralRadiationMapper.xml

@@ -19,6 +19,7 @@
         <result property="backgroundData" column="background_data"/>
         <result property="calTemp" column="cal_temp"/>
         <result property="calCurve" column="cal_curve"/>
+        <result property="calCurve2" column="cal_curve2"/>
         <result property="rawData" column="raw_data"/>
         <result property="radiance1" column="radiance_1"/>
         <result property="radiance2" column="radiance_2"/>
@@ -53,6 +54,7 @@
             msr.background_data,
             msr.cal_temp,
             msr.cal_curve,
+            msr.cal_curve2,
             msr.raw_data,
             msr.radiance_1,
             msr.radiance_2,
@@ -94,6 +96,7 @@
             <if test="backgroundData != null  and backgroundData != ''">and background_data = #{backgroundData}</if>
             <if test="calTemp != null ">and cal_temp = #{calTemp}</if>
             <if test="calCurve != null  and calCurve != ''">and cal_curve = #{calCurve}</if>
+            <if test="calCurve2 != null  and calCurve2 != ''">and cal_curve2 = #{calCurve2}</if>
             <if test="rawData != null  and rawData != ''">and raw_data = #{rawData}</if>
             <if test="radiance1 != null  and radiance1 != ''">and radiance_1 = #{radiance1}</if>
             <if test="radiance2 != null  and radiance2 != ''">and radiance_2 = #{radiance2}</if>
@@ -162,6 +165,7 @@
             <if test="backgroundData != null">background_data,</if>
             <if test="calTemp != null">cal_temp,</if>
             <if test="calCurve != null">cal_curve,</if>
+            <if test="calCurve2 != null">cal_curve2,</if>
             <if test="rawData != null">raw_data,</if>
             <if test="radiance1 != null">radiance_1,</if>
             <if test="radiance2 != null">radiance_2,</if>
@@ -188,6 +192,7 @@
             <if test="backgroundData != null">#{backgroundData},</if>
             <if test="calTemp != null">#{calTemp},</if>
             <if test="calCurve != null">#{calCurve},</if>
+            <if test="calCurve2 != null">#{calCurve2},</if>
             <if test="rawData != null">#{rawData},</if>
             <if test="radiance1 != null">#{radiance1},</if>
             <if test="radiance2 != null">#{radiance2},</if>
@@ -217,6 +222,7 @@
             <if test="backgroundData != null">background_data = #{backgroundData},</if>
             <if test="calTemp != null">cal_temp = #{calTemp},</if>
             <if test="calCurve != null">cal_curve = #{calCurve},</if>
+            <if test="calCurve2 != null">cal_curve2 = #{calCurve2},</if>
             <if test="rawData != null">raw_data = #{rawData},</if>
             <if test="radiance1 != null">radiance_1 = #{radiance1},</if>
             <if test="radiance2 != null">radiance_2 = #{radiance2},</if>

meas-system/src/main/resources/mapper/system/MeasSpectralRadiationRadianceMapper.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.meas.system.mapper.MeasSpectralRadiationRadianceMapper">
+
+    <resultMap type="MeasSpectralRadiationRadiance" id="MeasSpectralRadiationRadianceResult">
+            <result property="id" column="id"/>
+            <result property="measurementBatchId" column="measurement_batch_id"/>
+            <result property="model" column="model"/>
+            <result property="lensFView" column="lens_f_view"/>
+            <result property="gain" column="gain"/>
+            <result property="calTemp" column="cal_temp"/>
+            <result property="calCurve" column="cal_curve"/>
+            <result property="calCurve2" column="cal_curve2"/>
+            <result property="createBy" column="create_by"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectMeasSpectralRadiationRadianceVo">
+        select id, measurement_batch_id, model, lens_f_view, gain, cal_temp, cal_curve, cal_curve2, create_by, create_time, update_by, update_time
+        from meas_spectral_radiation_radiance
+    </sql>
+
+    <select id="selectMeasSpectralRadiationRadianceList" parameterType="MeasSpectralRadiationRadiance" resultMap="MeasSpectralRadiationRadianceResult">
+        <include refid="selectMeasSpectralRadiationRadianceVo"/>
+        <where>
+                        <if test="model != null  and model != ''">
+                            and model = #{model}
+                        </if>
+                        <if test="lensFView != null ">
+                            and lens_f_view = #{lensFView}
+                        </if>
+                        <if test="gain != null ">
+                            and gain = #{gain}
+                        </if>
+                        <if test="calTemp != null  and calTemp != ''">
+                            and cal_temp = #{calTemp}
+                        </if>
+                        <if test="calCurve != null  and calCurve != ''">
+                            and cal_curve = #{calCurve}
+                        </if>
+                        <if test="calCurve2 != null  and calCurve2 != ''">
+                            and cal_curve2 = #{calCurve2}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectMeasSpectralRadiationRadianceById" parameterType="Long"
+            resultMap="MeasSpectralRadiationRadianceResult">
+            <include refid="selectMeasSpectralRadiationRadianceVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertMeasSpectralRadiationRadiance" parameterType="MeasSpectralRadiationRadiance" useGeneratedKeys="true" keyProperty="id">
+        insert into meas_spectral_radiation_radiance
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,
+                    </if>
+                    <if test="measurementBatchId != null">measurement_batch_id,
+                    </if>
+                    <if test="model != null and model != ''">model,
+                    </if>
+                    <if test="lensFView != null">lens_f_view,
+                    </if>
+                    <if test="gain != null">gain,
+                    </if>
+                    <if test="calTemp != null">cal_temp,
+                    </if>
+                    <if test="calCurve != null">cal_curve,
+                    </if>
+                    <if test="calCurve2 != null">cal_curve2,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="measurementBatchId != null">#{measurementBatchId},
+                    </if>
+                    <if test="model != null and model != ''">#{model},
+                    </if>
+                    <if test="lensFView != null">#{lensFView},
+                    </if>
+                    <if test="gain != null">#{gain},
+                    </if>
+                    <if test="calTemp != null">#{calTemp},
+                    </if>
+                    <if test="calCurve != null">#{calCurve},
+                    </if>
+                    <if test="calCurve2 != null">#{calCurve2},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updateMeasSpectralRadiationRadiance" parameterType="MeasSpectralRadiationRadiance">
+        update meas_spectral_radiation_radiance
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="measurementBatchId != null">measurement_batch_id =
+                        #{measurementBatchId},
+                    </if>
+                    <if test="model != null and model != ''">model =
+                        #{model},
+                    </if>
+                    <if test="lensFView != null">lens_f_view =
+                        #{lensFView},
+                    </if>
+                    <if test="gain != null">gain =
+                        #{gain},
+                    </if>
+                    <if test="calTemp != null">cal_temp =
+                        #{calTemp},
+                    </if>
+                    <if test="calCurve != null">cal_curve =
+                        #{calCurve},
+                    </if>
+                    <if test="calCurve2 != null">cal_curve2 =
+                        #{calCurve2},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteMeasSpectralRadiationRadianceById" parameterType="Long">
+        delete
+        from meas_spectral_radiation_radiance where id = #{id}
+    </delete>
+
+    <delete id="deleteMeasSpectralRadiationRadianceByIds" parameterType="String">
+        delete from meas_spectral_radiation_radiance where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getInfoByCondition" parameterType="MeasSpectralRadiationRadiance"
+            resultMap="MeasSpectralRadiationRadianceResult">
+        <include refid="selectMeasSpectralRadiationRadianceVo"/>
+        WHERE
+            measurement_batch_id = #{measurementBatchId}
+            AND model = #{model}
+            AND lens_f_view = #{lensFView}
+            AND gain = #{gain}
+        LIMIT 1
+    </select>
+</mapper>

meas_web/src/api/meas/radiance.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 查询光谱辐射-辐射亮度列表
+export function listRadiance(query) {
+    return request({
+        url: '/meas/radiance/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询光谱辐射-辐射亮度详细
+export function getRadiance(id) {
+    return request({
+        url: '/meas/radiance/' + id,
+        method: 'get'
+    })
+}
+
+// 新增光谱辐射-辐射亮度
+export function addRadiance(data) {
+    return request({
+        url: '/meas/radiance',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改光谱辐射-辐射亮度
+export function updateRadiance(data) {
+    return request({
+        url: '/meas/radiance',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除光谱辐射-辐射亮度
+export function delRadiance(id) {
+    return request({
+        url: '/meas/radiance/' + id,
+        method: 'delete'
+    })
+}
+
+// 根据条件获取光谱辐射-辐射亮度
+export function getRadianceByCondition(data) {
+    return request({
+        url: '/meas/radiance/getInfoByCondition',
+        method: 'post',
+        data: data
+    })
+}
+
+

meas_web/src/views/meas/components/dialogContent.vue

@@ -144,14 +144,14 @@
         :model="radiationData" label-width="80px">
         <el-row type="flex" justify="space-around">
           <el-form-item label="型号" prop="model">
-            <el-input v-model="radiationData.model" placeholder="请输入型号" />
+            <el-input v-model="radiationData.model" @blur="getRadiance" placeholder="请输入型号"/>
           </el-form-item>
           <el-form-item label="镜头视场角" prop="lensFView" label-width="95px">
-            <el-input v-model="radiationData.lensFView" placeholder="请输入镜头视场角"><template
+            <el-input v-model="radiationData.lensFView" @blur="getRadiance" placeholder="请输入镜头视场角"><template
                 slot="append">mrad</template></el-input>
           </el-form-item>
           <el-form-item label="光阑" prop="gain">
-            <el-input v-model.number="radiationData.gain" placeholder="请输入光阑"><template
+            <el-input v-model="radiationData.gain" @blur="getRadiance" placeholder="请输入光阑"><template
                 slot="append">mm</template></el-input>
           </el-form-item>
         </el-row>
@@ -166,10 +166,14 @@
                 <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['Igm','rar','zip']"
                   v-model="radiationData.calTempEk" />
               </el-form-item>
-              <el-form-item label="标定曲线" prop="calCurve">
+              <el-form-item label="3 ~ 5μm 标定曲线" prop="calCurve">
                 <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['txt']" :isShowViev="true"
                   v-model="radiationData.calCurve" v-on:fileView="fileView" />
               </el-form-item>
+              <el-form-item label="8 ~ 14μm 标定曲线" prop="calCurve2">
+                <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['txt']" :isShowViev="true"
+                  v-model="radiationData.calCurve2" v-on:fileView="fileView" />
+              </el-form-item>
             </el-row>
           </el-form>
         </div>
@@ -513,6 +517,7 @@ import { listEngineModel, addEngineModel } from "@/api/meas/engineModel";
 import { angleOption, addAngle } from "@/api/meas/angle";
 import { statusOption, addStatus } from "@/api/meas/status";
 import { listMeasBatch, addMeasBatch, getZipInfo } from "@/api/meas/measBatch";
+import { getRadianceByCondition } from "@/api/meas/radiance";
 import ECharts from "@/views/meas/envData/ECharts.vue";
 import TxtECharts from "@/views/meas/envData/TxtECharts.vue";
 export default {
@@ -1302,6 +1307,33 @@ export default {
       };
       return JSON.parse(JSON.stringify(chartData))
     },
+    getRadiance(){
+      let model = this.radiationData.model
+      let lensFView = this.radiationData.lensFView
+      let gain = this.radiationData.gain
+      if( model || lensFView || gain ){
+        let data = {model,lensFView,gain}
+        getRadianceByCondition(data).then(response => {
+          let _data = response.data
+          if(_data){
+            this.radiationData.radianceId = _data.id;
+            this.radiationData.calTempEk = _data.calTempEk;
+            this.radiationData.calCurve = _data.calCurve;
+            this.radiationData.calCurve2 = _data.calCurve2;
+          } else {
+            this.radiationData.radianceId = null;
+            this.radiationData.calTempEk = '';
+            this.radiationData.calCurve = '';
+            this.radiationData.calCurve2 = '';
+          }
+        })
+      } else {
+       this.radiationData.radianceId = null;
+       this.radiationData.calTempEk = '';
+       this.radiationData.calCurve = '';
+       this.radiationData.calCurve2 = '';
+     }
+    },
   },
 };
 </script>

sql/measupdate20250708.sql

@@ -0,0 +1,19 @@
+ALTER TABLE `meas`.`meas_spectral_radiation`
+MODIFY COLUMN `cal_curve` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标定曲线（3~5μm）' AFTER `cal_temp`,
+ADD COLUMN `cal_curve2` varchar(255) NULL COMMENT '标定曲线（8~14μm）' AFTER `cal_curve`;
+
+DROP TABLE IF EXISTS `meas_spectral_radiation_radiance`;
+CREATE TABLE `meas_spectral_radiation_radiance` (
+  `id` bigint(20) NOT NULL COMMENT '编号',
+  `measurement_batch_id` int(11) NOT NULL COMMENT '测量批次id',
+  `model` varchar(50) NOT NULL COMMENT '型号',
+  `lens_f_view` decimal(8,2) NOT NULL COMMENT '镜头视场角',
+  `gain` decimal(7,1) NOT NULL COMMENT '光阑',
+  `cal_temp` varchar(4000) DEFAULT NULL COMMENT '标定温度',
+  `cal_curve` varchar(255) DEFAULT NULL COMMENT '标定曲线（3~5μm）',
+  `cal_curve2` varchar(255) DEFAULT NULL COMMENT '标定曲线（8~14μm）',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='光谱辐射-辐射亮度表' ROW_FORMAT=DYNAMIC;