token 认证

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -47,6 +47,7 @@ public class DataAcquisitionInstrumentController {
     {
         IPage<DataAcquisitionInstrument> page = new Page<>(vo.getPageNum(), vo.getPageSize());
         QueryWrapper<DataAcquisitionInstrument> wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("department_code");
         IPage<DataAcquisitionInstrument> pageList = dataAcquisitionInstrumentService.page(page, wrapper);
         IPage<DataAcquisitionInstrumentVo> volits = new Page<>();
         if (!pageList.getRecords().isEmpty()){
@@ -191,7 +192,7 @@ public class DataAcquisitionInstrumentController {
                     List<DetectMonitoringFactor> detectMonitoringFactors = x.getDetectMonitoringFactors();
                     detectMonitoringFactors.forEach(y->{
                         y.setAnalyticalInstrumentId(analyticalInstruments.getId());
-
+                        y.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
                         boolean save2 = detectMonitoringFactorService.save(y);
                         if (!save2){
                             throw new RuntimeException("添加失败");

src/main/java/com/cn/esermis/dpld/entity/DataAcquisitionInstrument.java

@@ -104,15 +104,15 @@ public class DataAcquisitionInstrument {
      * 排气筒温度
      */
     @TableField(value = "exhaust_temperature")
-    private BigDecimal exhaustTemperature;
+    private String exhaustTemperature;
     /**
      * 排气筒高度
      */
     @TableField(value = "exhaust_height")
-    private BigDecimal exhaustHeight;
+    private String exhaustHeight;
     /**
      * 排气筒直径
      */
     @TableField(value = "exhaust_diameter")
-    private BigDecimal exhaustDiameter;
+    private String exhaustDiameter;
 }

src/main/java/com/cn/esermis/dpld/model/DataAcquisitionInstrumentVo.java

@@ -4,6 +4,7 @@ import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -11,7 +12,7 @@ import java.util.List;
 @Data
 public class DataAcquisitionInstrumentVo extends DataAcquisitionInstrument {
 
-   private List<AnalyticalInstrumentsVo> analyticalInstruments;
+   private List<AnalyticalInstrumentsVo> analyticalInstruments = new ArrayList<>();
 
    private Integer pageNum;