hj212 2005

pom.xml

@@ -184,7 +184,26 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
-
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>5.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>5.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml-schemas</artifactId>
+			<version>4.1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
+			<version>5.1.1</version>
+		</dependency>
     </dependencies>
 
 

src/main/java/com/cn/esermis/EsermisApplication.java

@@ -1,6 +1,7 @@
 package com.cn.esermis;
 
 import com.cn.esermis.server.BootNettyServer;
+import com.cn.esermis.server.Consumer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -17,7 +18,7 @@ public class EsermisApplication  implements CommandLineRunner {
     public static void main(String[] args) throws InterruptedException {
         ConfigurableApplicationContext context =  SpringApplication.run(EsermisApplication.class, args);
         // 调用异步任务 启动消费服务
-//        context.getBean(Consumer.class).receive();
+        context.getBean(Consumer.class).receive();
     }
     //异步方法
     @Async

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

@@ -9,13 +9,11 @@ import com.cn.esermis.dpld.entity.AnalyticalInstruments;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.entity.DetectMonitoringFactor;
 import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
-import com.cn.esermis.dpld.model.AjaxResult;
-import com.cn.esermis.dpld.model.AnalyticalInstrumentsVo;
-import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
-import com.cn.esermis.dpld.model.OutletAndFactorVo;
+import com.cn.esermis.dpld.model.*;
 import com.cn.esermis.dpld.service.IAnalyticalInstrumentsService;
 import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import com.cn.esermis.dpld.service.IDetectMonitoringFactorService;
+import com.cn.esermis.excelReader.ExcelReader;
 import com.cn.esermis.model.BaseUser;
 import com.cn.esermis.utils.TokenUtils;
 import org.springframework.beans.BeanUtils;
@@ -29,6 +27,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.cn.esermis.dpld.model.AjaxResult.error;
 import static com.cn.esermis.dpld.model.AjaxResult.success;
@@ -269,4 +268,175 @@ public class DataAcquisitionInstrumentController {
         return success(dataAcquisitionInstruments);
     }
 
+
+
+    /**
+     * 获取数采仪信息表
+     */
+    @GetMapping("/daoru")
+    public AjaxResult daoru(HttpServletRequest request) {
+
+        ExcelReader excelReader = new ExcelReader();
+        List<DataAllVo> data = excelReader.getData();
+        System.out.println(data);
+        List<Department> departmentList =  dataAcquisitionInstrumentService.getDepartmentDit();
+        // 添加公司编号
+        for (DataAllVo datum : data) {
+            Optional<Department> first = departmentList.stream().filter(d -> d.getDepartmentname().equals(datum.getCompanyCode())).findFirst();
+            if (first.isPresent()){
+                datum.setCompanyCode(first.get().getCompanyid());
+                datum.setDepartmentCode(first.get().getDepartmentid());
+            }
+        }
+        Map<String, List<DataAllVo>> collect = data.stream().collect(Collectors.groupingBy(d -> d.getOutletName() + "_" + d.getLicenseNumber()));
+        for (Map.Entry<String, List<DataAllVo>> entry : collect.entrySet()) {
+            List<DataAllVo> value = entry.getValue();
+            DataAcquisitionInstrument dataAcquisitionInstrument = new DataAcquisitionInstrument();
+            value.forEach(x->{
+                if (x.getOutletName()!=null && !x.getOutletName().isEmpty()){
+                    dataAcquisitionInstrument.setOutletName(x.getOutletName());
+                }
+                if (x.getOutletCode()!=null && !x.getOutletCode().isEmpty()){
+                    dataAcquisitionInstrument.setOutletCode(x.getOutletCode());
+                }
+                if (x.getType()!=null){
+                    dataAcquisitionInstrument.setType(x.getType());
+                }
+                if (x.getUseData()!=null){
+                    dataAcquisitionInstrument.setUseData(x.getUseData());
+                }
+                if (x.getCompleteFilings()!=null){
+                    dataAcquisitionInstrument.setCompleteFilings(x.getCompleteFilings());
+                }
+                if (x.getCompleteFilingsTime()!=null){
+                    dataAcquisitionInstrument.setCompleteFilingsTime(x.getCompleteFilingsTime());
+                }
+                if (x.getCollectionName()!=null && !x.getCollectionName().isEmpty()){
+                    dataAcquisitionInstrument.setCollectionName(x.getCollectionName());
+                }
+                if (x.getCollectionBrand()!=null && !x.getCollectionBrand().isEmpty()){
+                    dataAcquisitionInstrument.setCollectionBrand(x.getCollectionBrand());
+                }
+                if (x.getCollectionModel()!=null && !x.getCollectionModel().isEmpty()){
+                    dataAcquisitionInstrument.setCollectionModel(x.getCollectionModel());
+                }
+                if (x.getMnCode()!=null && !x.getMnCode().isEmpty()){
+                    dataAcquisitionInstrument.setMnCode(x.getMnCode());
+                }
+                if (x.getCollectionIp()!=null && !x.getCollectionIp().isEmpty()){
+                    dataAcquisitionInstrument.setCollectionIp(x.getCollectionIp());
+                }
+                if (x.getCompanyCode()!=null && !x.getCompanyCode().isEmpty()){
+                    dataAcquisitionInstrument.setCompanyCode(x.getCompanyCode());
+                }
+                if (x.getDepartmentCode()!=null && !x.getDepartmentCode().isEmpty()){
+                    dataAcquisitionInstrument.setDepartmentCode(x.getDepartmentCode());
+                }
+                if (x.getHaveExhaust()!=null){
+                    dataAcquisitionInstrument.setHaveExhaust(x.getHaveExhaust());
+                }
+                if (x.getExhaustTemperature()!=null && !x.getExhaustTemperature().isEmpty()){
+                    dataAcquisitionInstrument.setExhaustTemperature(x.getExhaustTemperature());
+                }
+                if (x.getExhaustHeight()!=null && !x.getExhaustHeight().isEmpty()){
+                    dataAcquisitionInstrument.setExhaustHeight(x.getExhaustHeight());
+                }
+                if (x.getExhaustDiameter()!=null && !x.getExhaustDiameter().isEmpty()){
+                    dataAcquisitionInstrument.setExhaustDiameter(x.getExhaustDiameter());
+                }
+                if (x.getIndustryCategory()!=null && !x.getIndustryCategory().isEmpty()){
+                    dataAcquisitionInstrument.setIndustryCategory(x.getIndustryCategory());
+                }
+                if (x.getLicenseNumber()!=null && !x.getLicenseNumber().isEmpty()){
+                    dataAcquisitionInstrument.setLicenseNumber(x.getLicenseNumber());
+                }
+                if (x.getLicenseData()!=null && !x.getLicenseData().isEmpty()){
+                    dataAcquisitionInstrument.setLicenseData(x.getLicenseData());
+                }
+            });
+            dataAcquisitionInstrumentService.save(dataAcquisitionInstrument);
+            // 解析分析仪数据
+            Map<String, List<DataAllVo>> brandCollect = value.stream().collect(Collectors.groupingBy(DataAllVo::getBrand));
+            for (Map.Entry<String, List<DataAllVo>> listEntry : brandCollect.entrySet()) {
+                AnalyticalInstruments analyticalInstruments = new AnalyticalInstruments();
+                List<DataAllVo> dataAllVos = listEntry.getValue();
+                analyticalInstruments.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
+                dataAllVos.forEach(x->{
+                    if (x.getBrand()!=null && !x.getBrand().isEmpty()){
+                        analyticalInstruments.setBrand(x.getBrand());
+                    }
+                    if (x.getModel()!=null && !x.getModel().isEmpty()){
+                        analyticalInstruments.setModel(x.getModel());
+                    }
+                    if (x.getName()!=null && !x.getName().isEmpty()){
+                        analyticalInstruments.setName(x.getName());
+                    }
+                    if (x.getFactorInfor()!=null && !x.getFactorInfor().isEmpty()){
+                        analyticalInstruments.setFactorInfor(x.getFactorInfor());
+                    }
+//                    if (x.getRange()!=null && !x.getRange().isEmpty()){
+//                        analyticalInstruments.setRange(x.getRange());
+//                    }
+                    if (x.getRange()!=null && !x.getRange().isEmpty())   {
+                        analyticalInstruments.setRange(x.getRange());
+                    }
+                    if(x.getReferenceOxygenContent()!=null && !x.getReferenceOxygenContent().isEmpty()){
+                        analyticalInstruments.setReferenceOxygenContent(x.getReferenceOxygenContent());
+                    }
+                    if(x.getVelocityFieldCoefficient()!=null && !x.getVelocityFieldCoefficient().isEmpty()){
+                        analyticalInstruments.setVelocityFieldCoefficient(x.getVelocityFieldCoefficient());
+                    }
+                    if(x.getPitotTubeCoefficient()!=null && !x.getPitotTubeCoefficient().isEmpty()){
+                        analyticalInstruments.setPitotTubeCoefficient(x.getPitotTubeCoefficient());
+                    }
+                    if(x.getKvalue()!=null && !x.getKvalue().isEmpty()){
+                        analyticalInstruments.setKvalue(x.getKvalue());
+                    }
+                    if(x.getFlueArea()!=null && !x.getFlueArea().isEmpty()){
+                        analyticalInstruments.setFlueArea(x.getFlueArea());
+                    }
+                    if(x.getDilutionRatio()!=null && !x.getDilutionRatio().isEmpty()){
+                        analyticalInstruments.setDilutionRatio(x.getDilutionRatio());
+                    }
+                    if(x.getFxytype()!=null){
+                        analyticalInstruments.setType(x.getFxytype());
+                    }
+                });
+                analyticalInstrumentsService.save(analyticalInstruments);
+                dataAllVos.forEach(x->{
+                    DetectMonitoringFactor detectMonitoringFactor = new DetectMonitoringFactor();
+                    detectMonitoringFactor.setAnalyticalInstrumentId(analyticalInstruments.getId());
+                    detectMonitoringFactor.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
+                    if (x.getFactor()!=null && !x.getFactor().isEmpty()){
+                        detectMonitoringFactor.setFactor(x.getFactor());
+                    }
+                    if (x.getHoursAvg()!=null && !x.getHoursAvg().isEmpty()){
+                        detectMonitoringFactor.setHoursAvg(x.getHoursAvg());
+                    }
+                    if (x.getHoursUnit()!=null && !x.getHoursUnit().isEmpty()){
+                        detectMonitoringFactor.setHoursUnit(x.getHoursUnit());
+                    }
+                    if (x.getMonthlyEmissions()!=null && !x.getMonthlyEmissions().isEmpty()){
+                        detectMonitoringFactor.setMonthlyEmissions(x.getMonthlyEmissions());
+                    }
+                    if (x.getMonthlyEmissionsUnit()!=null && !x.getMonthlyEmissionsUnit().isEmpty()){
+                        detectMonitoringFactor.setMonthlyEmissionsUnit(x.getMonthlyEmissionsUnit());
+                    }
+                    if (x.getYearEmissions()!=null && !x.getYearEmissions().isEmpty()){
+                        detectMonitoringFactor.setYearEmissions(x.getYearEmissions());
+                    }
+                    if (x.getYearEmissionsUnit()!=null && !x.getYearEmissionsUnit().isEmpty()){
+                        detectMonitoringFactor.setYearEmissionsUnit(x.getYearEmissionsUnit());
+                    }
+                    detectMonitoringFactor.setRange(x.getRangeStr());
+                    detectMonitoringFactor.setRangeUnit(x.getRangeUnit());
+                    detectMonitoringFactor.setFactorName(x.getFactorName());
+                    detectMonitoringFactorService.save(detectMonitoringFactor);
+                });
+            }
+        }
+        return success();
+    }
+
+
 }

src/main/java/com/cn/esermis/dpld/business/MonitorBusiness.java

@@ -345,8 +345,8 @@ public class MonitorBusiness {
                 }
             }
         } catch (Exception e) {
-//            throw new RuntimeException(e);
-            log.error("插入数据库异常："+e);
+            throw new RuntimeException(e);
+//            log.error("插入数据库异常："+e);
         }
     }
 

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

@@ -115,4 +115,19 @@ public class DataAcquisitionInstrument {
      */
     @TableField(value = "exhaust_diameter")
     private String exhaustDiameter;
+    /**
+     * 行业类别
+     */
+    @TableField(value = "industry_category")
+    private String industryCategory;
+    /**
+     * 排污许可证编号
+     */
+    @TableField(value = "license_number")
+    private String licenseNumber;
+    /**
+     *排污许可证有效期
+     */
+    @TableField(value = "license_data")
+    private String licenseData;
 }

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

@@ -41,7 +41,7 @@ public class DetectMonitoringFactor {
      * 小时均值单位
      */
     @TableField(value = "hours_unit")
-    private Date hoursUnit;
+    private String hoursUnit;
     /**
      * 月排放量
      */
@@ -52,7 +52,7 @@ public class DetectMonitoringFactor {
      * 月排放量单位
      */
     @TableField(value = "monthly_emissions_unit")
-    private Date monthlyEmissionsUnit;
+    private String monthlyEmissionsUnit;
 
     /**
      * 年排放量

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.DataAcquisitionInstrumentVo;
+import com.cn.esermis.dpld.model.Department;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,4 +36,6 @@ public interface DataAcquisitionInstrumentMapper extends BaseMapper<DataAcquisit
     List<String> getComponyList(String companyName, String companyId);
 
     List<String> getComponyListAll(@Param("companyName") String companyName);
+
+    List<Department> getDepartmentDit();
 }

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

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

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

@@ -0,0 +1,199 @@
+package com.cn.esermis.dpld.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class DataAllVo {
+
+    /**
+     * 排污口名称
+     */
+    private String outletName;
+    /**
+     * 排污口编号
+     */
+    private String outletCode;
+    /**
+     * 排污口类型（1 废气，2废水）
+     */
+    private Integer type;
+    /**
+     *建设投用日期
+     */
+    private Date useData;
+    /**
+     * 是否完成验收备案(0否 1是)
+     */
+    private Integer completeFilings;
+
+    /**
+     * 验收备案时间
+     */
+    private Date completeFilingsTime;
+
+    /**
+     * 数采仪品牌
+     */
+    private String collectionName;
+    /**
+     * 数采仪品牌
+     */
+    private String collectionBrand;
+    /**
+     * 数采仪型号
+     */
+    private String collectionModel;
+
+    /**
+     * 数采仪MN号
+     */
+    private String mnCode;
+    /**
+     * 数采仪IP
+     */
+    private String collectionIp;
+    /**
+     * 单位编码
+     */
+    private String companyCode;
+    /**
+     * 单位编码
+     */
+    private String departmentCode;
+    /**
+     * 是否有排气筒 1是 0否
+     */
+    private Integer haveExhaust;
+    /**
+     * 排气筒温度
+     */
+    private String exhaustTemperature;
+    /**
+     * 排气筒高度
+     */
+    private String exhaustHeight;
+    /**
+     * 排气筒直径
+     */
+    private String exhaustDiameter;
+    /**
+     * 行业类别
+     */
+    private String industryCategory;
+    /**
+     * 排污许可证编号
+     */
+    private String licenseNumber;
+    /**
+     *排污许可证有效期
+     */
+    private String licenseData;
+
+    /**
+     * 分析仪品牌
+     */
+    private String brand;
+    /**
+     * 分析仪型号
+     */
+    private String model;
+    /**
+     * 分析仪名称
+     */
+    private String name;
+    /**
+     *监测污染物因子及限值（小时均值、月排放总量、年排放总量）
+     */
+    private String factorInfor;
+    /**
+     * 量程
+     */
+    private String range;
+
+    /**
+     * 数采仪id
+     */
+    private String dataAcquisitionInstrumentId;
+
+    /**
+     * 基准氧含量(%)
+     */
+    private String referenceOxygenContent;
+    /**
+     * 速度场系数
+     */
+    private String velocityFieldCoefficient;
+
+    /**
+     * 皮托管系数
+     */
+    private String pitotTubeCoefficient;
+    /**
+     * k值
+     */
+    private String kvalue;
+    /**
+     * 烟道（监测口）截面积 M3
+     */
+    private String flueArea;
+    /**
+     * 稀释比
+     */
+    private String dilutionRatio;
+    /**
+     * 分析仪类型（1气体分析仪，2污水分析仪）
+     */
+    private Integer fxytype;
+
+    /**
+     * 分析仪主键ID
+     */
+    private String analyticalInstrumentId;
+    /**
+     * 检测因子编码
+     */
+    private String factor;
+    /**
+     * 小时均值
+     */
+    private String hoursAvg;
+    /**
+     * 小时均值单位
+     */
+    private String hoursUnit;
+    /**
+     * 月排放量
+     */
+    private String monthlyEmissions;
+
+    /**
+     * 月排放量单位
+     */
+    private String monthlyEmissionsUnit;
+
+    /**
+     * 年排放量
+     */
+    private String yearEmissions;
+    /**
+     * 年排放量单位
+     */
+    private String yearEmissionsUnit;
+
+    /**
+     * 量程
+     */
+    private String rangeStr;
+    /**
+     * 量程单位
+     */
+    private String rangeUnit;
+    /**
+     * 量程单位
+     */
+    private String factorName;
+
+}

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

@@ -0,0 +1,15 @@
+package com.cn.esermis.dpld.model;
+
+import lombok.Data;
+
+@Data
+public class Department {
+
+    private String departmentid;
+
+    private String companyid;
+
+    private String departmentname;
+
+
+}

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

@@ -3,6 +3,7 @@ package com.cn.esermis.dpld.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
+import com.cn.esermis.dpld.model.Department;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.springframework.stereotype.Service;
 
@@ -28,4 +29,6 @@ public interface IDataAcquisitionInstrumentService extends IService<DataAcquisit
     List<String> getComponyList(String companyName,String companyId);
 
     List<String> getComponyListAll(String companyName);
+
+    List<Department> getDepartmentDit();
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
 import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
+import com.cn.esermis.dpld.model.Department;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import org.springframework.stereotype.Service;
@@ -60,4 +61,9 @@ public class DataAcquisitionInstrumentServiceImpl extends ServiceImpl<DataAcquis
     public List<String> getComponyListAll(String companyName) {
         return mapper.getComponyListAll(companyName);
     }
+
+    @Override
+    public List<Department> getDepartmentDit() {
+        return mapper.getDepartmentDit();
+    }
 }

src/main/java/com/cn/esermis/excelReader/ExcelReader.java

@@ -0,0 +1,268 @@
+package com.cn.esermis.excelReader;
+
+
+import com.cn.esermis.coding.PollutionGas;
+import com.cn.esermis.dpld.model.DataAllVo;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.*;
+
+
+public class ExcelReader {
+
+    public List<Map<Integer,Object>> readExcelFile(String filePath) throws IOException {
+        List<Map<Integer,Object>> data = new LinkedList<>();
+
+        FileInputStream fis = new FileInputStream(new File(filePath));
+        Workbook workbook = new HSSFWorkbook(fis);
+        Sheet sheet = workbook.getSheetAt(0);
+
+        Iterator<Row> rowIterator = sheet.iterator();
+        while (rowIterator.hasNext()) {
+            Row row = rowIterator.next();
+            if(row.getRowNum() == 0){
+                continue;
+            }
+//            List<String> rowData = new ArrayList<>();
+            Map<Integer,Object> map = new LinkedHashMap<>();
+            Iterator<Cell> cellIterator = row.cellIterator();
+
+            while (cellIterator.hasNext()) {
+                Cell cell = cellIterator.next();
+                // 行标
+                int columnIndex = cell.getColumnIndex();
+                switch (cell.getCellType()) {
+                    case STRING:
+                        map.put(columnIndex,cell.getStringCellValue());
+                        break;
+                    case NUMERIC:
+                        map.put(columnIndex,String.valueOf(cell.getNumericCellValue()));
+                        break;
+                    case BOOLEAN:
+                        map.put(columnIndex,String.valueOf(cell.getBooleanCellValue()));
+                        break;
+                    default:
+                        map.put(columnIndex,"");
+                        break;
+                }
+            }
+            data.add(map);
+        }
+
+        workbook.close();
+        fis.close();
+
+        return data;
+    }
+
+    public List<DataAllVo> getData() {
+        String filePath = "E:\\Desktop\\排口信息.xls";
+        List<DataAllVo> dataAcquisitionInstrumentret = new ArrayList<>();
+        ExcelReader excelReader = new ExcelReader();
+        try {
+            List<Map<Integer, Object>> maps = excelReader.readExcelFile(filePath);
+            List<DataAllVo> dataAcquisitionInstruments = new ArrayList<>();
+
+            maps.forEach(x->{
+                DataAllVo instrumentVo = new DataAllVo();
+//                instrumentVo.setAnalyticalInstruments();
+//                instrumentVo.setPageNum();
+//                instrumentVo.setPageSize();
+//                instrumentVo.setCompanyName();
+//                instrumentVo.setDepartmentName();
+//                instrumentVo.setId();
+                instrumentVo.setOutletName(String.valueOf(x.get(6)!=null?x.get(6):""));
+                instrumentVo.setOutletCode(String.valueOf(x.get(6)!=null?x.get(6):""));
+                instrumentVo.setType(String.valueOf(x.get(6)!=null?x.get(6):"").equals("废气")?1:2);
+//                instrumentVo.setUseData();
+                if (x.get(14)!=null
+                        && !String.valueOf(x.get(14)).equals("是")){
+                    instrumentVo.setCompleteFilings(1);
+                }
+//                instrumentVo.setCompleteFilingsTime();
+                instrumentVo.setCollectionName(x.get(18)!=null? String.valueOf(x.get(18)) :"");
+                instrumentVo.setCollectionBrand(x.get(18)!=null? String.valueOf(x.get(18)) :"");
+                instrumentVo.setCollectionModel(x.get(19)!=null? String.valueOf(x.get(19)) :"");
+                instrumentVo.setMnCode(x.get(17)!=null? String.valueOf(x.get(17)) :"");
+//                if ()
+
+//                instrumentVo.setDepartmentCode();
+                instrumentVo.setHaveExhaust(String.valueOf(x.get(9)).equals("是")?1:0);
+                instrumentVo.setExhaustTemperature(x.get(11)!=null? String.valueOf(x.get(11)) :"");
+                instrumentVo.setExhaustHeight(x.get(10)!=null? String.valueOf(x.get(10)) :"");
+                instrumentVo.setExhaustDiameter(x.get(12)!=null? String.valueOf(x.get(12)) :"");
+                if (x.get(2)==null) {
+                    DataAllVo instrumentVo1 = dataAcquisitionInstruments.get(0);
+                    instrumentVo.setIndustryCategory(instrumentVo1.getIndustryCategory());
+                    instrumentVo.setLicenseNumber(instrumentVo1.getLicenseNumber());
+                    instrumentVo.setLicenseData(instrumentVo1.getLicenseData());
+                    instrumentVo.setCompanyCode(instrumentVo1.getCompanyCode());
+                }else if(x.get(2)!=null && String.valueOf(x.get(2)).equals("") ){
+                    DataAllVo instrumentVo1 = dataAcquisitionInstruments.get(0);
+                    instrumentVo.setIndustryCategory(instrumentVo1.getIndustryCategory());
+                    instrumentVo.setLicenseNumber(instrumentVo1.getLicenseNumber());
+                    instrumentVo.setLicenseData(instrumentVo1.getLicenseData());
+                    instrumentVo.setCompanyCode(instrumentVo1.getCompanyCode());
+                }
+                else{
+                    dataAcquisitionInstrumentret.addAll(dataAcquisitionInstruments);
+                    dataAcquisitionInstruments.clear();
+                    instrumentVo.setIndustryCategory(x.get(2)!=null? String.valueOf(x.get(2)) :"");
+                    instrumentVo.setLicenseNumber(x.get(3)!=null? String.valueOf(x.get(3)) :"");
+                    instrumentVo.setLicenseData(x.get(4)!=null? String.valueOf(x.get(4)) :"");
+                    instrumentVo.setCompanyCode(x.get(1)!=null? String.valueOf(x.get(1)) :"");
+                }
+                // 分析仪
+                instrumentVo.setBrand(x.get(20)!=null? String.valueOf(x.get(20)) :"");
+                instrumentVo.setModel(x.get(21)!=null? String.valueOf(x.get(21)) :"");
+                instrumentVo.setName(x.get(20)!=null? String.valueOf(x.get(20)) :"");
+//                instrumentVo.setFactorInfor(x.get(22)!=null? String.valueOf(x.get(22)) :"");
+//                instrumentVo.setRange(x.get(23)!=null? String.valueOf(x.get(23)) :"");
+//                instrumentVo.setDataAcquisitionInstrumentId(x.get(24)!=null? String.valueOf(x.get(24)) :"");
+                instrumentVo.setReferenceOxygenContent(x.get(22)!=null? String.valueOf(x.get(22)) :"");
+                instrumentVo.setVelocityFieldCoefficient(x.get(23)!=null? String.valueOf(x.get(23)) :"");
+                instrumentVo.setPitotTubeCoefficient(x.get(24)!=null? String.valueOf(x.get(24)) :"");
+                instrumentVo.setKvalue(x.get(26)!=null? String.valueOf(x.get(26)) :"");
+                instrumentVo.setFlueArea(x.get(25)!=null? String.valueOf(x.get(25)) :"");
+                instrumentVo.setDilutionRatio(x.get(27)!=null? String.valueOf(x.get(27)) :"");
+
+
+
+                instrumentVo.setHoursAvg(x.get(31)!=null? String.valueOf(x.get(31)) :"");
+                instrumentVo.setHoursUnit(x.get(32)!=null? String.valueOf(x.get(32)) :null);
+                instrumentVo.setMonthlyEmissions(x.get(33)!=null? String.valueOf(x.get(33)) :"");
+                instrumentVo.setMonthlyEmissionsUnit(x.get(34)!=null? String.valueOf(x.get(34)) :null);
+                instrumentVo.setYearEmissions(x.get(35)!=null? String.valueOf(x.get(35)) :"");
+                instrumentVo.setYearEmissionsUnit(x.get(36)!=null? String.valueOf(x.get(36)) :null);
+                instrumentVo.setRangeStr(x.get(37)!=null? String.valueOf(x.get(37)) :"");
+                instrumentVo.setRangeUnit(x.get(38)!=null? String.valueOf(x.get(38)) :"");
+                // 检测因子信息
+                instrumentVo.setFactorName(x.get(30)!=null? String.valueOf(x.get(30)) :"");
+
+                PollutionGas[] values = PollutionGas.values();
+                for (PollutionGas value : values) {
+                    if (value.mean().equals(instrumentVo.getFactorName())){
+                        instrumentVo.setFactor(value.code());
+                    }
+                }
+
+                dataAcquisitionInstruments.add(instrumentVo);
+
+            });
+//            System.out.println(dataAcquisitionInstrumentret);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return dataAcquisitionInstrumentret;
+    }
+
+
+
+    public static void main(String[] args) {
+        String filePath = "E:\\Desktop\\排口信息.xls";
+
+        ExcelReader excelReader = new ExcelReader();
+        try {
+            List<Map<Integer, Object>> maps = excelReader.readExcelFile(filePath);
+            List<DataAllVo> dataAcquisitionInstruments = new ArrayList<>();
+            List<DataAllVo> dataAcquisitionInstrumentret = new ArrayList<>();
+            maps.forEach(x->{
+                DataAllVo instrumentVo = new DataAllVo();
+//                instrumentVo.setAnalyticalInstruments();
+//                instrumentVo.setPageNum();
+//                instrumentVo.setPageSize();
+//                instrumentVo.setCompanyName();
+//                instrumentVo.setDepartmentName();
+//                instrumentVo.setId();
+                instrumentVo.setOutletName(String.valueOf(x.get(6)!=null?x.get(6):""));
+                instrumentVo.setOutletCode(String.valueOf(x.get(6)!=null?x.get(6):""));
+                instrumentVo.setType(String.valueOf(x.get(6)!=null?x.get(6):"").equals("废气")?1:2);
+//                instrumentVo.setUseData();
+                if (x.get(14)!=null
+                        && !String.valueOf(x.get(14)).equals("是")){
+                    instrumentVo.setCompleteFilings(1);
+                }
+//                instrumentVo.setCompleteFilingsTime();
+                instrumentVo.setCollectionName(x.get(18)!=null? String.valueOf(x.get(18)) :"");
+                instrumentVo.setCollectionBrand(x.get(18)!=null? String.valueOf(x.get(18)) :"");
+                instrumentVo.setCollectionModel(x.get(19)!=null? String.valueOf(x.get(19)) :"");
+                instrumentVo.setMnCode(x.get(17)!=null? String.valueOf(x.get(17)) :"");
+//                if ()
+
+//                instrumentVo.setDepartmentCode();
+                instrumentVo.setHaveExhaust(String.valueOf(x.get(9)).equals("是")?1:0);
+                instrumentVo.setExhaustTemperature(x.get(11)!=null? String.valueOf(x.get(11)) :"");
+                instrumentVo.setExhaustHeight(x.get(10)!=null? String.valueOf(x.get(10)) :"");
+                instrumentVo.setExhaustDiameter(x.get(12)!=null? String.valueOf(x.get(12)) :"");
+                if (x.get(2)==null) {
+                    DataAllVo instrumentVo1 = dataAcquisitionInstruments.get(0);
+                    instrumentVo.setIndustryCategory(instrumentVo1.getIndustryCategory());
+                    instrumentVo.setLicenseNumber(instrumentVo1.getLicenseNumber());
+                    instrumentVo.setLicenseData(instrumentVo1.getLicenseData());
+                    instrumentVo.setCompanyCode(instrumentVo1.getCompanyCode());
+                }else if(x.get(2)!=null && String.valueOf(x.get(2)).equals("") ){
+                    DataAllVo instrumentVo1 = dataAcquisitionInstruments.get(0);
+                    instrumentVo.setIndustryCategory(instrumentVo1.getIndustryCategory());
+                    instrumentVo.setLicenseNumber(instrumentVo1.getLicenseNumber());
+                    instrumentVo.setLicenseData(instrumentVo1.getLicenseData());
+                    instrumentVo.setCompanyCode(instrumentVo1.getCompanyCode());
+                }
+                else{
+                    dataAcquisitionInstrumentret.addAll(dataAcquisitionInstruments);
+                    dataAcquisitionInstruments.clear();
+                    instrumentVo.setIndustryCategory(x.get(2)!=null? String.valueOf(x.get(2)) :"");
+                    instrumentVo.setLicenseNumber(x.get(3)!=null? String.valueOf(x.get(3)) :"");
+                    instrumentVo.setLicenseData(x.get(4)!=null? String.valueOf(x.get(4)) :"");
+                    instrumentVo.setCompanyCode(x.get(1)!=null? String.valueOf(x.get(1)) :"");
+                }
+                // 分析仪
+                instrumentVo.setBrand(x.get(20)!=null? String.valueOf(x.get(20)) :"");
+                instrumentVo.setModel(x.get(21)!=null? String.valueOf(x.get(21)) :"");
+                instrumentVo.setName(x.get(20)!=null? String.valueOf(x.get(20)) :"");
+//                instrumentVo.setFactorInfor(x.get(22)!=null? String.valueOf(x.get(22)) :"");
+//                instrumentVo.setRange(x.get(23)!=null? String.valueOf(x.get(23)) :"");
+//                instrumentVo.setDataAcquisitionInstrumentId(x.get(24)!=null? String.valueOf(x.get(24)) :"");
+                instrumentVo.setReferenceOxygenContent(x.get(22)!=null? String.valueOf(x.get(22)) :"");
+                instrumentVo.setVelocityFieldCoefficient(x.get(23)!=null? String.valueOf(x.get(23)) :"");
+                instrumentVo.setPitotTubeCoefficient(x.get(24)!=null? String.valueOf(x.get(24)) :"");
+                instrumentVo.setKvalue(x.get(26)!=null? String.valueOf(x.get(26)) :"");
+                instrumentVo.setFlueArea(x.get(25)!=null? String.valueOf(x.get(25)) :"");
+                instrumentVo.setDilutionRatio(x.get(27)!=null? String.valueOf(x.get(27)) :"");
+
+
+
+                instrumentVo.setHoursAvg(x.get(31)!=null? String.valueOf(x.get(31)) :"");
+                instrumentVo.setHoursUnit(x.get(32)!=null? String.valueOf(x.get(32)) :null);
+                instrumentVo.setMonthlyEmissions(x.get(33)!=null? String.valueOf(x.get(33)) :"");
+                instrumentVo.setMonthlyEmissionsUnit(x.get(34)!=null? String.valueOf(x.get(34)) :null);
+                instrumentVo.setYearEmissions(x.get(35)!=null? String.valueOf(x.get(35)) :"");
+                instrumentVo.setYearEmissionsUnit(x.get(36)!=null? String.valueOf(x.get(36)) :null);
+                instrumentVo.setRangeStr(x.get(37)!=null? String.valueOf(x.get(37)) :"");
+                instrumentVo.setRangeUnit(x.get(38)!=null? String.valueOf(x.get(38)) :"");
+                // 检测因子信息
+                instrumentVo.setFactorName(x.get(30)!=null? String.valueOf(x.get(30)) :"");
+
+                PollutionGas[] values = PollutionGas.values();
+                for (PollutionGas value : values) {
+                    if (value.mean().equals(instrumentVo.getFactorName())){
+                        instrumentVo.setFactor(value.code());
+                    }
+                }
+
+                dataAcquisitionInstruments.add(instrumentVo);
+
+            });
+            System.out.println(dataAcquisitionInstrumentret);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+}

src/main/java/com/cn/esermis/netty/BootNettyChannelInboundHandlerAdapter.java

@@ -87,8 +87,8 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler
                     JSONObject jsonObject = HJ212MsgUtils.dealMsg2(message);
                     if ((jsonObject!=null && jsonObject.getString(Constant.CN).equals(Constant.MINUTE))
                             ||(jsonObject!=null && jsonObject.getString(Constant.CN).equals(Constant.HOUR))){
-                        adapter.publisherService.pubMsg(jsonObject);
-//                        adapter.redisQueueService.sendMessage(Constant.SERVER, jsonObject);
+//                        adapter.publisherService.pubMsg(jsonObject);
+                        adapter.redisQueueService.sendMessage(Constant.SERVER, jsonObject);
                     }
                 } else {
                     if (dataMap.get(ctx.channel().id().toString()) != null) {
@@ -97,8 +97,8 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler
                         JSONObject jsonObject = HJ212MsgUtils.dealMsg2(startStr);
                         if ((jsonObject!=null &&  jsonObject.getString(Constant.CN).equals(Constant.MINUTE))
                                 || (jsonObject!=null && jsonObject.getString(Constant.CN).equals(Constant.HOUR))){
-//                            adapter.redisQueueService.sendMessage(Constant.SERVER, jsonObject);
-                            adapter.publisherService.pubMsg(jsonObject);
+                            adapter.redisQueueService.sendMessage(Constant.SERVER, jsonObject);
+//                            adapter.publisherService.pubMsg(jsonObject);
                         }
                         dataMap.remove(ctx.channel().id().toString());
                     } else {
@@ -185,23 +185,23 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception, IOException {
         if (evt instanceof IdleStateEvent) {
-            IdleStateEvent event = (IdleStateEvent) evt;
-
-            String eventType = null;
-            switch (event.state()) {
-                case READER_IDLE:
-                    eventType = "读超时";
-                    break;
-                case WRITER_IDLE:
-                    eventType = "写超时";
-                    break;
-                case ALL_IDLE:
-                    eventType = "读写超时";
-                    break;
-                default:
-                    eventType = "设备超时";
-            }
-            log.warn(ctx.channel().id() + " : " + eventType + "---> 关闭该设备");
+//            IdleStateEvent event = (IdleStateEvent) evt;
+//
+//            String eventType = null;
+//            switch (event.state()) {
+//                case READER_IDLE:
+//                    eventType = "读超时";
+//                    break;
+//                case WRITER_IDLE:
+//                    eventType = "写超时";
+//                    break;
+//                case ALL_IDLE:
+//                    eventType = "读写超时";
+//                    break;
+//                default:
+//                    eventType = "设备超时";
+//            }
+//            log.warn(ctx.channel().id() + " : " + eventType + "---> 关闭该设备");
             dataMap.remove(ctx.channel().id().toString());
             ctx.channel().close();
         }

src/main/java/com/cn/esermis/server/Consumer.java

@@ -9,6 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 消费者类
  */
@@ -23,6 +27,12 @@ public class Consumer {
 
     @Async
     public void receive() throws InterruptedException {
+        System.out.println("开始消费消息");
+        // 开启线程池，如果有数据就启动线程消费
+        int numberOfThreads = 8;
+        int tolot = 0;
+        ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);
+
         while (true){
             //取出消息
             Object message = redisQueueService.receiveMessage(Constant.SERVER);
@@ -30,10 +40,18 @@ public class Consumer {
 //                System.out.println("消息队列为空");
                 Thread.sleep(1000*5);
             }else{
-                // 数据入库
-                System.out.println("消费消息------------："+message);
-                JSONObject jsonObject = (JSONObject) JSON.toJSON(message);
-                monitorBusiness.inboundOperations(jsonObject);
+                tolot++;
+                int finalTolot = tolot;
+                executorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        // 数据入库
+//                        System.out.println("消费消息------------："+message);
+                        System.out.println("消费消息------------：第（"+ finalTolot+"）条");
+                        JSONObject jsonObject = (JSONObject) JSON.toJSON(message);
+                        monitorBusiness.inboundOperations(jsonObject);
+                    }
+                });
             }
         }
     }

src/main/java/com/cn/esermis/server/Receiver.java

@@ -24,12 +24,12 @@ public class Receiver{
      */
     @Async
     public void systemMessage(Object message){
-        int counter = this.counter.incrementAndGet();
-        System.out.println("接收到第" + counter + "条消息！！频道为：server，消息内容为======：");
-
-        //TODO 开启多线程调用并处理消息
-        JSONObject result = sendAndStorageProcess.storageMsg(message);
-        System.out.println(result);
+//        int counter = this.counter.incrementAndGet();
+//        System.out.println("接收到第" + counter + "条消息！！频道为：server，消息内容为======：");
+//
+//        //TODO 开启多线程调用并处理消息
+//        JSONObject result = sendAndStorageProcess.storageMsg(message);
+//        System.out.println(result);
     }
 
 }

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

@@ -67,5 +67,8 @@
             where companyname like concat('%',#{companyName},'%')
         </if>
     </select>
+    <select id="getDepartmentDit" resultType="com.cn.esermis.dpld.model.Department">
+        select departmentid,companyid,departmentname from department
+    </select>
 </mapper>