- PSSR支（吊）架导入

- PSSR仪表校验导入
- PSSR电机设备导入
- PSSR静电接地，跨接导入
- PSSR气体检测仪导入
- PSSR在线分析仪导入

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -418,6 +418,24 @@ public class CommonController extends BaseController
         }else if( type.equals("pumpCleaning") ) {
             downloadname = "PSSR机泵-过滤器清理回装确认表导入模板.xlsx";
             url = "static/template/pssr/pumpCleaning.xlsx";
+        }else if( type.equals("motor") ) {
+            downloadname = "PSSR电机设备导入模板.xlsx";
+            url = "static/template/pssr/motor.xlsx";
+        }else if( type.equals("calibration") ) {
+            downloadname = "PSSR仪表校验导入模板.xlsx";
+            url = "static/template/pssr/calibration.xlsx";
+        }else if( type.equals("frame") ) {
+            downloadname = "PSSR支（吊）架导入模板.xlsx";
+            url = "static/template/pssr/frame.xlsx";
+        }else if( type.equals("franklinism") ) {
+            downloadname = "PSSR静电接地，跨接导入模板.xlsx";
+            url = "static/template/pssr/franklinism.xlsx";
+        }else if( type.equals("gasdetector") ) {
+            downloadname = "PSSR气体检测器导入模板.xlsx";
+            url = "static/template/pssr/gasdetector.xlsx";
+        }else if( type.equals("analyzer") ) {
+            downloadname = "PSSR在线分析仪导入模板.xlsx";
+            url = "static/template/pssr/analyzer.xlsx";
         }
 
         InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(url);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -8,33 +9,32 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrFrame;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrFrameMapper;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -65,6 +65,121 @@ public class TPssrFrameController extends BaseController {
     private ISysUserService sysUserService;
     private String forShort = "zdj";
 
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    /**
+     * 批量导入
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frame:add')")
+    @PostMapping("/importData")
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow =new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TPssrFrame> list = new ArrayList<TPssrFrame>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 2; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getPhysicalNumberOfCells();
+                TPssrFrame entity = new TPssrFrame();
+                entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
+                entity.setSubId(subId);
+                entity.setApproveStatus(0L);
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        entity.setRegion(cellValue);
+                    } else if (j == 1) {
+                        entity.setBracketNumber(cellValue);
+                    } else if (j == 2) {
+                        entity.setPipelineNumber(cellValue);
+                    } else if (j == 3) {
+                        entity.setDevNo(cellValue);
+                    } else if (j == 4) {
+                        entity.setSupportType(cellValue);
+                    } else if (j == 5) {
+                        entity.setFramePipe1(cellValue);
+                    } else if (j == 6) {
+                        entity.setFramePipe2(cellValue);
+                    } else if (j == 7) {
+                        entity.setFrameRoot1(cellValue);
+                    } else if (j == 8) {
+                        entity.setFrameRoot2(cellValue);
+                    } else if (j == 9) {
+                        entity.setFrameRoot3(cellValue);
+                    } else if (j == 10) {
+                        entity.setFrameRoot4(cellValue);
+                    } else if (j == 11) {
+                        entity.setFunctionalPart1(cellValue);
+                    } else if (j == 12) {
+                        entity.setFunctionalPart2(cellValue);
+                    } else if (j == 13) {
+                        entity.setFunctionalPart3(cellValue);
+                    } else if (j == 14) {
+                        entity.setFunctionalPart4(cellValue);
+                    } else if (j == 15) {
+                        entity.setConnector1(cellValue);
+                    } else if (j == 16) {
+                        entity.setConnector2(cellValue);
+                    } else if (j == 17) {
+                        entity.setConnector3(cellValue);
+                    } else if (j == 18) {
+                        entity.setConnector4(cellValue);
+                    } else if (j == 19) {
+                        entity.setProcessingResult(cellValue);
+                    } else if (j == 20) {
+                        if (cellValue.length() > 3) {
+                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 21) {
+                        entity.setRemarks(cellValue);
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(i+1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TPssrFrame t : list
+        ) {
+            failNum++;
+            try {
+                this.add(t);
+                successNumber++;
+            }catch (Exception e){
+                failNumber++;
+                logger.info("e:" + e);
+                failRow.add(failNum+1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        logger.info("failNumber:" +String.valueOf(failNumber));
+        logger.info("failRow:" +String.valueOf(failRow));
+        return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
+    }
+
     /**
      * 查询支（吊）架列表
      */

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -8,33 +9,32 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrFranklinism;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrFranklinismMapper;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -65,6 +65,84 @@ public class TPssrFranklinismController extends BaseController {
     private ISysUserService sysUserService;
     private String forShort = "jdjdkj";
 
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    /**
+     * 批量导入
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:franklinism:add')")
+    @PostMapping("/importData")
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow =new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TPssrFranklinism> list = new ArrayList<TPssrFranklinism>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 2; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getPhysicalNumberOfCells();
+                TPssrFranklinism entity = new TPssrFranklinism();
+                entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
+                entity.setSubId(subId);
+                entity.setApproveStatus(0L);
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        entity.setCheckContent(cellValue);
+                    } else if (j == 1) {
+                        entity.setCheckResult(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setRemarks(cellValue);
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(i+1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TPssrFranklinism t : list
+        ) {
+            failNum++;
+            try {
+                this.add(t);
+                successNumber++;
+            }catch (Exception e){
+                failNumber++;
+                logger.info("e:" + e);
+                failRow.add(failNum+1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        logger.info("failNumber:" +String.valueOf(failNumber));
+        logger.info("failRow:" +String.valueOf(failRow));
+        return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
+    }
 
     /**
      * 查询静电接地，跨接列表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -8,33 +9,32 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrInstrumentCalibrationMapper;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -65,6 +65,90 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     private ISysUserService sysUserService;
     private String forShort = "ybjy";
 
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    /**
+     * 批量导入
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:add')")
+    @PostMapping("/importData")
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow =new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TPssrInstrumentCalibration> list = new ArrayList<TPssrInstrumentCalibration>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 2; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getPhysicalNumberOfCells();
+                TPssrInstrumentCalibration entity = new TPssrInstrumentCalibration();
+                entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
+                entity.setSubId(subId);
+                entity.setApproveStatus(0L);
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        entity.setUnit(cellValue);
+                    } else if (j == 1) {
+                        entity.setDevNo(cellValue);
+                    } else if (j == 2) {
+                        entity.setVisualInspection(cellValue);
+                    } else if (j == 3) {
+                        entity.setInstallationInspection(cellValue);
+                    } else if (j == 4) {
+                        entity.setFunctionalCheck(cellValue);
+                    } else if (j == 5) {
+                        if (cellValue.length() > 3) {
+                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 6) {
+                        entity.setRemarks(cellValue);
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(i+1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TPssrInstrumentCalibration t : list
+        ) {
+            failNum++;
+            try {
+                this.add(t);
+                successNumber++;
+            }catch (Exception e){
+                failNumber++;
+                logger.info("e:" + e);
+                failRow.add(failNum+1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        logger.info("failNumber:" +String.valueOf(failNumber));
+        logger.info("failRow:" +String.valueOf(failRow));
+        return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
+    }
 
     /**
      * 查询仪表校验列表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -8,33 +9,32 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrMotor;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrMotorMapper;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -66,6 +66,88 @@ public class TPssrMotorController extends BaseController {
     private ISysUserService sysUserService;
     private String forShort = "djsb";
 
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    /**
+     * 批量导入
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:motor:add')")
+    @PostMapping("/importData")
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow =new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TPssrMotor> list = new ArrayList<TPssrMotor>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 2; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getPhysicalNumberOfCells();
+                TPssrMotor entity = new TPssrMotor();
+                entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
+                entity.setSubId(subId);
+                entity.setApproveStatus(0L);
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        entity.setUnit(cellValue);
+                    } else if (j == 1) {
+                        entity.setDevNo(cellValue);
+                    } else if (j == 2) {
+                        entity.setVisualInspection(cellValue);
+                    } else if (j == 3) {
+                        entity.setFunctionalCheck(cellValue);
+                    } else if (j == 4) {
+                        if (cellValue.length() > 3) {
+                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 5) {
+                        entity.setRemarks(cellValue);
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(i+1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TPssrMotor t : list
+        ) {
+            failNum++;
+            try {
+                this.add(t);
+                successNumber++;
+            }catch (Exception e){
+                failNumber++;
+                logger.info("e:" + e);
+                failRow.add(failNum+1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        logger.info("failNumber:" +String.valueOf(failNumber));
+        logger.info("failRow:" +String.valueOf(failRow));
+        return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
+    }
 
     /**
      * 查询电机设备列表

ui/src/views/pssr/analyzer/index.vue

@@ -388,7 +388,7 @@
                   :limit="1"
                   accept=".xlsx, .xls"
                   :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :action="upload.url"
                   :disabled="upload.isUploading"
                   :on-progress="handleFileUploadProgress"
                   :on-success="handleFileSuccess"
@@ -401,8 +401,11 @@
                   <em>点击上传</em>
               </div>
               <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
                   <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+                <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+                  <input name="type" :value="upload.type" hidden />
+                </form>
               </div>
               <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
           </el-upload>
@@ -512,6 +515,10 @@ export default {
       open: false,
         // 用户导入参数
         upload: {
+          //下载模板请求地址
+          downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+          //下载模板类型
+          type: 'analyzer',
             // 是否显示弹出层（用户导入）
             open: false,
             // 弹出层标题（用户导入）
@@ -523,7 +530,7 @@ export default {
             // 设置上传的请求头部
             headers: { Authorization: "Bearer " + getToken() },
             // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/analyzer/importData"
+            url: process.env.VUE_APP_BASE_API + "/pssr/analyzer/importData?subId=" + this.subId
         },
       // 查询参数
       queryParams: {
@@ -702,9 +709,7 @@ export default {
       },
       /** 下载模板操作 */
       importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
+        this.$refs['downloadFileForm'].submit()
       },
       // 文件上传中处理
       handleFileUploadProgress(event, file, fileList) {

ui/src/views/pssr/frame/index.vue

@@ -564,7 +564,7 @@
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :action="upload.url"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -577,9 +577,12 @@
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport"/>
-          是否更新已经存在的用户数据
+          <!--<el-checkbox v-model="upload.updateSupport"/>-->
+          <!--是否更新已经存在的用户数据-->
           <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+          <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+            <input name="type" :value="upload.type" hidden />
+          </form>
         </div>
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
@@ -689,6 +692,10 @@ export default {
       open: false,
       // 用户导入参数
       upload: {
+        //下载模板请求地址
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        //下载模板类型
+        type: 'frame',
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
@@ -700,7 +707,7 @@ export default {
         // 设置上传的请求头部
         headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/pssr/frame/importData"
+        url: process.env.VUE_APP_BASE_API + "/pssr/frame/importData?subId=" + this.subId
       },
       // 查询参数
       queryParams: {
@@ -889,9 +896,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      importTemplate().then(response => {
-        this.download(response.msg);
-      });
+      this.$refs['downloadFileForm'].submit()
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

ui/src/views/pssr/franklinism/index.vue

@@ -430,7 +430,7 @@
                   :limit="1"
                   accept=".xlsx, .xls"
                   :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :action="upload.url"
                   :disabled="upload.isUploading"
                   :on-progress="handleFileUploadProgress"
                   :on-success="handleFileSuccess"
@@ -443,8 +443,11 @@
                   <em>点击上传</em>
               </div>
               <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
                   <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+                <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+                  <input name="type" :value="upload.type" hidden />
+                </form>
               </div>
               <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
           </el-upload>
@@ -554,6 +557,10 @@ export default {
       open: false,
         // 用户导入参数
         upload: {
+          //下载模板请求地址
+          downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+          //下载模板类型
+          type: 'franklinism',
             // 是否显示弹出层（用户导入）
             open: false,
             // 弹出层标题（用户导入）
@@ -565,7 +572,7 @@ export default {
             // 设置上传的请求头部
             headers: { Authorization: "Bearer " + getToken() },
             // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/franklinism/importData"
+            url: process.env.VUE_APP_BASE_API + "/pssr/franklinism/importData?subId=" + this.subId
         },
       // 查询参数
       queryParams: {
@@ -742,9 +749,7 @@ export default {
       },
       /** 下载模板操作 */
       importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
+        this.$refs['downloadFileForm'].submit()
       },
       // 文件上传中处理
       handleFileUploadProgress(event, file, fileList) {

ui/src/views/pssr/gasdetector/index.vue

@@ -445,7 +445,7 @@
                   :limit="1"
                   accept=".xlsx, .xls"
                   :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :action="upload.url"
                   :disabled="upload.isUploading"
                   :on-progress="handleFileUploadProgress"
                   :on-success="handleFileSuccess"
@@ -458,8 +458,11 @@
                   <em>点击上传</em>
               </div>
               <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
                   <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+                <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+                  <input name="type" :value="upload.type" hidden />
+                </form>
               </div>
               <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
           </el-upload>
@@ -568,6 +571,10 @@ export default {
       open: false,
         // 用户导入参数
         upload: {
+          //下载模板请求地址
+          downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+          //下载模板类型
+          type: 'gasdetector',
             // 是否显示弹出层（用户导入）
             open: false,
             // 弹出层标题（用户导入）
@@ -579,7 +586,7 @@ export default {
             // 设置上传的请求头部
             headers: { Authorization: "Bearer " + getToken() },
             // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/gasdetector/importData"
+            url: process.env.VUE_APP_BASE_API + "/pssr/gasdetector/importData?subId=" + this.subId
         },
       // 查询参数
       queryParams: {
@@ -758,9 +765,7 @@ export default {
       },
       /** 下载模板操作 */
       importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
+        this.$refs['downloadFileForm'].submit()
       },
       // 文件上传中处理
       handleFileUploadProgress(event, file, fileList) {

ui/src/views/pssr/instrumentCalibration/index.vue

@@ -458,7 +458,7 @@
                   :limit="1"
                   accept=".xlsx, .xls"
                   :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :action="upload.url"
                   :disabled="upload.isUploading"
                   :on-progress="handleFileUploadProgress"
                   :on-success="handleFileSuccess"
@@ -471,8 +471,11 @@
                   <em>点击上传</em>
               </div>
               <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
                   <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+                <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+                  <input name="type" :value="upload.type" hidden />
+                </form>
               </div>
               <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
           </el-upload>
@@ -582,6 +585,10 @@ export default {
       open: false,
         // 用户导入参数
         upload: {
+          //下载模板请求地址
+          downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+          //下载模板类型
+          type: 'calibration',
             // 是否显示弹出层（用户导入）
             open: false,
             // 弹出层标题（用户导入）
@@ -593,7 +600,7 @@ export default {
             // 设置上传的请求头部
             headers: { Authorization: "Bearer " + getToken() },
             // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/instrumentCalibration/importData"
+            url: process.env.VUE_APP_BASE_API + "/pssr/instrumentCalibration/importData?subId=" + this.subId
         },
       // 查询参数
       queryParams: {
@@ -774,9 +781,7 @@ export default {
       },
       /** 下载模板操作 */
       importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
+        this.$refs['downloadFileForm'].submit()
       },
       // 文件上传中处理
       handleFileUploadProgress(event, file, fileList) {

ui/src/views/pssr/motor/index.vue

@@ -444,7 +444,7 @@
                   :limit="1"
                   accept=".xlsx, .xls"
                   :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :action="upload.url"
                   :disabled="upload.isUploading"
                   :on-progress="handleFileUploadProgress"
                   :on-success="handleFileSuccess"
@@ -457,8 +457,11 @@
                   <em>点击上传</em>
               </div>
               <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
                   <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+                <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+                  <input name="type" :value="upload.type" hidden />
+                </form>
               </div>
               <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
           </el-upload>
@@ -567,6 +570,10 @@ export default {
       open: false,
         // 用户导入参数
         upload: {
+          //下载模板请求地址
+          downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+          //下载模板类型
+          type: 'motor',
             // 是否显示弹出层（用户导入）
             open: false,
             // 弹出层标题（用户导入）
@@ -578,7 +585,7 @@ export default {
             // 设置上传的请求头部
             headers: { Authorization: "Bearer " + getToken() },
             // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/motor/importData"
+            url: process.env.VUE_APP_BASE_API + "/pssr/motor/importData?subId=" + this.subId
         },
       // 查询参数
       queryParams: {
@@ -757,9 +764,7 @@ export default {
       },
       /** 下载模板操作 */
       importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
+        this.$refs['downloadFileForm'].submit()
       },
       // 文件上传中处理
       handleFileUploadProgress(event, file, fileList) {