add status and angle

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

@@ -0,0 +1,103 @@
+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.MeasAngle;
+import com.meas.system.service.IMeasAngleService;
+import com.meas.common.utils.poi.ExcelUtil;
+import com.meas.common.core.page.TableDataInfo;
+
+/**
+ * 角度Controller
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+@RestController
+@RequestMapping("/meas/angle")
+public class MeasAngleController extends BaseController {
+    @Autowired
+    private IMeasAngleService measAngleService;
+
+/**
+ * 查询角度列表
+ */
+@PreAuthorize("@ss.hasPermi('system:angle:list')")
+@GetMapping("/list")
+    public TableDataInfo list(MeasAngle measAngle) {
+        startPage();
+        List<MeasAngle> list = measAngleService.selectMeasAngleList(measAngle);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出角度列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:angle:export')")
+    @Log(title = "角度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MeasAngle measAngle) {
+        List<MeasAngle> list = measAngleService.selectMeasAngleList(measAngle);
+        ExcelUtil<MeasAngle> util = new ExcelUtil<MeasAngle>(MeasAngle. class);
+        util.exportExcel(response, list, "角度数据");
+    }
+
+    /**
+     * 获取角度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:angle:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(measAngleService.selectMeasAngleById(id));
+    }
+
+    /**
+     * 新增角度
+     */
+    @PreAuthorize("@ss.hasPermi('system:angle:add')")
+    @Log(title = "角度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MeasAngle measAngle) {
+        return toAjax(measAngleService.insertMeasAngle(measAngle));
+    }
+
+    /**
+     * 修改角度
+     */
+    @PreAuthorize("@ss.hasPermi('system:angle:edit')")
+    @Log(title = "角度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MeasAngle measAngle) {
+        return toAjax(measAngleService.updateMeasAngle(measAngle));
+    }
+
+    /**
+     * 删除角度
+     */
+    @PreAuthorize("@ss.hasPermi('system:angle:remove')")
+    @Log(title = "角度", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(measAngleService.deleteMeasAngleByIds(ids));
+    }
+
+    @GetMapping("/getOption")
+    public AjaxResult getOption(){
+        return success(measAngleService.getOption());
+    }
+}

meas-system/src/main/java/com/meas/meas/controller/MeasEngineModelController.java → meas-system/src/main/java/com/meas/system/controller/MeasEngineModelController.java

@@ -1,4 +1,4 @@
-package com.meas.meas.controller;
+package com.meas.system.controller;
 
 import com.meas.common.annotation.Log;
 import com.meas.common.core.controller.BaseController;
@@ -6,8 +6,8 @@ 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.meas.domain.MeasEngineModel;
-import com.meas.meas.service.IMeasEngineModelService;
+import com.meas.system.domain.MeasEngineModel;
+import com.meas.system.service.IMeasEngineModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;

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

@@ -0,0 +1,103 @@
+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.MeasStatus;
+import com.meas.system.service.IMeasStatusService;
+import com.meas.common.utils.poi.ExcelUtil;
+import com.meas.common.core.page.TableDataInfo;
+
+/**
+ * 状态Controller
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+@RestController
+@RequestMapping("/meas/status")
+public class MeasStatusController extends BaseController {
+    @Autowired
+    private IMeasStatusService measStatusService;
+
+/**
+ * 查询状态列表
+ */
+@PreAuthorize("@ss.hasPermi('system:status:list')")
+@GetMapping("/list")
+    public TableDataInfo list(MeasStatus measStatus) {
+        startPage();
+        List<MeasStatus> list = measStatusService.selectMeasStatusList(measStatus);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出状态列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:status:export')")
+    @Log(title = "状态", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MeasStatus measStatus) {
+        List<MeasStatus> list = measStatusService.selectMeasStatusList(measStatus);
+        ExcelUtil<MeasStatus> util = new ExcelUtil<MeasStatus>(MeasStatus. class);
+        util.exportExcel(response, list, "状态数据");
+    }
+
+    /**
+     * 获取状态详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:status:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(measStatusService.selectMeasStatusById(id));
+    }
+
+    /**
+     * 新增状态
+     */
+    @PreAuthorize("@ss.hasPermi('system:status:add')")
+    @Log(title = "状态", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MeasStatus measStatus) {
+        return toAjax(measStatusService.insertMeasStatus(measStatus));
+    }
+
+    /**
+     * 修改状态
+     */
+    @PreAuthorize("@ss.hasPermi('system:status:edit')")
+    @Log(title = "状态", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MeasStatus measStatus) {
+        return toAjax(measStatusService.updateMeasStatus(measStatus));
+    }
+
+    /**
+     * 删除状态
+     */
+    @PreAuthorize("@ss.hasPermi('system:status:remove')")
+    @Log(title = "状态", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(measStatusService.deleteMeasStatusByIds(ids));
+    }
+
+    @GetMapping("/getOption")
+    public AjaxResult getOption(){
+        return success(measStatusService.getOption());
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.meas.system.domain;
+
+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_angle
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+public class MeasAngle extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+        /** 序号 */
+        private Long id;
+
+        /** 角度 */
+                @Excel(name = "角度")
+        private Long angle;
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public Long getId() {
+            return id;
+        }
+        public void setAngle(Long angle) {
+            this.angle = angle;
+        }
+
+        public Long getAngle() {
+            return angle;
+        }
+
+@Override
+public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("id", getId())
+        .append("angle", getAngle())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+            .toString();
+}
+}

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

@@ -22,9 +22,9 @@ public class MeasDataResults extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private String measurementBatchId;
 
     /**

meas-system/src/main/java/com/meas/meas/domain/MeasEngineModel.java → meas-system/src/main/java/com/meas/system/domain/MeasEngineModel.java

@@ -1,4 +1,4 @@
-package com.meas.meas.domain;
+package com.meas.system.domain;
 
 import com.meas.common.annotation.Excel;
 import com.meas.common.core.domain.BaseEntity;

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

@@ -22,9 +22,9 @@ public class MeasSpectralRadiation extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
     /**

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

@@ -0,0 +1,63 @@
+package com.meas.system.domain;
+
+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_status
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+public class MeasStatus extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+        /** 序号 */
+        private Long id;
+
+        /** 状态 */
+                @Excel(name = "状态")
+        private String status;
+
+        /** 排序 */
+                @Excel(name = "排序")
+        private Long index;
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public Long getId() {
+            return id;
+        }
+        public void setStatus(String status) {
+            this.status = status;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+        public void setIndex(Long index) {
+            this.index = index;
+        }
+
+        public Long getIndex() {
+            return index;
+        }
+
+@Override
+public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("id", getId())
+        .append("status", getStatus())
+        .append("index", getIndex())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+            .toString();
+}
+}

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

@@ -20,9 +20,9 @@ public class MeasThermalImagerTestData extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
     /**

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

@@ -20,9 +20,9 @@ public class MeasTransmissionRate extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
     /**

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

@@ -0,0 +1,63 @@
+package com.meas.system.mapper;
+
+import java.util.List;
+
+import com.meas.system.domain.MeasAngle;
+
+/**
+ * 角度Mapper接口
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+public interface MeasAngleMapper {
+    /**
+     * 查询角度
+     *
+     * @param id 角度主键
+     * @return 角度
+     */
+    public MeasAngle selectMeasAngleById(Long id);
+
+    /**
+     * 查询角度列表
+     *
+     * @param measAngle 角度
+     * @return 角度集合
+     */
+    public List<MeasAngle> selectMeasAngleList(MeasAngle measAngle);
+
+    /**
+     * 新增角度
+     *
+     * @param measAngle 角度
+     * @return 结果
+     */
+    public int insertMeasAngle(MeasAngle measAngle);
+
+    /**
+     * 修改角度
+     *
+     * @param measAngle 角度
+     * @return 结果
+     */
+    public int updateMeasAngle(MeasAngle measAngle);
+
+    /**
+     * 删除角度
+     *
+     * @param id 角度主键
+     * @return 结果
+     */
+    public int deleteMeasAngleById(Long id);
+
+    /**
+     * 批量删除角度
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMeasAngleByIds(Long[] ids);
+
+    List<Integer> getOption();
+}

meas-system/src/main/java/com/meas/meas/mapper/MeasEngineModelMapper.java → meas-system/src/main/java/com/meas/system/mapper/MeasEngineModelMapper.java

@@ -1,6 +1,6 @@
-package com.meas.meas.mapper;
+package com.meas.system.mapper;
 
-import com.meas.meas.domain.MeasEngineModel;
+import com.meas.system.domain.MeasEngineModel;
 
 import java.util.List;
 

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

@@ -0,0 +1,63 @@
+package com.meas.system.mapper;
+
+import java.util.List;
+
+import com.meas.system.domain.MeasStatus;
+
+/**
+ * 状态Mapper接口
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+public interface MeasStatusMapper {
+    /**
+     * 查询状态
+     *
+     * @param id 状态主键
+     * @return 状态
+     */
+    public MeasStatus selectMeasStatusById(Long id);
+
+    /**
+     * 查询状态列表
+     *
+     * @param measStatus 状态
+     * @return 状态集合
+     */
+    public List<MeasStatus> selectMeasStatusList(MeasStatus measStatus);
+
+    /**
+     * 新增状态
+     *
+     * @param measStatus 状态
+     * @return 结果
+     */
+    public int insertMeasStatus(MeasStatus measStatus);
+
+    /**
+     * 修改状态
+     *
+     * @param measStatus 状态
+     * @return 结果
+     */
+    public int updateMeasStatus(MeasStatus measStatus);
+
+    /**
+     * 删除状态
+     *
+     * @param id 状态主键
+     * @return 结果
+     */
+    public int deleteMeasStatusById(Long id);
+
+    /**
+     * 批量删除状态
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMeasStatusByIds(Long[] ids);
+
+    List<String> getOption();
+}

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

@@ -0,0 +1,63 @@
+package com.meas.system.service;
+
+import java.util.List;
+
+import com.meas.system.domain .MeasAngle;
+
+/**
+ * 角度Service接口
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+public interface IMeasAngleService {
+    /**
+     * 查询角度
+     *
+     * @param id 角度主键
+     * @return 角度
+     */
+    public MeasAngle selectMeasAngleById(Long id);
+
+    /**
+     * 查询角度列表
+     *
+     * @param measAngle 角度
+     * @return 角度集合
+     */
+    public List<MeasAngle> selectMeasAngleList(MeasAngle measAngle);
+
+    /**
+     * 新增角度
+     *
+     * @param measAngle 角度
+     * @return 结果
+     */
+    public int insertMeasAngle(MeasAngle measAngle);
+
+    /**
+     * 修改角度
+     *
+     * @param measAngle 角度
+     * @return 结果
+     */
+    public int updateMeasAngle(MeasAngle measAngle);
+
+    /**
+     * 批量删除角度
+     *
+     * @param ids 需要删除的角度主键集合
+     * @return 结果
+     */
+    public int deleteMeasAngleByIds(Long[] ids);
+
+    /**
+     * 删除角度信息
+     *
+     * @param id 角度主键
+     * @return 结果
+     */
+    public int deleteMeasAngleById(Long id);
+
+    List<Integer> getOption();
+}

meas-system/src/main/java/com/meas/meas/service/IMeasEngineModelService.java → meas-system/src/main/java/com/meas/system/service/IMeasEngineModelService.java

@@ -1,6 +1,6 @@
-package com.meas.meas.service;
+package com.meas.system.service;
 
-import com.meas.meas.domain.MeasEngineModel;
+import com.meas.system.domain.MeasEngineModel;
 
 import java.util.List;
 
@@ -58,4 +58,5 @@ public interface IMeasEngineModelService {
      * @return 结果
      */
     public int deleteMeasEngineModelById(Long id);
+
 }

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

@@ -0,0 +1,63 @@
+package com.meas.system.service;
+
+import java.util.List;
+
+import com.meas.system.domain .MeasStatus;
+
+/**
+ * 状态Service接口
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+public interface IMeasStatusService {
+    /**
+     * 查询状态
+     *
+     * @param id 状态主键
+     * @return 状态
+     */
+    public MeasStatus selectMeasStatusById(Long id);
+
+    /**
+     * 查询状态列表
+     *
+     * @param measStatus 状态
+     * @return 状态集合
+     */
+    public List<MeasStatus> selectMeasStatusList(MeasStatus measStatus);
+
+    /**
+     * 新增状态
+     *
+     * @param measStatus 状态
+     * @return 结果
+     */
+    public int insertMeasStatus(MeasStatus measStatus);
+
+    /**
+     * 修改状态
+     *
+     * @param measStatus 状态
+     * @return 结果
+     */
+    public int updateMeasStatus(MeasStatus measStatus);
+
+    /**
+     * 批量删除状态
+     *
+     * @param ids 需要删除的状态主键集合
+     * @return 结果
+     */
+    public int deleteMeasStatusByIds(Long[] ids);
+
+    /**
+     * 删除状态信息
+     *
+     * @param id 状态主键
+     * @return 结果
+     */
+    public int deleteMeasStatusById(Long id);
+
+    List<String> getOption();
+}

meas-system/src/main/java/com/meas/system/service/impl/MeasAngleServiceImpl.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.MeasAngleMapper;
+import com.meas.system.domain.MeasAngle;
+import com.meas.system.service.IMeasAngleService;
+
+/**
+ * 角度Service业务层处理
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+@Service
+public class MeasAngleServiceImpl implements IMeasAngleService {
+    @Autowired
+    private MeasAngleMapper measAngleMapper;
+
+    /**
+     * 查询角度
+     *
+     * @param id 角度主键
+     * @return 角度
+     */
+    @Override
+    public MeasAngle selectMeasAngleById(Long id) {
+        return measAngleMapper.selectMeasAngleById(id);
+    }
+
+    /**
+     * 查询角度列表
+     *
+     * @param measAngle 角度
+     * @return 角度
+     */
+    @Override
+    public List<MeasAngle> selectMeasAngleList(MeasAngle measAngle) {
+        return measAngleMapper.selectMeasAngleList(measAngle);
+    }
+
+    /**
+     * 新增角度
+     *
+     * @param measAngle 角度
+     * @return 结果
+     */
+    @Override
+    public int insertMeasAngle(MeasAngle measAngle) {
+                measAngle.setCreateTime(DateUtils.getNowDate());
+            return measAngleMapper.insertMeasAngle(measAngle);
+    }
+
+    /**
+     * 修改角度
+     *
+     * @param measAngle 角度
+     * @return 结果
+     */
+    @Override
+    public int updateMeasAngle(MeasAngle measAngle) {
+                measAngle.setUpdateTime(DateUtils.getNowDate());
+        return measAngleMapper.updateMeasAngle(measAngle);
+    }
+
+    /**
+     * 批量删除角度
+     *
+     * @param ids 需要删除的角度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeasAngleByIds(Long[] ids) {
+        return measAngleMapper.deleteMeasAngleByIds(ids);
+    }
+
+    /**
+     * 删除角度信息
+     *
+     * @param id 角度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeasAngleById(Long id) {
+        return measAngleMapper.deleteMeasAngleById(id);
+    }
+
+    @Override
+    public List<Integer> getOption() {
+        return measAngleMapper.getOption();
+    }
+}

meas-system/src/main/java/com/meas/meas/service/impl/MeasEngineModelServiceImpl.java → meas-system/src/main/java/com/meas/system/service/impl/MeasEngineModelServiceImpl.java

@@ -1,9 +1,9 @@
-package com.meas.meas.service.impl;
+package com.meas.system.service.impl;
 
 import com.meas.common.utils.DateUtils;
-import com.meas.meas.domain.MeasEngineModel;
-import com.meas.meas.mapper.MeasEngineModelMapper;
-import com.meas.meas.service.IMeasEngineModelService;
+import com.meas.system.domain.MeasEngineModel;
+import com.meas.system.mapper.MeasEngineModelMapper;
+import com.meas.system.service.IMeasEngineModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

meas-system/src/main/java/com/meas/system/service/impl/MeasStatusServiceImpl.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.MeasStatusMapper;
+import com.meas.system.domain.MeasStatus;
+import com.meas.system.service.IMeasStatusService;
+
+/**
+ * 状态Service业务层处理
+ *
+ * @author Allen
+ * @date 2024-07-24
+ */
+@Service
+public class MeasStatusServiceImpl implements IMeasStatusService {
+    @Autowired
+    private MeasStatusMapper measStatusMapper;
+
+    /**
+     * 查询状态
+     *
+     * @param id 状态主键
+     * @return 状态
+     */
+    @Override
+    public MeasStatus selectMeasStatusById(Long id) {
+        return measStatusMapper.selectMeasStatusById(id);
+    }
+
+    /**
+     * 查询状态列表
+     *
+     * @param measStatus 状态
+     * @return 状态
+     */
+    @Override
+    public List<MeasStatus> selectMeasStatusList(MeasStatus measStatus) {
+        return measStatusMapper.selectMeasStatusList(measStatus);
+    }
+
+    /**
+     * 新增状态
+     *
+     * @param measStatus 状态
+     * @return 结果
+     */
+    @Override
+    public int insertMeasStatus(MeasStatus measStatus) {
+                measStatus.setCreateTime(DateUtils.getNowDate());
+            return measStatusMapper.insertMeasStatus(measStatus);
+    }
+
+    /**
+     * 修改状态
+     *
+     * @param measStatus 状态
+     * @return 结果
+     */
+    @Override
+    public int updateMeasStatus(MeasStatus measStatus) {
+                measStatus.setUpdateTime(DateUtils.getNowDate());
+        return measStatusMapper.updateMeasStatus(measStatus);
+    }
+
+    /**
+     * 批量删除状态
+     *
+     * @param ids 需要删除的状态主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeasStatusByIds(Long[] ids) {
+        return measStatusMapper.deleteMeasStatusByIds(ids);
+    }
+
+    /**
+     * 删除状态信息
+     *
+     * @param id 状态主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeasStatusById(Long id) {
+        return measStatusMapper.deleteMeasStatusById(id);
+    }
+
+    @Override
+    public List<String> getOption() {
+        return measStatusMapper.getOption();
+    }
+}

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

@@ -0,0 +1,102 @@
+<?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.MeasAngleMapper">
+
+    <resultMap type="MeasAngle" id="MeasAngleResult">
+            <result property="id" column="id"/>
+            <result property="angle" column="angle"/>
+            <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="selectMeasAngleVo">
+        select id, angle, create_by, create_time, update_by, update_time
+        from meas_angle order by angle asc
+    </sql>
+
+    <select id="selectMeasAngleList" parameterType="MeasAngle" resultMap="MeasAngleResult">
+        <include refid="selectMeasAngleVo"/>
+        <where>
+                        <if test="angle != null ">
+                            and angle = #{angle}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectMeasAngleById" parameterType="Long"
+            resultMap="MeasAngleResult">
+            <include refid="selectMeasAngleVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertMeasAngle" parameterType="MeasAngle" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into meas_angle
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="angle != null">angle,
+                    </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="angle != null">#{angle},
+                    </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="updateMeasAngle" parameterType="MeasAngle">
+        update meas_angle
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="angle != null">angle =
+                        #{angle},
+                    </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="deleteMeasAngleById" parameterType="Long">
+        delete
+        from meas_angle where id = #{id}
+    </delete>
+
+    <delete id="deleteMeasAngleByIds" parameterType="String">
+        delete from meas_angle where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getOption" resultType="Integer">
+        select angle from meas_angle order by angle asc
+    </select>
+</mapper>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.meas.meas.mapper.MeasEngineModelMapper">
+<mapper namespace="com.meas.system.mapper.MeasEngineModelMapper">
 
     <resultMap type="MeasEngineModel" id="MeasEngineModelResult">
         <result property="id" column="id"/>

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

@@ -0,0 +1,113 @@
+<?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.MeasStatusMapper">
+
+    <resultMap type="MeasStatus" id="MeasStatusResult">
+            <result property="id" column="id"/>
+            <result property="status" column="status"/>
+            <result property="index" column="index"/>
+            <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="selectMeasStatusVo">
+        select id, status, `index`, create_by, create_time, update_by, update_time
+        from meas_status order by `index` asc
+    </sql>
+
+    <select id="selectMeasStatusList" parameterType="MeasStatus" resultMap="MeasStatusResult">
+        <include refid="selectMeasStatusVo"/>
+        <where>
+                        <if test="status != null  and status != ''">
+                            and status = #{status}
+                        </if>
+                        <if test="index != null ">
+                            and `index` = #{index}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectMeasStatusById" parameterType="Long"
+            resultMap="MeasStatusResult">
+            <include refid="selectMeasStatusVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertMeasStatus" parameterType="MeasStatus" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into meas_status
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="status != null and status != ''">status,
+                    </if>
+                    <if test="index != null">`index`,
+                    </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="status != null and status != ''">#{status},
+                    </if>
+                    <if test="index != null">#{index},
+                    </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="updateMeasStatus" parameterType="MeasStatus">
+        update meas_status
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="status != null and status != ''">status =
+                        #{status},
+                    </if>
+                    <if test="index != null">`index` =
+                        #{index},
+                    </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="deleteMeasStatusById" parameterType="Long">
+        delete
+        from meas_status where id = #{id}
+    </delete>
+
+    <delete id="deleteMeasStatusByIds" parameterType="String">
+        delete from meas_status where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getOption" resultType="String">
+        select status from meas_status order by `index` asc
+    </select>
+</mapper>

meas_web/src/api/meas/angle.js

@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询角度列表
+export function listAngle(query) {
+  return request({
+    url: "/meas/angle/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询角度详细
+export function getAngle(id) {
+  return request({
+    url: "/meas/angle/" + id,
+    method: "get",
+  });
+}
+
+// 新增角度
+export function addAngle(data) {
+  return request({
+    url: "/meas/angle",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改角度
+export function updateAngle(data) {
+  return request({
+    url: "/meas/angle",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除角度
+export function delAngle(id) {
+  return request({
+    url: "/meas/angle/" + id,
+    method: "delete",
+  });
+}

meas_web/src/api/meas/status.js

@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询状态列表
+export function listStatus(query) {
+  return request({
+    url: "/meas/status/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询状态详细
+export function getStatus(id) {
+  return request({
+    url: "/meas/status/" + id,
+    method: "get",
+  });
+}
+
+// 新增状态
+export function addStatus(data) {
+  return request({
+    url: "/meas/status",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改状态
+export function updateStatus(data) {
+  return request({
+    url: "/meas/status",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除状态
+export function delStatus(id) {
+  return request({
+    url: "/meas/status/" + id,
+    method: "delete",
+  });
+}

meas_web/src/views/meas/angle/index.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="角度" prop="angle">
+        <el-input
+          v-model="queryParams.angle"
+          placeholder="请输入角度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:angle:add']"
+          >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:angle:edit']"
+          >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:angle:remove']"
+          >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:angle:export']"
+          >导出
+        </el-button>
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="angleList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="角度" align="center" prop="angle" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:angle:edit']"
+            >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:angle:remove']"
+            >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改角度对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="角度" prop="angle">
+          <el-input v-model="form.angle" placeholder="请输入角度" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getAngle,
+  listAngle,
+  addAngle,
+  updateAngle,
+  delAngle,
+} from "@/api/meas/angle";
+
+export default {
+  name: "Angle",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 角度表格数据
+      angleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        angle: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        angle: [
+          {
+            required: true,
+            message: "角度不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询角度列表 */
+    getList() {
+      this.loading = true;
+      listAngle(this.queryParams).then((response) => {
+        this.angleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        angle: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加角度";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getAngle(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改角度";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAngle(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAngle(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除热像仪测试数据编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delAngle(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "meas/angle/export",
+        {
+          ...this.queryParams,
+        },
+        `angle_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

meas_web/src/views/meas/dataResults/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
-          placeholder="请输入测量批次id"
+          placeholder="请输入测量环境id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -80,7 +80,7 @@
     <el-table v-loading="loading" :data="dataResultsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量批次id" align="center" prop="measurementBatchId" />
+      <el-table-column label="测量环境id" align="center" prop="measurementBatchId" />
       <el-table-column label="光谱辐射强度3~5μm" align="center" prop="specIrr1" />
       <el-table-column label="光谱辐射强度8~14μm" align="center" prop="specIrr2" />
       <el-table-column label="波段辐射强度3~5μm" align="center" prop="specBandIrr1" />
@@ -106,7 +106,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,7 +118,7 @@
     <!-- 添加或修改数据结果对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
+        <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
           <el-input v-model="form.measurementBatchId" placeholder="请输入测量批次id" />
         </el-form-item>
         <el-form-item label="光谱辐射强度3~5μm" prop="specIrr1">
@@ -186,10 +186,10 @@ export default {
           {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
         ],
         specBandIrr1: [
-          { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'} 
+          { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'}
         ],
         specBandIrr2: [
-          { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'} 
+          { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'}
         ],
       }
     };

meas_web/src/views/meas/radiation/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
-        <el-input v-model="queryParams.measurementBatchId" placeholder="请输入测量批次id" clearable
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
+        <el-input v-model="queryParams.measurementBatchId" placeholder="请输入测量环境id" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="型号" prop="model">

meas_web/src/views/meas/status/index.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="app-container">
+    <el-form
+      v-show="showSearch"
+      ref="queryForm"
+      :model="queryParams"
+      size="small"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="状态" prop="status">
+        <el-input
+          v-model="queryParams.status"
+          placeholder="请输入状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排序" prop="index">
+        <el-input
+          v-model="queryParams.index"
+          placeholder="请输入排序"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:status:add']"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:status:edit']"
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:status:remove']"
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:status:export']"
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="statusList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="排序" align="center" prop="index" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-hasPermi="['system:status:edit']"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >修改
+          </el-button>
+          <el-button
+            v-hasPermi="['system:status:remove']"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改状态对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="状态" prop="status">
+          <el-input v-model="form.status" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="排序" prop="index">
+          <el-input v-model="form.index" placeholder="请输入排序" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getStatus,
+  listStatus,
+  addStatus,
+  updateStatus,
+  delStatus,
+} from "@/api/meas/status";
+
+export default {
+  name: "Status",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 状态表格数据
+      statusList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        status: null,
+        index: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        status: [
+          {
+            required: true,
+            message: "状态不能为空",
+            trigger: "change",
+          },
+        ],
+        index: [
+          {
+            required: true,
+            message: "排序不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询状态列表 */
+    getList() {
+      this.loading = true;
+      listStatus(this.queryParams).then((response) => {
+        this.statusList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        status: null,
+        index: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加状态";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getStatus(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改状态";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStatus(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStatus(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除热像仪测试数据编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delStatus(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "meas/status/export",
+        {
+          ...this.queryParams,
+        },
+        `status_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

meas_web/src/views/meas/thermalImagerTesDdata/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
-          placeholder="请输入测量批次id"
+          placeholder="请输入测量环境id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -116,7 +116,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

meas_web/src/views/meas/transmissionRate/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
-          placeholder="请输入测量批次id"
+          placeholder="请输入测量环境id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -93,7 +93,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

sql/meas.sql

@@ -1225,4 +1225,83 @@ CREATE TABLE `sys_user_role`  (
 INSERT INTO `sys_user_role` VALUES (1, 1);
 INSERT INTO `sys_user_role` VALUES (2, 2);
 
+
+DROP TABLE
+IF
+	EXISTS `meas_angle`;
+CREATE TABLE `meas_angle` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号',
+	`angle` INT ( 11 ) NOT NULL COMMENT '角度',
+	`create_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+	`update_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+	`update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB CHARACTER
+SET = utf8mb4 AUTO_INCREMENT = 1 COLLATE = utf8mb4_general_ci COMMENT = '角度表' ROW_FORMAT = Dynamic;
+DROP TABLE
+IF
+	EXISTS `meas_status`;
+CREATE TABLE `meas_status` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号',
+	`status` VARCHAR ( 63 ) NOT NULL COMMENT '状态',
+	`index` bigint(20) NOT NULL COMMENT '排序',
+	`create_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+	`update_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+	`update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB CHARACTER
+SET = utf8mb4 AUTO_INCREMENT = 1 COLLATE = utf8mb4_general_ci COMMENT = '状态表' ROW_FORMAT = Dynamic;
+
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('状态', '2000', '1', 'status', 'meas/status/index', 1, 0, 'C', '0', '0', 'meas:status:list', '#', 'admin', sysdate(), '', null, '状态菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('状态查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', 'meas:status:query',        '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('状态新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', 'meas:status:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('状态修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', 'meas:status:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('状态删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', 'meas:status:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('状态导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', 'meas:status:export',       '#', 'admin', sysdate(), '', null, '');
+
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('角度', '2000', '1', 'angle', 'meas/angle/index', 1, 0, 'C', '0', '0', 'meas:angle:list', '#', 'admin', sysdate(), '', null, '角度菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('角度查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', 'meas:angle:query',        '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('角度新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', 'meas:angle:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('角度修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', 'meas:angle:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('角度删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', 'meas:angle:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('角度导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', 'meas:angle:export',       '#', 'admin', sysdate(), '', null, '');
+
 SET FOREIGN_KEY_CHECKS = 1;