fix

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

@@ -51,10 +51,22 @@ public class DataAcquisitionInstrumentController {
             volits.setSize(pageList.getSize());
             List<DataAcquisitionInstrument> records = pageList.getRecords();
             List<DataAcquisitionInstrumentVo> revoList = new ArrayList<>();
+            // 查询企业
+            Map<String,Object> componyMap =  dataAcquisitionInstrumentService.getComponyMap();
+            // 查询工厂
+            Map<String, Object> departmentMap = dataAcquisitionInstrumentService.getDepartmentMap();
             records.forEach(x->{
                 DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
                 List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(x.getId());
                 BeanUtils.copyProperties(x, instrumentVo);
+                if (instrumentVo.getCompanyCode()!=null  && componyMap.get(instrumentVo.getCompanyCode())!=null){
+                    Map componyMapobj = (Map)componyMap.get(instrumentVo.getCompanyCode());
+                    instrumentVo.setCompanyName(componyMapobj.get("companylongname").toString());
+                }
+                if (instrumentVo.getDepartmentCode()!=null && departmentMap.get(instrumentVo.getDepartmentCode())!=null){
+                    Map componyMapobj = (Map)departmentMap.get(instrumentVo.getDepartmentCode());
+                    instrumentVo.setDepartmentName(componyMapobj.get("departmentname").toString());
+                };
                 if (!analyticalInstruments.isEmpty()){
                     List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
                     analyticalInstruments.forEach(y->{
@@ -81,7 +93,7 @@ public class DataAcquisitionInstrumentController {
      * 根据菜单编号获取详细信息
      */
     @GetMapping(value = "delete/{id}")
-    public AjaxResult getInfo(@PathVariable String id)
+    public AjaxResult delete(@PathVariable String id)
     {
         DataAcquisitionInstrument dataAcquisitionInstrument = dataAcquisitionInstrumentService.getById(id);
         DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
@@ -100,6 +112,37 @@ public class DataAcquisitionInstrumentController {
             }
         }
         dataAcquisitionInstrumentService.remove(new QueryWrapper<DataAcquisitionInstrument>().eq("id", id));
+        return success();
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable String id)
+    {
+        DataAcquisitionInstrument dataAcquisitionInstrument = dataAcquisitionInstrumentService.getById(id);
+        DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
+        if (dataAcquisitionInstrument != null){
+            BeanUtils.copyProperties(dataAcquisitionInstrument, instrumentVo);
+            List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(dataAcquisitionInstrument.getId());
+            if (!analyticalInstruments.isEmpty()){
+                List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
+                analyticalInstruments.forEach(x->{
+                        AnalyticalInstrumentsVo analyticalInstrumentsVo = new AnalyticalInstrumentsVo();
+                        BeanUtils.copyProperties(x, analyticalInstrumentsVo);
+
+                        List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.listByParentId(x.getId());
+                        if (!analyticalInstrumentId.isEmpty()){
+                            analyticalInstrumentId.forEach(z->{
+                                analyticalInstrumentsVo.getDetectMonitoringFactors().add(z);
+                            });
+                        }
+                        analyticalInstrumentList.add(analyticalInstrumentsVo);
+                    });
+                instrumentVo.setAnalyticalInstruments(analyticalInstrumentList);
+            }
+        }
         return success(instrumentVo);
     }
 

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

@@ -89,6 +89,6 @@ public class AnalyticalInstruments {
      * 分析仪类型（1气体分析仪，2污水分析仪）
      */
     @TableField(value = "type")
-    private String type;
+    private Integer type;
 
 }

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

@@ -37,7 +37,7 @@ public class DataAcquisitionInstrument {
      * 排污口类型（1 废气，2废水）
      */
     @TableField(value = "type")
-    private String type;
+    private Integer type;
     /**
      *建设投用日期
      */
@@ -47,7 +47,7 @@ public class DataAcquisitionInstrument {
      * 是否完成验收备案(0否 1是)
      */
     @TableField(value = "complete_filings")
-    private String completeFilings;
+    private Integer completeFilings;
 
     /**
      * 验收备案时间
@@ -95,12 +95,12 @@ public class DataAcquisitionInstrument {
      * 是否有排气筒 1是 0否
      */
     @TableField(value = "have_exhaust")
-    private String haveExhaust;
+    private Integer haveExhaust;
     /**
      * 排气筒温度
      */
     @TableField(value = "exhaust_temperature")
-    private String exhaustTemperature;
+    private BigDecimal exhaustTemperature;
     /**
      * 排气筒高度
      */

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

@@ -47,7 +47,7 @@ public class DetectMonitorFactor {
      * 缺省数据类型（浓度）
      */
     @TableField(value = "type")
-    private String type;
+    private Integer type;
     /**
      * 简称
      */
@@ -57,7 +57,7 @@ public class DetectMonitorFactor {
      * 监测因子类型 1 废气 2 废水
      */
     @TableField(value = "factorType")
-    private String factorType;
+    private Integer factorType;
 
 
 }

src/main/java/com/cn/esermis/dpld/mapper/DataAcquisitionInstrumentMapper.java

@@ -3,6 +3,7 @@ package com.cn.esermis.dpld.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -16,4 +17,10 @@ public interface DataAcquisitionInstrumentMapper extends BaseMapper<DataAcquisit
     List<Map<String,Object>> getCompony();
 
     List<Map<String, Object>> getDepartment(String componyid);
+
+    @MapKey("companyid")
+    Map<String, Object> getComponyMap();
+
+    @MapKey("departmentid")
+    Map<String, Object> getDepartmentMap();
 }

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

@@ -16,5 +16,7 @@ public class DataAcquisitionInstrumentVo extends DataAcquisitionInstrument {
    private Integer pageNum;
 
    private Integer pageSize;
+   private String companyName;
+   private String departmentName;
 
 }

src/main/java/com/cn/esermis/dpld/service/IDataAcquisitionInstrumentService.java

@@ -17,4 +17,8 @@ public interface IDataAcquisitionInstrumentService extends IService<DataAcquisit
     List<Map<String,Object>> getCompony();
 
     List<Map<String, Object>> getDepartment(String componyid);
+
+    Map<String, Object> getComponyMap();
+
+    Map<String, Object> getDepartmentMap();
 }

src/main/java/com/cn/esermis/dpld/service/impl/DataAcquisitionInstrumentServiceImpl.java

@@ -33,4 +33,14 @@ public class DataAcquisitionInstrumentServiceImpl extends ServiceImpl<DataAcquis
     public List<Map<String, Object>> getDepartment(String componyid) {
         return mapper.getDepartment(componyid);
     }
+
+    @Override
+    public Map<String, Object> getComponyMap() {
+        return mapper.getComponyMap();
+    }
+
+    @Override
+    public Map<String, Object> getDepartmentMap() {
+        return mapper.getDepartmentMap();
+    }
 }

src/main/resources/static/mybatis/DataAcquisitionInstrumentMapper.xml

@@ -19,5 +19,13 @@
         FROM department t
         WHERE t.companyid = #{companyid}
     </select>
+    <select id="getComponyMap" resultType="java.util.Map">
+        SELECT t.companyid,t.companylongname
+        FROM company t
+    </select>
+    <select id="getDepartmentMap" resultType="java.util.Map">
+        SELECT t.departmentid,t.departmentname
+        FROM department t
+    </select>
 </mapper>