add index page

mirs-admin/pom.xml

@@ -60,6 +60,10 @@
             <groupId>com.mirs</groupId>
             <artifactId>mirs-generator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 

mirs-admin/src/main/java/com/mirs/biz/controller/IndexController.java

@@ -2,6 +2,10 @@ package com.mirs.biz.controller;
 
 import com.mirs.biz.domain.BrdfData;
 import com.mirs.biz.domain.EmiMeasurement;
+import com.mirs.biz.domain.IntegratedData;
+import com.mirs.biz.domain.Sample;
+import com.mirs.biz.dto.IndexResultDTO;
+import com.mirs.biz.dto.IndexSearchDTO;
 import com.mirs.biz.service.IBrdfDataService;
 import com.mirs.biz.service.IEmiMeasurementService;
 import com.mirs.biz.service.IIntegratedDataService;
@@ -29,10 +33,18 @@ public class IndexController {
     /**
      * 查询主页的数据
      */
-//
-//    @GetMapping("/getIndexInfo")
-//    public List<EmiMeasurement> getIndexInfo(BrdfData data)
-//    {
-//        return emiMeasurementService.selectEmiMeasurementList(n);
-//    }
+
+    @GetMapping("/getIndexInfo")
+    public IndexResultDTO getIndexInfo(IndexSearchDTO dto) {
+        IndexResultDTO indexResultDTO = new IndexResultDTO();
+        List<BrdfData> brdfData = brdfDataService.selectBrdfDataList(dto.getBrdfData());
+        List<EmiMeasurement> emiMeasurementList = emiMeasurementService.selectEmiMeasurementList(dto.getEmiMeasurement());
+        List<IntegratedData> integratedDataList = integratedDataService.selectIntegratedDataList(dto.getIntegratedData());
+        Sample sample = sampleService.getOne(dto.getSample());
+        indexResultDTO.setSample(sample);
+        indexResultDTO.setBrdfDataList(brdfData);
+        indexResultDTO.setEmiMeasurementList(emiMeasurementList);
+        indexResultDTO.setIntegratedDataList(integratedDataList);
+        return indexResultDTO;
+    }
 }

mirs-admin/src/main/java/com/mirs/biz/dto/IndexResultDTO.java

@@ -1,4 +1,21 @@
 package com.mirs.biz.dto;
 
-public class IndexResultDTO {
+import com.mirs.biz.domain.BrdfData;
+import com.mirs.biz.domain.EmiMeasurement;
+import com.mirs.biz.domain.IntegratedData;
+import com.mirs.biz.domain.Sample;
+import com.mirs.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IndexResultDTO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private Sample sample;
+    private List<BrdfData> brdfDataList;
+    private List<EmiMeasurement> emiMeasurementList;
+    private List<IntegratedData> integratedDataList;
 }

mirs-admin/src/main/java/com/mirs/biz/dto/IndexSearchDTO.java

@@ -1,4 +1,63 @@
 package com.mirs.biz.dto;
 
-public class IndexSearchDTO {
+import com.mirs.biz.domain.BrdfData;
+import com.mirs.biz.domain.EmiMeasurement;
+import com.mirs.biz.domain.IntegratedData;
+import com.mirs.biz.domain.Sample;
+import com.mirs.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.beans.BeanUtils;
+
+import java.math.BigDecimal;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IndexSearchDTO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 数据类型 */
+    private String dataType;
+
+    /** 样片型号 */
+    private String sampleModel;
+
+    /** 温度(K) */
+    private Long temperatureK;
+
+    /** 光谱(μm) */
+    private String wavelengthUm;
+
+    /** 入射天顶角θi */
+    private BigDecimal thetaIncident;
+
+    /** 入射方位角φi */
+    private BigDecimal phiIncident;
+
+    /** 反射天顶角θr */
+    private BigDecimal thetaReflected;
+
+    /** 反射方位角φr */
+    private BigDecimal phiReflected;
+
+    public BrdfData getBrdfData(){
+        BrdfData data = new BrdfData();
+        BeanUtils.copyProperties(this, data);
+        return data;
+    }
+    public EmiMeasurement getEmiMeasurement(){
+        EmiMeasurement data = new EmiMeasurement();
+        BeanUtils.copyProperties(this, data);
+        return data;
+    }
+    public IntegratedData getIntegratedData(){
+        IntegratedData data = new IntegratedData();
+        BeanUtils.copyProperties(this, data);
+        return data;
+    }
+    public Sample getSample(){
+        Sample data = new Sample();
+        BeanUtils.copyProperties(this, data);
+        return data;
+    }
 }

mirs-ui/src/views/index.vue

@@ -9,14 +9,6 @@
       label-width="100px"
     >
       <el-form-item label="数据类型" prop="dataType">
-        <!-- <el-select v-model="dataType" placeholder="请选择">
-          <el-option
-            v-for="dict in dict.type.biz_data_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
-        </el-select> -->
         <el-radio
           v-for="dict in dict.type.biz_data_type"
           :key="dict.value"
@@ -244,6 +236,7 @@
 
 <script>
 import * as echarts from "echarts";
+import { getIndexInfo } from "@/api/manage/index";
 export default {
   name: "Index",
   dicts: ["biz_data_type"],
@@ -268,213 +261,11 @@ export default {
         phiReflected: null,
       },
       showResult: false,
-      // 样片管理表格数据
-      sampleList: [],
-      sampleImage:
-        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
-
+      sampleImage: null,
       chart: null,
-      emiMeasurementList: [
-        {
-          sampleModel: "123",
-          temperatureK: "300",
-          wavelengthUm: 1.0,
-          emiCorrection1: 0.1,
-          emiCorrection2: 0.2,
-          emiCorrection3: 0.3,
-          emiCorrection4: 0.4,
-          emiCorrection5: 0.5,
-          meanValue: 0.5,
-        },
-        {
-          sampleModel: "123",
-          temperatureK: "300",
-          wavelengthUm: 1.5,
-          emiCorrection1: 0.15,
-          emiCorrection2: 0.25,
-          emiCorrection3: 0.35,
-          emiCorrection4: 0.45,
-          emiCorrection5: 0.55,
-          meanValue: 0.5,
-        },
-        {
-          sampleModel: "123",
-          temperatureK: "300",
-          wavelengthUm: 2.0,
-          emiCorrection1: 0.2,
-          emiCorrection2: 0.3,
-          emiCorrection3: 0.4,
-          emiCorrection4: 0.5,
-          emiCorrection5: 0.6,
-          meanValue: 0.5,
-        },
-        {
-          sampleModel: "123",
-          temperatureK: "300",
-          wavelengthUm: 2.5,
-          emiCorrection1: 0.25,
-          emiCorrection2: 0.35,
-          emiCorrection3: 0.45,
-          emiCorrection4: 0.55,
-          emiCorrection5: 0.65,
-          meanValue: 0.5,
-        },
-        {
-          sampleModel: "123",
-          temperatureK: "300",
-          wavelengthUm: 3.0,
-          emiCorrection1: 0.3,
-          emiCorrection2: 0.4,
-          emiCorrection3: 0.5,
-          emiCorrection4: 0.6,
-          emiCorrection5: 0.7,
-          meanValue: 0.5,
-        },
-      ],
-      integratedDataList: [
-        {
-          id: 1,
-          sampleModel: "B-200",
-          temperatureK: 350,
-          wavelengthUm: 2.5,
-          integralValue1: "0.3524",
-          integralValue2: "0.7812",
-          integralValue3: "0.5432",
-          integralValue4: "0.9123",
-          integralValue5: "0.2345",
-          standardDev: "0.2768",
-        },
-        {
-          id: 2,
-          sampleModel: "D-400",
-          temperatureK: 500,
-          wavelengthUm: 1.5,
-          integralValue1: "0.6234",
-          integralValue2: "0.4567",
-          integralValue3: "0.7890",
-          integralValue4: "0.3456",
-          integralValue5: "0.6789",
-          standardDev: "0.1745",
-        },
-        {
-          id: 3,
-          sampleModel: "A-100",
-          temperatureK: 300,
-          wavelengthUm: 3.0,
-          integralValue1: "0.2345",
-          integralValue2: "0.5678",
-          integralValue3: "0.6789",
-          integralValue4: "0.1234",
-          integralValue5: "0.4567",
-          standardDev: "0.2234",
-        },
-        {
-          id: 4,
-          sampleModel: "C-300",
-          temperatureK: 450,
-          wavelengthUm: 1.0,
-          integralValue1: "0.7890",
-          integralValue2: "0.4567",
-          integralValue3: "0.2345",
-          integralValue4: "0.6789",
-          integralValue5: "0.3456",
-          standardDev: "0.2234",
-        },
-        {
-          id: 5,
-          sampleModel: "E-500",
-          temperatureK: 400,
-          wavelengthUm: 3.5,
-          integralValue1: "0.4567",
-          integralValue2: "0.7890",
-          integralValue3: "0.3456",
-          integralValue4: "0.2345",
-          integralValue5: "0.6789",
-          standardDev: "0.2234",
-        },
-      ],
-      brdfDataList: [
-        {
-          sampleModel: "A-100",
-          temperatureK: 300,
-          wavelengthUm: 1.5,
-          thetaIncident: 30,
-          phiIncident: 45,
-          thetaReflected: 45,
-          phiReflected: 60,
-          measurement1: 0.123,
-          measurement2: 0.125,
-          measurement3: 0.124,
-          measurement4: 0.126,
-          measurement5: 0.122,
-          meanValue: 0.124,
-          repeatabilityPct: 1.61,
-        },
-        {
-          sampleModel: "B-200",
-          temperatureK: 350,
-          wavelengthUm: 2.0,
-          thetaIncident: 35,
-          phiIncident: 50,
-          thetaReflected: 50,
-          phiReflected: 65,
-          measurement1: 0.235,
-          measurement2: 0.238,
-          measurement3: 0.236,
-          measurement4: 0.234,
-          measurement5: 0.237,
-          meanValue: 0.236,
-          repeatabilityPct: 1.27,
-        },
-        {
-          sampleModel: "C-300",
-          temperatureK: 400,
-          wavelengthUm: 2.5,
-          thetaIncident: 40,
-          phiIncident: 55,
-          thetaReflected: 55,
-          phiReflected: 70,
-          measurement1: 0.342,
-          measurement2: 0.345,
-          measurement3: 0.343,
-          measurement4: 0.344,
-          measurement5: 0.346,
-          meanValue: 0.344,
-          repeatabilityPct: 0.87,
-        },
-        {
-          sampleModel: "D-400",
-          temperatureK: 450,
-          wavelengthUm: 3.0,
-          thetaIncident: 45,
-          phiIncident: 60,
-          thetaReflected: 60,
-          phiReflected: 75,
-          measurement1: 0.456,
-          measurement2: 0.458,
-          measurement3: 0.457,
-          measurement4: 0.459,
-          measurement5: 0.455,
-          meanValue: 0.457,
-          repeatabilityPct: 0.66,
-        },
-        {
-          sampleModel: "E-500",
-          temperatureK: 500,
-          wavelengthUm: 3.5,
-          thetaIncident: 50,
-          phiIncident: 65,
-          thetaReflected: 65,
-          phiReflected: 80,
-          measurement1: 0.567,
-          measurement2: 0.569,
-          measurement3: 0.568,
-          measurement4: 0.566,
-          measurement5: 0.57,
-          meanValue: 0.568,
-          repeatabilityPct: 0.53,
-        },
-      ],
+      emiMeasurementList: [],
+      integratedDataList: [],
+      brdfDataList: [],
     };
   },
   created() {},
@@ -493,11 +284,22 @@ export default {
       this.showResult = false;
     },
     getList() {
-      this.showResult = true;
-      this.$nextTick(() => {
-        this.initChart();
+      console.info(
+        "process.env.VUE_APP_BASE_API:" + process.env.VUE_APP_BASE_API
+      );
+      getIndexInfo(this.queryParams).then((response) => {
+        this.sample = response.sample;
+        this.sampleImage =
+          process.env.VUE_APP_BASE_API + response.sample.sampleImage;
+        this.brdfDataList = response.brdfDataList;
+        this.emiMeasurementList = response.emiMeasurementList;
+        this.integratedDataList = response.integratedDataList;
+        this.showResult = true;
+        this.$nextTick(() => {
+          this.initChart();
+        });
+        this.loading = false;
       });
-      this.loading = false;
     },
     changeDataType() {
       this.showResult = false;