From 0ddeae63c5ec1397b3cac2664e25b97ae2218568 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 二月 2024 13:59:11 +0800
Subject: [PATCH] 测试视频转换

---
 src/main/java/com/lxw/test3d/Service/ExcelReader.java               |  187 ++++++++
 src/main/java/com/lxw/test3d/Service/NjHomeConfigService.java       |   59 ++
 src/main/java/com/lxw/test3d/controller/NjHomeConfigController.java |   27 +
 src/main/resources/config/application-dev.yml                       |   75 ++
 src/main/resources/config/application-litedev.yml                   |   65 ++
 src/main/java/com/lxw/test3d/pojo/ac.java                           |  178 +++++++
 pom.xml                                                             |   43 +
 src/main/java/com/lxw/test3d/pojo/acdc.java                         |  319 +++++++++++++
 src/main/java/com/lxw/test3d/swagger/SwaggerConfig4Knife.java       |    2 
 src/main/java/com/lxw/test3d/pojo/fbs9100state.java                 |   62 ++
 src/main/java/com/lxw/test3d/Service/Workexecise.java               |   33 +
 src/main/java/com/lxw/test3d/mapper/NjHomeConfigMapper.java         |    6 
 src/main/java/com/lxw/test3d/pojo/rtstate.java                      |   25 +
 src/main/java/com/lxw/test3d/pojo/NjHomeConfig.java                 |   41 +
 src/main/java/com/lxw/test3d/pojo/dc.java                           |  231 ++++++++++
 15 files changed, 1,336 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04881da..26aebc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.12.RELEASE</version>
+        <version>2.3.12.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.lxw</groupId>
@@ -51,6 +51,17 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>6.0.6</version>
         </dependency>
         <!--mybatis 鍙妋ybatis-plus-->
         <dependency>
@@ -114,6 +125,36 @@
             <artifactId>dom4j</artifactId>
             <version>2.1.3</version>
         </dependency>
+        <!--&lt;!&ndash; https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans &ndash;&gt;
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>2.6.0</version>
+        </dependency>-->
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.2.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans -->
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>5.2.0</version>
+        </dependency>
 
         <dependency>
             <groupId>jaxen</groupId>
diff --git a/src/main/java/com/lxw/test3d/Service/ExcelReader.java b/src/main/java/com/lxw/test3d/Service/ExcelReader.java
new file mode 100644
index 0000000..efe35bf
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/Service/ExcelReader.java
@@ -0,0 +1,187 @@
+package com.lxw.test3d.Service;
+
+import com.lxw.test3d.pojo.NjHomeConfig;
+import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ExcelReader {
+    private String filePath;
+    private String sheetName;
+    private Workbook workBook;
+    private Sheet sheet;
+    private List<String> columnHeaderList;
+    private List<List<String>> listData;
+    private List<Map<String, String>> mapData;
+    private List<NjHomeConfig> listconfig;
+    private boolean flag;
+
+    public ExcelReader(String filePath, String sheetName) {
+        this.filePath = filePath;
+        this.sheetName = sheetName;
+        this.flag = false;
+        this.load();
+    }
+
+    private void load() {
+        FileInputStream inStream = null;
+        try {
+            inStream = new FileInputStream(new File(filePath));
+            workBook = WorkbookFactory.create(inStream);
+            sheet = workBook.getSheet(sheetName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (inStream != null) {
+                    inStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private String getCellValue(Cell cell) {
+        String cellValue = "";
+        DataFormatter formatter = new DataFormatter();
+        if (cell != null) {
+            /*switch (cell.getCellType()) {
+                case Cell.CELL_TYPE_NUMERIC:
+                    if (DateUtil.isCellDateFormatted(cell)) {
+                        cellValue = formatter.formatCellValue(cell);
+                    } else {
+                        double value = cell.getNumericCellValue();
+                        int intValue = (int) value;
+                        cellValue = value - intValue == 0 ? String.valueOf(intValue) : String.valueOf(value);
+                    }
+                    break;
+                case Cell.CELL_TYPE_STRING:
+                    cellValue = cell.getStringCellValue();
+                    break;
+                case Cell.CELL_TYPE_BOOLEAN:
+                    cellValue = String.valueOf(cell.getBooleanCellValue());
+                    break;
+                case Cell.CELL_TYPE_FORMULA:
+                    cellValue = String.valueOf(cell.getCellFormula());
+                    break;
+                case Cell.CELL_TYPE_BLANK:
+                    cellValue = "";
+                    break;
+                case Cell.CELL_TYPE_ERROR:
+                    cellValue = "";
+                    break;
+                default:
+                    cellValue = cell.toString().trim();
+                    break;
+            }*/
+            cellValue = cell.getStringCellValue();
+        }
+        return cellValue.trim();
+    }
+
+    private void getSheetData() {
+        listconfig=new ArrayList<>();
+        listData = new ArrayList<List<String>>();
+        mapData = new ArrayList<Map<String, String>>();
+        columnHeaderList = new ArrayList<String>();
+        int numOfRows = sheet.getLastRowNum() + 1;
+        for (int i = 0; i < numOfRows; i++) {
+            Row row = sheet.getRow(i);
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+            NjHomeConfig config=new NjHomeConfig();
+            if (row != null) {
+                for (int j = 0; j < row.getLastCellNum(); j++) {
+                    Cell cell = row.getCell(j);
+                    if (i == 0) {
+                        columnHeaderList.add(getCellValue(cell));
+                    } else {
+                        map.put(columnHeaderList.get(j), this.getCellValue(cell));
+                    }
+                    list.add(this.getCellValue(cell));
+                    config.setConfigName("灞炴��"+sheetName+(i+1));
+                    config.setConfigFlag(0);
+                    config.setConfigClass(0);
+                    config.setConfigValue(this.getCellValue(cell));
+                    config.setConfigType(getType(sheetName));
+                }
+            }
+            if (i > 0) {
+                mapData.add(map);
+            }
+            listconfig.add(config);
+            listData.add(list);
+        }
+        flag = true;
+    }
+
+    private Integer getType(String sheetName) {
+        int type=0;
+        switch (sheetName){
+            case "ac":type=1;break;
+            case "acdc":type=2;break;
+            case "dc":type=3;break;
+            case "fbs9100state":type=4;break;
+            case "rtstate":type=5;break;
+            default:type=0;break;
+        }
+        return type;
+    }
+
+    public String getCellData(int row, int col) {
+        if (row <= 0 || col <= 0) {
+            return null;
+        }
+        if (!flag) {
+            this.getSheetData();
+        }
+        if (listData.size() >= row && listData.get(row - 1).size() >= col) {
+            return listData.get(row - 1).get(col - 1);
+        } else {
+            return null;
+        }
+
+    }
+
+    public String getCellData(int row, String headerName) {
+        if (row <= 0) {
+            return null;
+        }
+        if (!flag) {
+            this.getSheetData();
+        }
+        if (mapData.size() >= row && mapData.get(row - 1).containsKey(headerName)) {
+            return mapData.get(row - 1).get(headerName);
+        } else {
+            return null;
+        }
+    }
+
+
+    public List getSheet() {
+        this.getSheetData();
+        //System.out.println("listData.size():"+listData.size());
+        /*for (int i=0;i<listconfig.size();i++){
+            System.out.println(listconfig.get(i).toString());
+        }*/
+        return listconfig;
+    }
+    public static void main(String[] args) {
+        ExcelReader eh = new ExcelReader("E:\\ffmpeg\\4.xls", "ac");
+        //System.out.println(eh.getCellData(1, 1));
+        // System.out.println(eh.getCellData(1, "test1"));
+        //System.out.println(eh.getCellData(2, 1));
+       // eh.getSheetData();
+        eh.getSheet();
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lxw/test3d/Service/NjHomeConfigService.java b/src/main/java/com/lxw/test3d/Service/NjHomeConfigService.java
new file mode 100644
index 0000000..ee8bfd4
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/Service/NjHomeConfigService.java
@@ -0,0 +1,59 @@
+package com.lxw.test3d.Service;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.lxw.test3d.mapper.NjHomeConfigMapper;
+import com.lxw.test3d.pojo.NjHomeConfig;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class NjHomeConfigService {
+    @Resource
+    private NjHomeConfigMapper mapper;
+
+
+    public void addToSql(String filepath){
+        //ExcelReader ec = new ExcelReader("E:\\ffmpeg\\4.xls", "ac");
+        //娓呯┖
+        UpdateWrapper wrapper=new UpdateWrapper();
+        wrapper.ge("num",0);
+        mapper.delete(wrapper);
+        List<String> listName=new ArrayList();
+        FileInputStream inStream = null;
+        try {
+            inStream = new FileInputStream(new File(filepath));
+            Workbook workBook = WorkbookFactory.create(inStream);
+            int numberOfSheets = workBook.getNumberOfSheets();
+
+            for (int i=0; i<numberOfSheets; i++) {
+                Sheet sheet = workBook.getSheetAt(i);
+                String sheetName=sheet.getSheetName();
+                listName.add(sheetName);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (inStream != null) {
+                    inStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        for (String sheetName:listName){
+            ExcelReader ec = new ExcelReader(filepath, sheetName);
+            List<NjHomeConfig> list=ec.getSheet();
+            mapper.insertBatchSomeColumn(list);
+        }
+    }
+}
diff --git a/src/main/java/com/lxw/test3d/Service/Workexecise.java b/src/main/java/com/lxw/test3d/Service/Workexecise.java
new file mode 100644
index 0000000..854ef02
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/Service/Workexecise.java
@@ -0,0 +1,33 @@
+package com.lxw.test3d.Service;
+
+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 org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class Workexecise {
+	public static void main(String[] args) throws IOException {
+
+		FileInputStream in = null;
+		Workbook workBook=null;
+		try {
+			in = new FileInputStream(new File("E:\\ffmpeg\\2.xls"));
+			workBook= new XSSFWorkbook(in) ;
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+		Sheet sheet0 = workBook.getSheetAt(0);// 鑾峰彇Sheet宸ヤ綔绨�
+		Row row = sheet0.getRow(0);// 鑾峰彇琛�
+		Cell cell = row.getCell(0);
+		String str = cell.getStringCellValue();// 濡傛灉鍗曞厓鏍间腑鐨勬暟鎹椂瀛楃涓�
+		double num = cell.getNumericCellValue();// 濡傛灉鍗曞厓鏍间腑鐨勬暟鎹椂鏁板瓧
+		System.out.println(str);
+
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/lxw/test3d/controller/NjHomeConfigController.java b/src/main/java/com/lxw/test3d/controller/NjHomeConfigController.java
new file mode 100644
index 0000000..a7de44a
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/controller/NjHomeConfigController.java
@@ -0,0 +1,27 @@
+package com.lxw.test3d.controller;
+
+import com.lxw.test3d.Service.BattGroupDataService;
+import com.lxw.test3d.Service.NjHomeConfigService;
+import com.lxw.test3d.dto.Response;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "鍗椾含娴嬫帶")
+@RestController
+@RequestMapping("njConfig")
+public class NjHomeConfigController {
+    @Autowired
+    private NjHomeConfigService service;
+
+    @ApiOperation("鎻掑叆")
+    @GetMapping("addToSql")
+    public void addToSql(@RequestParam String filePath){
+         service.addToSql(filePath);
+    }
+}
diff --git a/src/main/java/com/lxw/test3d/mapper/NjHomeConfigMapper.java b/src/main/java/com/lxw/test3d/mapper/NjHomeConfigMapper.java
new file mode 100644
index 0000000..6b7a7e9
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/mapper/NjHomeConfigMapper.java
@@ -0,0 +1,6 @@
+package com.lxw.test3d.mapper;
+
+import com.lxw.test3d.pojo.NjHomeConfig;
+
+public interface NjHomeConfigMapper extends CustomMapper<NjHomeConfig>{
+}
diff --git a/src/main/java/com/lxw/test3d/pojo/NjHomeConfig.java b/src/main/java/com/lxw/test3d/pojo/NjHomeConfig.java
new file mode 100644
index 0000000..1731bba
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/pojo/NjHomeConfig.java
@@ -0,0 +1,41 @@
+package com.lxw.test3d.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(schema = "db_nj_measurement",value = "tb_njhome_config")
+@ApiModel(value="NjHomeConfig瀵硅薄", description="棣栭〉淇℃伅閰嶇疆琛�")
+public class NjHomeConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "鑷涓婚敭")
+    @TableId(value = "num", type = IdType.AUTO)
+    private Long num;
+
+    @ApiModelProperty(value = "灞炴�у悕绉�")
+    private String configName;
+
+    @ApiModelProperty(value = "灞炴�у��")
+    private String configValue;
+
+    @ApiModelProperty(value = "灞炴�ф槸鍚︽樉绀�")
+    private Integer configFlag;
+
+    @ApiModelProperty(value = "灞炴�у垎绫�")
+    private Integer configType;
+
+    @ApiModelProperty(value = "閬ユ祴锛�0,閬ヤ俊锛�1")
+    private Integer configClass;
+}
diff --git a/src/main/java/com/lxw/test3d/pojo/ac.java b/src/main/java/com/lxw/test3d/pojo/ac.java
new file mode 100644
index 0000000..99b21a4
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/pojo/ac.java
@@ -0,0 +1,178 @@
+package com.lxw.test3d.pojo;
+import java.util.Date;
+public class ac {
+    private Long num;
+    private Long PowerDeviceId;
+    private Date recordDatetime;
+    private Date recordDatetime2;
+    private Float acin1Vola;
+    private Float acin1Volb;
+    private Float acin1Volc;
+    private Float acin1Curra;
+    private Float acin1Currb;
+    private Float acin1Currc;
+    private Float acin2Vola;
+    private Float acin2Volb;
+    private Float acin2Volc;
+    private Float acin2Curra;
+    private Float acin2Currb;
+    private Float acin2Currc;
+    private Float temprature;
+    private Float acVolHLimit;
+    private Float acVolLLimit;
+    private Integer isAcin1OverVola;
+    private Integer isAcin1UnderVola;
+    private Integer isAcin1LessA;
+    private Integer isAcin1OverVolb;
+    private Integer isAcin1UnderVolb;
+    private Integer isAcin1LessB;
+    private Integer isAcin1OverVolc;
+    private Integer isAcin1UnderVolc;
+    private Integer isAcin1LessC;
+    private Integer isAcin1ThunderErr;
+    private Integer isAcin2OverVola;
+    private Integer isAcin2UnderVola;
+    private Integer isAcin2LessA;
+    private Integer isAcin2OverVolb;
+    private Integer isAcin2UnderVolb;
+    private Integer isAcin2LessB;
+    private Integer isAcin2OverVolc;
+    private Integer isAcin2UnderVolc;
+    private Integer isAcin2LessC;
+    private Integer isAcin2ThunderErr;
+    private Integer isAcin1Powerdown;
+    private Integer isAcin1Monitorerr;
+    private Integer isAcin2Powerdown;
+    private Integer isAcin1Trip;
+    private Integer isAcin2Trip;
+    private Integer isFsw1Sw1trip;
+    private Integer isFsw1Sw2trip;
+    private Integer isFsw1Sw3trip;
+    private Integer isFsw1Sw4trip;
+    private Integer isFsw1Sw5trip;
+    private Integer isFsw1Sw6trip;
+    private Integer isFsw1Sw7trip;
+    private Integer isFsw1Sw8trip;
+    private Integer isFsw1Sw9trip;
+    private Integer isFsw1Sw10trip;
+    private Integer isFsw1Sw11trip;
+    private Integer isFsw1Sw12trip;
+    private Integer isFsw1Sw13trip;
+    private Integer isFsw1Sw14trip;
+    private Integer isFsw1Sw15trip;
+    private Integer isFsw1Sw16trip;
+    private Integer isFsw1Sw17trip;
+    private Integer isFsw1Sw18trip;
+    private Integer isFsw1Sw19trip;
+    private Integer isFsw1Sw20trip;
+    private Integer isFsw1Sw21trip;
+    private Integer isFsw1Sw22trip;
+    private Integer isFsw1Sw23trip;
+    private Integer isFsw1Sw24trip;
+    private Integer isFsw1Sw25trip;
+    private Integer isFsw1Sw26trip;
+    private Integer isFsw1Sw27trip;
+    private Integer isFsw1Sw28trip;
+    private Integer isFsw1Sw29trip;
+    private Integer isFsw1Sw30trip;
+    private Integer isFsw1Sw31trip;
+    private Integer isFsw1Sw32trip;
+    private Integer isFsw1Sw33trip;
+    private Integer isFsw1Sw34trip;
+    private Integer isFsw1Sw35trip;
+    private Integer isFsw1Sw36trip;
+    private Integer isFsw1Sw37trip;
+    private Integer isFsw1Sw38trip;
+    private Integer isFsw1Sw39trip;
+    private Integer isFsw1Sw40trip;
+    private Integer isFsw1Sw41trip;
+    private Integer isFsw1Sw42trip;
+    private Integer isFsw1Sw43trip;
+    private Integer isFsw1Sw44trip;
+    private Integer isFsw1Sw45trip;
+    private Integer isFsw1Sw46trip;
+    private Integer isFsw1Sw47trip;
+    private Integer isFsw1Sw48trip;
+    private Integer isFsw1Sw49trip;
+    private Integer isFsw1Sw50trip;
+    private Integer isFsw1Sw51trip;
+    private Integer isFsw1Sw52trip;
+    private Integer isFsw1Sw53trip;
+    private Integer isFsw1Sw54trip;
+    private Integer isFsw1Sw55trip;
+    private Integer isFsw1Sw56trip;
+    private Integer isFsw1Sw57trip;
+    private Integer isFsw1Sw58trip;
+    private Integer isFsw1Sw59trip;
+    private Integer isFsw1Sw60trip;
+    private Integer isFsw1Sw61trip;
+    private Integer isFsw1Sw62trip;
+    private Integer isFsw1Sw63trip;
+    private Integer isFsw1Sw64trip;
+    private Integer isFsw2Sw1trip;
+    private Integer isFsw2Sw2trip;
+    private Integer isFsw2Sw3trip;
+    private Integer isFsw2Sw4trip;
+    private Integer isFsw2Sw5trip;
+    private Integer isFsw2Sw6trip;
+    private Integer isFsw2Sw7trip;
+    private Integer isFsw2Sw8trip;
+    private Integer isFsw2Sw9trip;
+    private Integer isFsw2Sw10trip;
+    private Integer isFsw2Sw11trip;
+    private Integer isFsw2Sw12trip;
+    private Integer isFsw2Sw13trip;
+    private Integer isFsw2Sw14trip;
+    private Integer isFsw2Sw15trip;
+    private Integer isFsw2Sw16trip;
+    private Integer isFsw2Sw17trip;
+    private Integer isFsw2Sw18trip;
+    private Integer isFsw2Sw19trip;
+    private Integer isFsw2Sw20trip;
+    private Integer isFsw2Sw21trip;
+    private Integer isFsw2Sw22trip;
+    private Integer isFsw2Sw23trip;
+    private Integer isFsw2Sw24trip;
+    private Integer isFsw2Sw25trip;
+    private Integer isFsw2Sw26trip;
+    private Integer isFsw2Sw27trip;
+    private Integer isFsw2Sw28trip;
+    private Integer isFsw2Sw29trip;
+    private Integer isFsw2Sw30trip;
+    private Integer isFsw2Sw31trip;
+    private Integer isFsw2Sw32trip;
+    private Integer isFsw2Sw33trip;
+    private Integer isFsw2Sw34trip;
+    private Integer isFsw2Sw35trip;
+    private Integer isFsw2Sw36trip;
+    private Integer isFsw2Sw37trip;
+    private Integer isFsw2Sw38trip;
+    private Integer isFsw2Sw39trip;
+    private Integer isFsw2Sw40trip;
+    private Integer isFsw2Sw41trip;
+    private Integer isFsw2Sw42trip;
+    private Integer isFsw2Sw43trip;
+    private Integer isFsw2Sw44trip;
+    private Integer isFsw2Sw45trip;
+    private Integer isFsw2Sw46trip;
+    private Integer isFsw2Sw47trip;
+    private Integer isFsw2Sw48trip;
+    private Integer isFsw2Sw49trip;
+    private Integer isFsw2Sw50trip;
+    private Integer isFsw2Sw51trip;
+    private Integer isFsw2Sw52trip;
+    private Integer isFsw2Sw53trip;
+    private Integer isFsw2Sw54trip;
+    private Integer isFsw2Sw55trip;
+    private Integer isFsw2Sw56trip;
+    private Integer isFsw2Sw57trip;
+    private Integer isFsw2Sw58trip;
+    private Integer isFsw2Sw59trip;
+    private Integer isFsw2Sw60trip;
+    private Integer isFsw2Sw61trip;
+    private Integer isFsw2Sw62trip;
+    private Integer isFsw2Sw63trip;
+    private Integer isFsw2Sw64trip;
+    private Integer isTotalAlarm;
+    private Integer isAcTempAlarm;
+}
diff --git a/src/main/java/com/lxw/test3d/pojo/acdc.java b/src/main/java/com/lxw/test3d/pojo/acdc.java
new file mode 100644
index 0000000..7c8bd88
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/pojo/acdc.java
@@ -0,0 +1,319 @@
+package com.lxw.test3d.pojo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+public class acdc {
+    private Long num;
+    private Long PowerDeviceId;
+    private Date recordDatetime;
+    private Date recordDatetime2;
+    private Float acin1Vola;
+    private Float acin1Volb;
+    private Float acin1Volc;
+    private Float acin2Vola;
+    private Float acin2Volb;
+    private Float acin2Volc;
+    private Float acoutVola;
+    private Float acoutVolb;
+    private Float acoutVolc;
+    private Float acoutCurra;
+    private Float acoutCurrb;
+    private Float acoutCurrc;
+    private Float dcoutVol;
+    private Float dcoutCurr;
+    private Float battgroup1Vol;
+    private Float battgroup1Curr;
+    private Float battgroup2Vol;
+    private Float battgroup2Curr;
+    private Float temprature;
+    private Float mOutputvol;
+    private Float m1Outcurr;
+    private Float m2Outcurr;
+    private Float m3Outcurr;
+    private Float m4Outcurr;
+    private Float m5Outcurr;
+    private Float m6Outcurr;
+    private Float m7Outcurr;
+    private Float m8Outcurr;
+    private Float m9Outcurr;
+    private Float m10Outcurr;
+    private Float m11Outcurr;
+    private Float m12Outcurr;
+    private Float m13Outcurr;
+    private Float m14Outcurr;
+    private Float m15Outcurr;
+    private Float m16Outcurr;
+    private Integer isAcin1OverVola;
+    private Integer isAcin1UnderVola;
+    private Integer isAcin1LessA;
+    private Integer isAcin1OverVolb;
+    private Integer isAcin1UnderVolb;
+    private Integer isAcin1LessB;
+    private Integer isAcin1OverVolc;
+    private Integer isAcin1UnderVolc;
+    private Integer isAcin1LessC;
+    private Integer isAcin1ThunderErr;
+    private Integer isAcin1Powerdown;
+    private Integer isAcin2OverVola;
+    private Integer isAcin2UnderVola;
+    private Integer isAcin2LessA;
+    private Integer isAcin2OverVolb;
+    private Integer isAcin2UnderVolb;
+    private Integer isAcin2LessB;
+    private Integer isAcin2OverVolc;
+    private Integer isAcin2UnderVolc;
+    private Integer isAcin2LessC;
+    private Integer isAcin2ThunderErr;
+    private Integer isAcin2Powerdown;
+    private Integer isAcinMonitorerr;
+    private Integer isDcoutOverVol;
+    private Integer isDcoutUnderVol;
+    private Integer isBattgroupDown;
+    private Integer isJunCharge;
+    private Integer isAcdcmod1Err;
+    private Integer isAcdcmod1Off;
+    private Integer isAcdcmod2Err;
+    private Integer isAcdcmod2Off;
+    private Integer isAcdcmod3Err;
+    private Integer isAcdcmod3Off;
+    private Integer isAcdcmod4Err;
+    private Integer isAcdcmod4Off;
+    private Integer isAcdcmod5Err;
+    private Integer isAcdcmod5Off;
+    private Integer isAcdcmod6Err;
+    private Integer isAcdcmod6Off;
+    private Integer isAcdcmod7Err;
+    private Integer isAcdcmod7Off;
+    private Integer isAcdcmod8Err;
+    private Integer isAcdcmod8Off;
+    private Integer isAcdcmod9Err;
+    private Integer isAcdcmod9Off;
+    private Integer isAcdcmod10Err;
+    private Integer isAcdcmod10Off;
+    private Integer isAcdcmod11Err;
+    private Integer isAcdcmod11Off;
+    private Integer isAcdcmod12Err;
+    private Integer isAcdcmod12Off;
+    private Integer isAcdcmod13Err;
+    private Integer isAcdcmod13Off;
+    private Integer isAcdcmod14Err;
+    private Integer isAcdcmod14Off;
+    private Integer isAcdcmod15Err;
+    private Integer isAcdcmod15Off;
+    private Integer isAcdcmod16Err;
+    private Integer isAcdcmod16Off;
+    private Integer isAcin1Trip;
+    private Integer isAcin2Trip;
+    private Integer isLoaderFuse;
+    private Integer isBattgroup1Fuse;
+    private Integer isBattgroup2Fuse;
+    private Integer isTotalAlarm;
+    private Float acin1Curra;
+    private Float acin1Currb;
+    private Float acin1Currc;
+    private Float loaderCurr;
+    private Float battgroup1Ah;
+    private Float battgroup1Temp;
+    private Float battgroup2Ah;
+    private Float battgroup2Temp;
+    private Float acdcmTemp;
+    private Float m1OutVol;
+    private Float m2OutVol;
+    private Float m3OutVol;
+    private Float m4OutVol;
+    private Float m5OutVol;
+    private Float m6OutVol;
+    private Float m7OutVol;
+    private Float m8OutVol;
+    private Float m9OutVol;
+    private Float m10OutVol;
+    private Float m11OutVol;
+    private Float m12OutVol;
+    private Float m13OutVol;
+    private Float m14OutVol;
+    private Float m15OutVol;
+    private Float m16OutVol;
+    private Integer isAcb1OverCurra;
+    private Integer isAcb1OverCurrb;
+    private Integer isAcb1OverCurrc;
+    private Integer isAcin1Poweron;
+    private Integer isAcin2Poweron;
+    private Integer isDcoutOverCurr;
+    private Integer isBattgroup1State;
+    private Integer isBattgroup2State;
+    private Integer isBattgroup2Down;
+    private Integer isBattgroup1Overchgcurr;
+    private Integer isBattgroup2Overchgcurr;
+    private Integer isAcdcmod1Overvol;
+    private Integer isAcdcmod1Undervol;
+    private Integer isAcdcmod1Overcurr;
+    private Integer isAcdcmod1Acerr;
+    private Integer isAcdcmod1Limitcurr;
+    private Integer isAcdcmod2Overvol;
+    private Integer isAcdcmod2Undervol;
+    private Integer isAcdcmod2Overcurr;
+    private Integer isAcdcmod2Acerr;
+    private Integer isAcdcmod2Limitcurr;
+    private Integer isAcdcmod3Overvol;
+    private Integer isAcdcmod3Undervol;
+    private Integer isAcdcmod3Overcurr;
+    private Integer isAcdcmod3Acerr;
+    private Integer isAcdcmod3Limitcurr;
+    private Integer isAcdcmod4Overvol;
+    private Integer isAcdcmod4Undervol;
+    private Integer isAcdcmod4Overcurr;
+    private Integer isAcdcmod4Acerr;
+    private Integer isAcdcmod4Limitcurr;
+    private Integer isAcdcmod5Overvol;
+    private Integer isAcdcmod5Undervol;
+    private Integer isAcdcmod5Overcurr;
+    private Integer isAcdcmod5Acerr;
+    private Integer isAcdcmod5Limitcurr;
+    private Integer isAcdcmod6Overvol;
+    private Integer isAcdcmod6Undervol;
+    private Integer isAcdcmod6Overcurr;
+    private Integer isAcdcmod6Acerr;
+    private Integer isAcdcmod6Limitcurr;
+    private Integer isAcdcmod7Overvol;
+    private Integer isAcdcmod7Undervol;
+    private Integer isAcdcmod7Overcurr;
+    private Integer isAcdcmod7Acerr;
+    private Integer isAcdcmod7Limitcurr;
+    private Integer isAcdcmod8Overvol;
+    private Integer isAcdcmod8Undervol;
+    private Integer isAcdcmod8Overcurr;
+    private Integer isAcdcmod8Acerr;
+    private Integer isAcdcmod8Limitcurr;
+    private Integer isAcdcmod9Overvol;
+    private Integer isAcdcmod9Undervol;
+    private Integer isAcdcmod9Overcurr;
+    private Integer isAcdcmod9Acerr;
+    private Integer isAcdcmod9Limitcurr;
+    private Integer isAcdcmod10Overvol;
+    private Integer isAcdcmod10Undervol;
+    private Integer isAcdcmod10Overcurr;
+    private Integer isAcdcmod10Acerr;
+    private Integer isAcdcmod10Limitcurr;
+    private Integer isAcdcmod11Overvol;
+    private Integer isAcdcmod11Undervol;
+    private Integer isAcdcmod11Overcurr;
+    private Integer isAcdcmod11Acerr;
+    private Integer isAcdcmod11Limitcurr;
+    private Integer isAcdcmod12Overvol;
+    private Integer isAcdcmod12Undervol;
+    private Integer isAcdcmod12Overcurr;
+    private Integer isAcdcmod12Acerr;
+    private Integer isAcdcmod12Limitcurr;
+    private Integer isAcdcmod13Overvol;
+    private Integer isAcdcmod13Undervol;
+    private Integer isAcdcmod13Overcurr;
+    private Integer isAcdcmod13Acerr;
+    private Integer isAcdcmod13Limitcurr;
+    private Integer isAcdcmod14Overvol;
+    private Integer isAcdcmod14Undervol;
+    private Integer isAcdcmod14Overcurr;
+    private Integer isAcdcmod14Acerr;
+    private Integer isAcdcmod14Limitcurr;
+    private Integer isAcdcmod15Overvol;
+    private Integer isAcdcmod15Undervol;
+    private Integer isAcdcmod15Overcurr;
+    private Integer isAcdcmod15Acerr;
+    private Integer isAcdcmod15Limitcurr;
+    private Integer isAcdcmod16Overvol;
+    private Integer isAcdcmod16Undervol;
+    private Integer isAcdcmod16Overcurr;
+    private Integer isAcdcmod16Acerr;
+    private Integer isAcdcmod16Limitcurr;
+    private Integer isAcin1Fuse;
+    private Integer isAcin2Fuse;
+    private Integer isAcin1Unbanlance;
+    private Integer isAcin2Unbanlance;
+    private Integer isAcin1Freqerr;
+    private Integer isAcin2Freqerr;
+    private Integer isBattgroup1Vollow;
+    private Integer isBattgroup2Vollow;
+    private Integer isDcoutTotalAlarm;
+    private Integer isAcinTotalAlarm;
+    private Integer isAcdcmod1Junchg;
+    private Integer isAcdcmod2Junchg;
+    private Integer isAcdcmod3Junchg;
+    private Integer isAcdcmod4Junchg;
+    private Integer isAcdcmod5Junchg;
+    private Integer isAcdcmod6Junchg;
+    private Integer isAcdcmod7Junchg;
+    private Integer isAcdcmod8Junchg;
+    private Integer isAcdcmod9Junchg;
+    private Integer isAcdcmod10Junchg;
+    private Integer isAcdcmod11Junchg;
+    private Integer isAcdcmod12Junchg;
+    private Integer isAcdcmod13Junchg;
+    private Integer isAcdcmod14Junchg;
+    private Integer isAcdcmod15Junchg;
+    private Integer isAcdcmod16Junchg;
+    private Integer isPowerdevCommerr;
+    private Float useracin1Vola;
+    private Float useracin1Volb;
+    private Float useracin1Volc;
+    private Float useracin1Curra;
+    private Float useracin1Currb;
+    private Float useracin1Currc;
+    private Float useracin1Freq;
+    private Float useracin2Vola;
+    private Float useracin2Volb;
+    private Float useracin2Volc;
+    private Float useracin2Curra;
+    private Float useracin2Currb;
+    private Float useracin2Currc;
+    private Float acin2Curra;
+    private Float acin2Currb;
+    private Float acin2Currc;
+    private Float useracin2Freq;
+    private Float mTemper1;
+    private Float mTemper2;
+    private Float mTemper3;
+    private Float mHumidity1;
+    private Float mHumidity2;
+    private Float mHumidity3;
+    private Integer useracin1Powerdown;
+    private Integer useracin1Commerr;
+    private Integer useracin2Powerdown;
+    private Integer useracin2Commerr;
+    private Integer isTempCommerr1;
+    private Integer isTempCommerr2;
+    private Integer isTempCommerr3;
+    private Integer isHumiCommerr1;
+    private Integer isHumiCommerr2;
+    private Integer isHumiCommerr3;
+    private Integer isSmokeAlarm1;
+    private Integer isSmokeCommerr1;
+    private Integer isSmokeAlarm2;
+    private Integer isSmokeCommerr2;
+    private Integer isSmokeAlarm3;
+    private Integer isSmokeCommerr3;
+    private Integer acIn1SwitchSt;
+    private Integer acIn2SwitchSt;
+    private float chargLimitCurr;
+    private float junChargeVol;
+    private float floatChargeVol;
+    private float acVolHLimit;
+    private float acVolLLimit;
+    private float dcOutVolHLimit;
+    private float dcOutVolLLimit;
+    private int acInUseCount;
+    private String stationName;
+    private Float m17Outcurr;
+    private Integer isAcdcmod17Err;
+    private Integer isAcdcmod17Off;
+    private Float m18Outcurr;
+    private Integer isAcdcmod18Err;
+    private Integer isAcdcmod18Off;
+    private Float m19Outcurr;
+    private Integer isAcdcmod19Err;
+    private Integer isAcdcmod19Off;
+    private Float m20Outcurr;
+    private Integer isAcdcmod20Err;
+    private Integer isAcdcmod20Off;
+}
diff --git a/src/main/java/com/lxw/test3d/pojo/dc.java b/src/main/java/com/lxw/test3d/pojo/dc.java
new file mode 100644
index 0000000..8eb6496
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/pojo/dc.java
@@ -0,0 +1,231 @@
+package com.lxw.test3d.pojo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+public class dc {
+    private Long num;
+    private Long PowerDeviceId;
+    private Date recordDatetime;
+    private Date recordDatetime2;
+    private Float dcin1Vol;
+    private Float dcin2Vol;
+    private Float dcout1Vol;
+    private Float dcout1Curr;
+    private Float dcout2Vol;
+    private Float dcout2Curr;
+    private Float temprature;
+    private Float dcVolHLimit;
+    private Float dcVolLLimit;
+    private Integer isDc1OverVol;
+    private Integer isDc1UnderVol;
+    private Integer isDc2OverVol;
+    private Integer isDc2UnderVol;
+    private Integer isDcMonitorerr;
+    private Integer isTempAlarm;
+    private Integer isIn1SwTrip;
+    private Integer isIn2SwTrip;
+    private Integer isFsw1Sw1trip;
+    private Integer isFsw1Sw2trip;
+    private Integer isFsw1Sw3trip;
+    private Integer isFsw1Sw4trip;
+    private Integer isFsw1Sw5trip;
+    private Integer isFsw1Sw6trip;
+    private Integer isFsw1Sw7trip;
+    private Integer isFsw1Sw8trip;
+    private Integer isFsw1Sw9trip;
+    private Integer isFsw1Sw10trip;
+    private Integer isFsw1Sw11trip;
+    private Integer isFsw1Sw12trip;
+    private Integer isFsw1Sw13trip;
+    private Integer isFsw1Sw14trip;
+    private Integer isFsw1Sw15trip;
+    private Integer isFsw1Sw16trip;
+    private Integer isFsw1Sw17trip;
+    private Integer isFsw1Sw18trip;
+    private Integer isFsw1Sw19trip;
+    private Integer isFsw1Sw20trip;
+    private Integer isFsw1Sw21trip;
+    private Integer isFsw1Sw22trip;
+    private Integer isFsw1Sw23trip;
+    private Integer isFsw1Sw24trip;
+    private Integer isFsw1Sw25trip;
+    private Integer isFsw1Sw26trip;
+    private Integer isFsw1Sw27trip;
+    private Integer isFsw1Sw28trip;
+    private Integer isFsw1Sw29trip;
+    private Integer isFsw1Sw30trip;
+    private Integer isFsw1Sw31trip;
+    private Integer isFsw1Sw32trip;
+    private Integer isFsw1Sw33trip;
+    private Integer isFsw1Sw34trip;
+    private Integer isFsw1Sw35trip;
+    private Integer isFsw1Sw36trip;
+    private Integer isFsw1Sw37trip;
+    private Integer isFsw1Sw38trip;
+    private Integer isFsw1Sw39trip;
+    private Integer isFsw1Sw40trip;
+    private Integer isFsw1Sw41trip;
+    private Integer isFsw1Sw42trip;
+    private Integer isFsw1Sw43trip;
+    private Integer isFsw1Sw44trip;
+    private Integer isFsw1Sw45trip;
+    private Integer isFsw1Sw46trip;
+    private Integer isFsw1Sw47trip;
+    private Integer isFsw1Sw48trip;
+    private Integer isFsw1Sw49trip;
+    private Integer isFsw1Sw50trip;
+    private Integer isFsw1Sw51trip;
+    private Integer isFsw1Sw52trip;
+    private Integer isFsw1Sw53trip;
+    private Integer isFsw1Sw54trip;
+    private Integer isFsw1Sw55trip;
+    private Integer isFsw1Sw56trip;
+    private Integer isFsw1Sw57trip;
+    private Integer isFsw1Sw58trip;
+    private Integer isFsw1Sw59trip;
+    private Integer isFsw1Sw60trip;
+    private Integer isFsw1Sw61trip;
+    private Integer isFsw1Sw62trip;
+    private Integer isFsw1Sw63trip;
+    private Integer isFsw1Sw64trip;
+    private Integer isFsw1Sw65trip;
+    private Integer isFsw1Sw66trip;
+    private Integer isFsw1Sw67trip;
+    private Integer isFsw1Sw68trip;
+    private Integer isFsw1Sw69trip;
+    private Integer isFsw1Sw70trip;
+    private Integer isFsw1Sw71trip;
+    private Integer isFsw1Sw72trip;
+    private Integer isFsw1Sw73trip;
+    private Integer isFsw1Sw74trip;
+    private Integer isFsw1Sw75trip;
+    private Integer isFsw1Sw76trip;
+    private Integer isFsw1Sw77trip;
+    private Integer isFsw1Sw78trip;
+    private Integer isFsw1Sw79trip;
+    private Integer isFsw1Sw80trip;
+    private Integer isFsw1Sw81trip;
+    private Integer isFsw1Sw82trip;
+    private Integer isFsw1Sw83trip;
+    private Integer isFsw1Sw84trip;
+    private Integer isFsw1Sw85trip;
+    private Integer isFsw1Sw86trip;
+    private Integer isFsw1Sw87trip;
+    private Integer isFsw1Sw88trip;
+    private Integer isFsw1Sw89trip;
+    private Integer isFsw1Sw90trip;
+    private Integer isFsw1Sw91trip;
+    private Integer isFsw1Sw92trip;
+    private Integer isFsw1Sw93trip;
+    private Integer isFsw1Sw94trip;
+    private Integer isFsw1Sw95trip;
+    private Integer isFsw1Sw96trip;
+    private Integer isFsw1Sw97trip;
+    private Integer isFsw1Sw98trip;
+    private Integer isFsw1Sw99trip;
+    private Integer isFsw1Sw100trip;
+    private Integer isFsw2Sw1trip;
+    private Integer isFsw2Sw2trip;
+    private Integer isFsw2Sw3trip;
+    private Integer isFsw2Sw4trip;
+    private Integer isFsw2Sw5trip;
+    private Integer isFsw2Sw6trip;
+    private Integer isFsw2Sw7trip;
+    private Integer isFsw2Sw8trip;
+    private Integer isFsw2Sw9trip;
+    private Integer isFsw2Sw10trip;
+    private Integer isFsw2Sw11trip;
+    private Integer isFsw2Sw12trip;
+    private Integer isFsw2Sw13trip;
+    private Integer isFsw2Sw14trip;
+    private Integer isFsw2Sw15trip;
+    private Integer isFsw2Sw16trip;
+    private Integer isFsw2Sw17trip;
+    private Integer isFsw2Sw18trip;
+    private Integer isFsw2Sw19trip;
+    private Integer isFsw2Sw20trip;
+    private Integer isFsw2Sw21trip;
+    private Integer isFsw2Sw22trip;
+    private Integer isFsw2Sw23trip;
+    private Integer isFsw2Sw24trip;
+    private Integer isFsw2Sw25trip;
+    private Integer isFsw2Sw26trip;
+    private Integer isFsw2Sw27trip;
+    private Integer isFsw2Sw28trip;
+    private Integer isFsw2Sw29trip;
+    private Integer isFsw2Sw30trip;
+    private Integer isFsw2Sw31trip;
+    private Integer isFsw2Sw32trip;
+    private Integer isFsw2Sw33trip;
+    private Integer isFsw2Sw34trip;
+    private Integer isFsw2Sw35trip;
+    private Integer isFsw2Sw36trip;
+    private Integer isFsw2Sw37trip;
+    private Integer isFsw2Sw38trip;
+    private Integer isFsw2Sw39trip;
+    private Integer isFsw2Sw40trip;
+    private Integer isFsw2Sw41trip;
+    private Integer isFsw2Sw42trip;
+    private Integer isFsw2Sw43trip;
+    private Integer isFsw2Sw44trip;
+    private Integer isFsw2Sw45trip;
+    private Integer isFsw2Sw46trip;
+    private Integer isFsw2Sw47trip;
+    private Integer isFsw2Sw48trip;
+    private Integer isFsw2Sw49trip;
+    private Integer isFsw2Sw50trip;
+    private Integer isFsw2Sw51trip;
+    private Integer isFsw2Sw52trip;
+    private Integer isFsw2Sw53trip;
+    private Integer isFsw2Sw54trip;
+    private Integer isFsw2Sw55trip;
+    private Integer isFsw2Sw56trip;
+    private Integer isFsw2Sw57trip;
+    private Integer isFsw2Sw58trip;
+    private Integer isFsw2Sw59trip;
+    private Integer isFsw2Sw60trip;
+    private Integer isFsw2Sw61trip;
+    private Integer isFsw2Sw62trip;
+    private Integer isFsw2Sw63trip;
+    private Integer isFsw2Sw64trip;
+    private Integer isFsw2Sw65trip;
+    private Integer isFsw2Sw66trip;
+    private Integer isFsw2Sw67trip;
+    private Integer isFsw2Sw68trip;
+    private Integer isFsw2Sw69trip;
+    private Integer isFsw2Sw70trip;
+    private Integer isFsw2Sw71trip;
+    private Integer isFsw2Sw72trip;
+    private Integer isFsw2Sw73trip;
+    private Integer isFsw2Sw74trip;
+    private Integer isFsw2Sw75trip;
+    private Integer isFsw2Sw76trip;
+    private Integer isFsw2Sw77trip;
+    private Integer isFsw2Sw78trip;
+    private Integer isFsw2Sw79trip;
+    private Integer isFsw2Sw80trip;
+    private Integer isFsw2Sw81trip;
+    private Integer isFsw2Sw82trip;
+    private Integer isFsw2Sw83trip;
+    private Integer isFsw2Sw84trip;
+    private Integer isFsw2Sw85trip;
+    private Integer isFsw2Sw86trip;
+    private Integer isFsw2Sw87trip;
+    private Integer isFsw2Sw88trip;
+    private Integer isFsw2Sw89trip;
+    private Integer isFsw2Sw90trip;
+    private Integer isFsw2Sw91trip;
+    private Integer isFsw2Sw92trip;
+    private Integer isFsw2Sw93trip;
+    private Integer isFsw2Sw94trip;
+    private Integer isFsw2Sw95trip;
+    private Integer isFsw2Sw96trip;
+    private Integer isFsw2Sw97trip;
+    private Integer isFsw2Sw98trip;
+    private Integer isFsw2Sw99trip;
+    private Integer isFsw2Sw100trip;
+    private Integer isTotalAlarm;
+}
diff --git a/src/main/java/com/lxw/test3d/pojo/fbs9100state.java b/src/main/java/com/lxw/test3d/pojo/fbs9100state.java
new file mode 100644
index 0000000..06f36d1
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/pojo/fbs9100state.java
@@ -0,0 +1,62 @@
+package com.lxw.test3d.pojo;
+public class fbs9100state {
+/*devIp;
+devVersion;
+devId;
+opCmd;
+recordDatetime;
+devDatetime;
+devTesttype;
+devTestgroupnum;
+devWorkstate;
+devAlarmstate;
+devTemp;
+devResTestState;
+devOnlinevollow;
+devEachgroupBattsum;
+devCaptestOnlinevol;
+devCaptestGroupvol;
+devCaptestCurr;
+devCaptestCap;
+devCaptestTimelong;
+devRestestCount;
+devRestestMoncount;
+devRestestMonindex;
+devBattXuhangTlong;
+devStationPoffTlong;
+devStationPoffCnt;
+devCommcount;
+devErrcommcount;
+devRxnullerrcount;
+devDataFlowsum;
+devLastCaptestStopType;
+devConcurr;
+devCondvoldp;
+devConresist;
+devConresist1;
+devCondcurr;
+dev61850alarms;
+battOnlineState;
+devCondvoldp1;
+a059GroupVol1;
+a059GroupVol2;
+a059GroupCurr1;
+a059GroupCurr2;
+devPosStates;
+devNegStates;
+a059OnlineSaveVol;
+a059AcvolLowFlag;
+a059SwitchVolMin;
+a059SwitchVolMax;
+elecCombActtiveEnergy;
+elecPosiActtiveEnergy;
+elecReverActtiveEnergy;
+elecActivePower;
+elecVol;
+elecCurr;
+loadVolFromhjq;
+loadCurrFromhjq;
+devPower;
+fbo4830IsOnline;
+fbo4830Stopstr;*/
+}
diff --git a/src/main/java/com/lxw/test3d/pojo/rtstate.java b/src/main/java/com/lxw/test3d/pojo/rtstate.java
new file mode 100644
index 0000000..42cbf37
--- /dev/null
+++ b/src/main/java/com/lxw/test3d/pojo/rtstate.java
@@ -0,0 +1,25 @@
+package com.lxw.test3d.pojo;
+public class rtstate {
+/*battGroupId;
+battCount;
+recDatetime;
+onlineVol;
+groupVol;
+groupTmp;
+groupCurr;
+battState;
+battTestType;
+battTestStarttime;
+battTestRecordtime;
+battTestTlong;
+battTestCap;
+battRealCap;
+battRestCap;
+battRestPower1Time;
+battRestPower2Time;
+testLoadertype;
+testRecordnum;
+a059Num;
+devTestPower;
+battAlmState;*/
+}
diff --git a/src/main/java/com/lxw/test3d/swagger/SwaggerConfig4Knife.java b/src/main/java/com/lxw/test3d/swagger/SwaggerConfig4Knife.java
index 6999026..0ae9523 100644
--- a/src/main/java/com/lxw/test3d/swagger/SwaggerConfig4Knife.java
+++ b/src/main/java/com/lxw/test3d/swagger/SwaggerConfig4Knife.java
@@ -25,7 +25,7 @@
                 .groupName("3D娴嬭瘯杞欢v1.0")
                 .select()
                 .apis(RequestHandlerSelectors.any())
-                .apis(RequestHandlerSelectors.basePackage("com.lxw.test3d.Controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.lxw.test3d.controller"))
                 .build();
     }
 
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index c03def7..115424b 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -4,27 +4,41 @@
 #鏈嶅姟绔彛鍙�
 server:
   port: 8094
+  serverHeader:
   servlet:
     context-path: /test3d
     session:
+      timeout: -1
       cookie:
-        name: test3dcookie
+        name: fg_v2
+        http-only: true
   tomcat:
     max-http-form-post-size: 102400000
-  max-http-header-size: 10000000
-
+http:
+  port: -1
 #鏁版嵁搴�
 spring:
   datasource:
-    driver-class-name: org.sqlite.JDBC
-    #    url: jdbc:sqlite:C:\Users\29550\Downloads\sqlite-tools-win32-x86-3390400\res.db
-    url: jdbc:sqlite:test3d.db?date_string_format=yyyy-MM-dd HH:mm:ss
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.10.79:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+#    url: jdbc:mysql://192.168.10.80:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+#    url: jdbc:mysql://118.89.139.230:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+    username: root
+    password: lmx8688139
+    maxIdel: 60
+    initialPoolSize: 2
+    minPoolSize: 5
+    maxPoolSize: 500
   servlet:
     multipart:
       max-file-size: 200MB
       max-request-size: 200MB
+  messages:
+    basename: i18n/message
+
 mybatis-plus:
-  typeAliasesPackage: com.lxw.test3d.pojo,com.lxw.test3d.dto
+  typeAliasesPackage: com.whyc.pojo,com.whyc.dto
   mapper-locations: classpath:mapper/**/*Mapper.xml
   global-config:
     db-config:
@@ -37,29 +51,60 @@
       #mp2.3+ 鍏ㄥ眬琛ㄥ墠缂� tb_
       table-prefix: tb_
       #鍒锋柊mapper 璋冭瘯绁炲櫒
-  #      refresh-mapper: true
+#      refresh-mapper: true
   configuration:
     #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
     map-underscore-to-camel-case: true
     cache-enabled: false
     #mybatis鏃ュ織杈撳嚭
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-#鏁版嵁搴�
 pagehelper:
   helper-dialect: mysql
   reasonable: true
   support-methods-arguments: true
   params: count=countSql
-
+#swagger鏄惁婵�娲�,swagger鐨刄I鐣岄潰鍦板潃涓� localhost:8080/swagger-ui.html
+#swagger:
+#  enabled: true
+#  ui-config:
+#    operations-sorter: method
+#  title: 姝︽眽婧愮晠-3.5WM鐢垫満绯荤粺
+#  authorization:
+#    type: None
+#    auth-regex: none
+#  base-package: com.whyc.controller
 knife:
   enable: true
-
+custom:
+  #浜鸿劯
+  face:
+    #type=1 鍏嶈垂鐗�,type=2 澧炲�肩増姘镐箙
+    type: 1
+    threshold: 0.8
+    appId4Win: 9yyDc1NXJsSQBdareYkBHA8Z4XDvSNkKAibxSmiYhA39
+    sdkKey4Win: GHmUteeWmeLCRZstetQfXgJTB29wenDazF3UrH85K9hw
+    appId4Linux: AafPX5afzycEnTqH3v79gY3VozNVTSNqT8kzSmP7b48q
+    sdkKey4Linux: GsYwWhxzuQEE1WE34J3Fo8d2GiFdddqH81ghetQQTGmv
+    activeKey: 8611-11H3-Z13R-7HL1
+  #鍛婅鐭俊
+  message:
+    switch: OFF
+    secret_id: AKIDaz80bw0oLbbLo0vay5vVoqb5IEtIQItD
+    secret_key: 4sPeeNp0tWsVrxmLdfQu73i6D2btufAO
+    region: ap-nanjing
+    smsSdkAppId: 1400565791
+    signName: 姝︽眽婧愮晠绉戞妧鏈夐檺鍏徃
+    templateId: 1095970
+  #鍛婅宸ュ崟
+  alarm:
+    task.switch: off
+  #鐧诲綍楠岃瘉鐮� on/off
+  fontDynamicCode: on
+  #鍏佽璺ㄥ煙鐨勭櫧鍚嶅崟 http://192.168.10.132:8080,http://192.168.10.109:8080
+  cors: http://localhost:8080,http://192.168.10.114:8080
+  i18n: zh-CN
 #Config鏂囦欢璇诲彇 娑夊強License鍜孎GCDFileDownload
 configFile:
   type: 1 #1:鏈湴娴嬭瘯锛�2锛氭墦鍖卝ar
-
-
-
 
 
diff --git a/src/main/resources/config/application-litedev.yml b/src/main/resources/config/application-litedev.yml
new file mode 100644
index 0000000..c03def7
--- /dev/null
+++ b/src/main/resources/config/application-litedev.yml
@@ -0,0 +1,65 @@
+#绯荤粺绫诲瀷:1(鏅��,鏃犻檺鍒�),2(涓ユ牸-gw鏍囧噯),3(涓ユ牸-绛惧悕)
+system:
+  type: 1
+#鏈嶅姟绔彛鍙�
+server:
+  port: 8094
+  servlet:
+    context-path: /test3d
+    session:
+      cookie:
+        name: test3dcookie
+  tomcat:
+    max-http-form-post-size: 102400000
+  max-http-header-size: 10000000
+
+#鏁版嵁搴�
+spring:
+  datasource:
+    driver-class-name: org.sqlite.JDBC
+    #    url: jdbc:sqlite:C:\Users\29550\Downloads\sqlite-tools-win32-x86-3390400\res.db
+    url: jdbc:sqlite:test3d.db?date_string_format=yyyy-MM-dd HH:mm:ss
+  servlet:
+    multipart:
+      max-file-size: 200MB
+      max-request-size: 200MB
+mybatis-plus:
+  typeAliasesPackage: com.lxw.test3d.pojo,com.lxw.test3d.dto
+  mapper-locations: classpath:mapper/**/*Mapper.xml
+  global-config:
+    db-config:
+      #涓婚敭绫诲瀷  0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
+      id-type: AUTO
+      #椹煎嘲涓嬪垝绾胯浆鎹�
+      table-underline: true
+      #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
+      capital-mode: true
+      #mp2.3+ 鍏ㄥ眬琛ㄥ墠缂� tb_
+      table-prefix: tb_
+      #鍒锋柊mapper 璋冭瘯绁炲櫒
+  #      refresh-mapper: true
+  configuration:
+    #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    #mybatis鏃ュ織杈撳嚭
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+#鏁版嵁搴�
+pagehelper:
+  helper-dialect: mysql
+  reasonable: true
+  support-methods-arguments: true
+  params: count=countSql
+
+knife:
+  enable: true
+
+#Config鏂囦欢璇诲彇 娑夊強License鍜孎GCDFileDownload
+configFile:
+  type: 1 #1:鏈湴娴嬭瘯锛�2锛氭墦鍖卝ar
+
+
+
+
+

--
Gitblit v1.9.1