导入导出

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -9,6 +9,7 @@ import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -62,23 +63,23 @@ public class DeviceAnalogVariableListController {
         return ApiResult.success();
     }
 
-    /**
-     * 站点管理-变量列表-列表查询-禁用
-     *
-     * @param deviceCode 设备编号
-     * @param screen     筛选条件
-     * @param size       页数
-     * @param current    条数
-     * @return
-     */
-
-    @GetMapping("variableList")
-    public ApiResult<CommonPage<DeviceAnalogVariableList>> variableList(@RequestParam(required = false) String deviceCode,
-                                                                        @RequestParam(required = false) String screen,
-                                                                        @RequestParam(value = "size", required = false, defaultValue = "1") int size,
-                                                                        @RequestParam(value = "current", required = false, defaultValue = "10") int current) {
-        return ApiResult.success(deviceAnalogVariableListService.variableList(deviceCode, screen, size, current));
-    }
+//    /**
+//     * 站点管理-变量列表-列表查询-禁用
+//     *
+//     * @param deviceCode 设备编号
+//     * @param screen     筛选条件
+//     * @param size       页数
+//     * @param current    条数
+//     * @return
+//     */
+//
+//    @GetMapping("variableList")
+//    public ApiResult<CommonPage<DeviceAnalogVariableList>> variableList(@RequestParam(required = false) String deviceCode,
+//                                                                        @RequestParam(required = false) String screen,
+//                                                                        @RequestParam(value = "size", required = false, defaultValue = "1") int size,
+//                                                                        @RequestParam(value = "current", required = false, defaultValue = "10") int current) {
+//        return ApiResult.success(deviceAnalogVariableListService.variableList(deviceCode, screen, size, current));
+//    }
 
 
     /**
@@ -132,5 +133,17 @@ public class DeviceAnalogVariableListController {
         return ApiResult.success(deviceAnalogVariableListService.variableListExport(siteId,variableName,dataArea));
     }
 
+    /**
+     * 变量列表-导入
+     * @param multipartFile 导入文件
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/variableListImport")
+    public ApiResult<Void> variableListImport(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        deviceAnalogVariableListService.variableListImport(multipartFile);
+        return ApiResult.success();
+    }
+
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAttributeController.java

@@ -8,6 +8,7 @@ import com.bizmatics.model.vo.MonitorDeviceListVO;
 import com.bizmatics.service.DeviceAttributeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 设备管理-监控设备
@@ -91,8 +92,9 @@ public class DeviceAttributeController {
 
     /**
      * 站点管理/设备管理-监控设备-列表导出
+     *
      * @param siteId 站点ID
-     * @param id 监控漫设备ID
+     * @param id     监控漫设备ID
      * @return
      */
     @GetMapping("deviceAttributeExport")
@@ -102,5 +104,17 @@ public class DeviceAttributeController {
         return ApiResult.success(deviceAttributeService.deviceAttributeExport(id, siteId));
     }
 
+    /**
+     * 监控设备-导入
+     * @param multipartFile 导入文件
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/deviceAttributeImport")
+    public ApiResult<Void> deviceAttributeImport(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        deviceAttributeService.deviceAttributeImport(multipartFile);
+        return ApiResult.success();
+    }
+
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -13,6 +13,7 @@ import com.bizmatics.service.vo.DeviceCountVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
 import java.util.List;
@@ -211,5 +212,17 @@ public class DeviceController {
                                           @RequestParam(value = "deviceType", required = false, defaultValue = "2") Integer deviceType) {
         return ApiResult.success(deviceService.deviceExport(deviceName, deviceType, siteId));
     }
+
+    /**
+     * 通信设备-导入
+     * @param multipartFile 导入文件
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/deviceImport")
+    public ApiResult<Void> deviceImport(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        deviceService.deviceImport(multipartFile);
+        return ApiResult.success();
+    }
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/DevopsWorkOrderController.java

@@ -150,6 +150,7 @@ public class DevopsWorkOrderController {
 
     /**
      * 运维管理-运维统计
+     *
      * @param type
      * @return
      */
@@ -162,21 +163,39 @@ public class DevopsWorkOrderController {
 
     /**
      * 运维管理-工作量统计-列表查询
-     * @param siteId 站点ID
+     *
+     * @param siteId    站点ID
      * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param size 条数
-     * @param current 页数
+     * @param endTime   结束时间
+     * @param size      条数
+     * @param current   页数
      * @return
      */
     @GetMapping("workloadStatisticsLits")
     public ApiResult<CommonPage<ProcessingTimeVo>> workloadStatisticsLits(@RequestParam(required = false) Integer siteId,
-                                                          @RequestParam(required = false) String startTime,
-                                                          @RequestParam(required = false) String endTime,
-                                                          @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
-                                                          @RequestParam(value = "current", required = false, defaultValue = "1") Integer current
+                                                                          @RequestParam(required = false) String startTime,
+                                                                          @RequestParam(required = false) String endTime,
+                                                                          @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
+                                                                          @RequestParam(value = "current", required = false, defaultValue = "1") Integer current
+    ) {
+        return ApiResult.success(devopsWorkOrderService.workloadStatisticsLits(siteId, startTime, endTime, size, current));
+    }
+
+
+    /**
+     * 运维管理-工作量统计-导出
+     *
+     * @param siteId    站点ID
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return
+     */
+    @GetMapping("workloadStatisticsExport")
+    public ApiResult<String> workloadStatisticsExport(@RequestParam(required = false) Integer siteId,
+                                                      @RequestParam(required = false) String startTime,
+                                                      @RequestParam(required = false) String endTime
     ) {
-        return ApiResult.success(devopsWorkOrderService.workloadStatisticsLits(siteId,startTime,endTime,size , current));
+        return ApiResult.success(devopsWorkOrderService.workloadStatisticsExport(siteId, startTime, endTime));
     }
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/SitedtlController.java

@@ -3,7 +3,6 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.vo.DevopsWorkOrderListVo;
 import com.bizmatics.model.vo.SitedtlArchivesVo;
 import com.bizmatics.model.vo.SitedtlVo;
 import com.bizmatics.service.SitedtlService;
@@ -25,6 +24,7 @@ public class SitedtlController {
 
     /**
      * 运维管理-现场档案-新增
+     *
      * @param sitedtlArchivesVo
      * @return
      */
@@ -36,6 +36,7 @@ public class SitedtlController {
 
     /**
      * 运维管理-现场档案-修改
+     *
      * @param sitedtlArchivesVo
      * @return
      */
@@ -48,21 +49,35 @@ public class SitedtlController {
 
     /**
      * 运维管理-现场档案-列表查询
-     * @param siteId 站点ID
+     *
+     * @param siteId              站点ID
      * @param electricTestOverdue 电试日期
-     * @param size 条数
-     * @param current 页数
+     * @param size                条数
+     * @param current             页数
      * @return
      */
     @GetMapping("sitedtlList")
     public ApiResult<CommonPage<SitedtlVo>> sitedtlList(@RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId,
-                                                                @RequestParam( required = false) String electricTestOverdue,
-                                                                @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
-                                                                @RequestParam(value = "current", required = false, defaultValue = "1") Integer current
+                                                        @RequestParam(required = false) String electricTestOverdue,
+                                                        @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
+                                                        @RequestParam(value = "current", required = false, defaultValue = "1") Integer current
     ) {
         return ApiResult.success(sitedtlService.sitedtlList(siteId, electricTestOverdue, size, current));
     }
 
+    /**
+     * 运维管理-现场档案-导出
+     *
+     * @param siteId              站点ID
+     * @param electricTestOverdue 电试超期
+     * @return
+     */
+    @GetMapping("variableListExport")
+    public ApiResult<String> variableListExport(@RequestParam(value = "siteId", required = false, defaultValue = "0") Integer siteId,
+                                                @RequestParam(required = false) String electricTestOverdue
+    ) {
+        return ApiResult.success(sitedtlService.variableListExport(siteId, electricTestOverdue));
+    }
 
 }
 

fiveep-model/src/main/java/com/bizmatics/model/vo/PlatformAreaVo.java

@@ -52,7 +52,7 @@ public class PlatformAreaVo implements Serializable {
     private Integer enable;
 
     /**
-     * 设备数量
+     * 通信设备数量
      */
     private Integer deviceCount;
 

fiveep-model/src/main/java/com/bizmatics/model/vo/SitedtlVo.java

@@ -369,4 +369,19 @@ public class SitedtlVo implements Serializable {
      * 是否具备照明图片
      */
     private String lightingPicture;
+
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
+    /**
+     * 线路名称
+     */
+    private String routeName;
+
+    /**
+     * 监察人
+     */
+    private String supervisionName;
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SitedtlMapper.java

@@ -1,7 +1,10 @@
 package com.bizmatics.persistence.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.model.Sitedtl;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import com.bizmatics.model.vo.DevopsWorkOrderListVo;
 import com.bizmatics.model.vo.SitedtlVo;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +24,9 @@ public interface SitedtlMapper extends CrudMapper<Sitedtl> {
                                   @Param("electricTestOverdue") String electricTestOverdue,
                                   @Param("startCurrent") Integer startCurrent,
                                   @Param("size") Integer size);
+    Page<SitedtlVo> sitedtlVoListOne(IPage<SitedtlVo> page,
+                                  @Param("siteId") Integer siteId,
+                                  @Param("electricTestOverdue") String electricTestOverdue,
+                                  @Param("startCurrent") Integer startCurrent,
+                                  @Param("size") Integer size);
 }

fiveep-persistence/src/main/resources/mapper/mysql/PlatformAreaMapper.xml

@@ -67,12 +67,13 @@
         FROM
         site AS a
         JOIN device AS b ON a.id = b.site_id
-        JOIN device_attribute AS c ON b.id = c.device_id
+        JOIN device_analog_variable_list AS s ON b.id = s.communication_equipment
+        JOIN device_attribute AS c ON s.monitoring_equipment = c.id
         JOIN device_status AS d ON b.device_code = d.device_code
         <where>
             a.enable = 1
             and b.enable = 1
-            and c.enable = 1
+            and c.status = 1
             <if test="stationAreaId != null and stationAreaId != 0">
                 AND a.station_area_id = #{stationAreaId}
             </if>

fiveep-persistence/src/main/resources/mapper/mysql/SitedtlMapper.xml

@@ -38,10 +38,38 @@
     </resultMap>
     <select id="sitedtlVoList" resultType="com.bizmatics.model.vo.SitedtlVo">
         SELECT
-        a.*,b.id AS site_archivesid,b.*
+        a.*,b.id AS site_archivesid,b.*,c.site_name,d.route_name,e.supervision_name
         FROM
         sitedtl AS a
         left JOIN site_archives AS b ON a.id = b.sitedtl_id
+        left join site as  c on a.site_id=c.id
+        left join route as d on d.id=a.route_id
+        left join supervision as e on e.id=a.supervision_department_id
+        <where>
+            <if test="siteId != null and siteId !=0">
+                a.site_id =  #{siteId}
+            </if>
+            <if test="electricTestOverdue != null and electricTestOverdue !='' ">
+                and  a.electric_test_overdue LIKE CONCAT(CONCAT('%', #{electricTestOverdue}), '%')
+            </if>
+        </where>
+        ORDER BY
+        a.id DESC
+        <if test="startCurrent != null and size !=0">
+            LIMIT #{startCurrent},
+            #{size}
+        </if>
+    </select>
+
+    <select id="sitedtlVoListOne" resultType="com.bizmatics.model.vo.SitedtlVo">
+        SELECT
+        a.*,b.id AS site_archivesid,b.*,c.site_name,d.route_name,e.supervision_name
+        FROM
+        sitedtl AS a
+        left JOIN site_archives AS b ON a.id = b.sitedtl_id
+        left join site as  c on a.site_id=c.id
+        left join route as d on d.id=a.route_id
+        left join supervision as e on e.id=a.supervision_department_id
         <where>
             <if test="siteId != null and siteId !=0">
                 a.site_id =  #{siteId}

fiveep-service/src/main/java/com/bizmatics/service/DeviceAnalogVariableListService.java

@@ -5,6 +5,7 @@ import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -31,5 +32,7 @@ public interface DeviceAnalogVariableListService extends CrudService<DeviceAnalo
 
     String variableListExport(Integer siteId, String variableName, Integer dataArea);
 
+    void variableListImport(MultipartFile multipartFile) throws Exception;
+
 
 }

fiveep-service/src/main/java/com/bizmatics/service/DeviceAttributeService.java

@@ -4,6 +4,8 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.vo.MonitorDeviceListVO;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -26,4 +28,6 @@ public interface DeviceAttributeService extends CrudService<DeviceAttribute> {
     CommonPage<MonitorDeviceListVO> monitorDeviceList(String siteName,Integer size,Integer current);
 
     String deviceAttributeExport(Integer id, Integer siteId);
+
+    void deviceAttributeImport(MultipartFile multipartFile) throws Exception;
 }

fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -9,6 +9,7 @@ import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.model.vo.DeviceOneVo;
 import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
 import java.util.List;
@@ -60,4 +61,6 @@ public interface DeviceService extends CrudService<Device> {
     List<Device> deviceListOne(Integer siteId,Integer deviceType);
 
     String deviceExport(String deviceName, Integer deviceType, Integer siteId);
+
+    void deviceImport(MultipartFile multipartFile) throws Exception;
 }

fiveep-service/src/main/java/com/bizmatics/service/DevopsWorkOrderService.java

@@ -36,4 +36,6 @@ public interface DevopsWorkOrderService extends CrudService<DevopsWorkOrder> {
     List<OpexStatisticsVo> operationCensus(String type);
 
     CommonPage<ProcessingTimeVo> workloadStatisticsLits(Integer siteId, String startTime, String endTime,Integer size , Integer current);
+
+    String workloadStatisticsExport(Integer siteId, String startTime, String endTime);
 }

fiveep-service/src/main/java/com/bizmatics/service/SitedtlService.java

@@ -20,4 +20,6 @@ public interface SitedtlService extends CrudService<Sitedtl> {
     void sitedtlUpdate(SitedtlArchivesVo sitedtlArchivesVo);
 
     CommonPage<SitedtlVo> sitedtlList(Integer siteId, String electricTestOverdue, Integer size, Integer current);
+
+    String variableListExport(Integer siteId, String electricTestOverdue);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java

@@ -1,7 +1,9 @@
 package com.bizmatics.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,9 +24,12 @@ import com.bizmatics.persistence.mapper.DeviceAnalogVariableListMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceAnalogVariableListExportVO;
+import com.bizmatics.service.vo.DeviceAnalogVariableListImport;
 import com.bizmatics.service.vo.DeviceAttributeExportVO;
+import com.bizmatics.service.vo.DeviceAttributeImportVo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -45,6 +50,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     @Override
     public void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
+        deviceAnalogVariableList.setVariableCoding(deviceAnalogVariableList.getDeviceCode()+"_"+deviceAnalogVariableList.getVariableCoding());
         deviceAnalogVariableList.setCreateTime(new Date());
         deviceAnalogVariableList.setCreator(user.getUserName());
         deviceAnalogVariableList.setStatus(1);
@@ -150,5 +156,33 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
         return file.getName();
     }
 
+    @Override
+    public void variableListImport(MultipartFile multipartFile) throws Exception {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        ImportParams params = new ImportParams();
+        params.setHeadRows(1);
+        List<DeviceAnalogVariableListImport> result = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
+                DeviceAnalogVariableListImport.class, params);
+        if (result.size()>0){
+            for (int i = 0; i < result.size(); i++) {
+                DeviceAnalogVariableList deviceAnalogVariableList = new DeviceAnalogVariableList();
+                deviceAnalogVariableList.setDeviceCode(result.get(i).getDeviceCode());
+                deviceAnalogVariableList.setVariableName(result.get(i).getVariableName());
+                deviceAnalogVariableList.setVariableCoding(result.get(i).getDeviceCode()+"_"+result.get(i).getVariableCoding());
+                deviceAnalogVariableList.setMonitoringEquipment(result.get(i).getMonitoringEquipment());
+                deviceAnalogVariableList.setCommunicationEquipment(result.get(i).getCommunicationEquipment());
+                deviceAnalogVariableList.setDataType(result.get(i).getDataType());
+                deviceAnalogVariableList.setCoefficient(result.get(i).getCoefficient());
+                deviceAnalogVariableList.setSaveCycle(result.get(i).getSaveCycle());
+                deviceAnalogVariableList.setDataArea(result.get(i).getDataArea());
+                deviceAnalogVariableList.setDataAddress(result.get(i).getDataAddress());
+                deviceAnalogVariableList.setStatus(1);
+                deviceAnalogVariableList.setCreator(user.getUserName());
+                deviceAnalogVariableList.setCreateTime(new Date());
+                this.save(deviceAnalogVariableList);
+            }
+        }
+    }
+
 
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java

@@ -1,7 +1,9 @@
 package com.bizmatics.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,9 +22,12 @@ import com.bizmatics.service.DeviceAttributeService;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceAttributeExportVO;
+import com.bizmatics.service.vo.DeviceAttributeImportVo;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -134,4 +139,32 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
         return file.getName();
     }
 
+
+
+    @Override
+    public void deviceAttributeImport(MultipartFile multipartFile) throws Exception {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        ImportParams params = new ImportParams();
+        params.setHeadRows(1);
+        List<DeviceAttributeImportVo> result = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
+                DeviceAttributeImportVo.class, params);
+        if (result.size()>0){
+            for (int i = 0; i < result.size(); i++) {
+                DeviceAttribute deviceAttribute = new DeviceAttribute();
+                deviceAttribute.setMonitorDeviceCode(result.get(i).getMonitorDeviceCode());
+                deviceAttribute.setMonitorDeviceName(result.get(i).getMonitorDeviceName());
+                deviceAttribute.setLoopMeterAddress(result.get(i).getLoopMeterAddress());
+                deviceAttribute.setRatedCurrent(result.get(i).getRatedCurrent());
+                deviceAttribute.setCurrentLoadRate(result.get(i).getCurrentLoadRate());
+                deviceAttribute.setSiteId(result.get(i).getSiteId());
+                deviceAttribute.setVariableListId(0);
+                deviceAttribute.setQualityAnalysis(result.get(i).getQualityAnalysis());
+                deviceAttribute.setStatus(1);
+                deviceAttribute.setCreator(user.getUserName());
+                deviceAttribute.setCreateTime(new Date());
+                this.save(deviceAttribute);
+            }
+        }
+    }
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -1,7 +1,9 @@
 package com.bizmatics.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,12 +30,11 @@ import com.bizmatics.service.DeviceStatusService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.enums.DeviceType;
 import com.bizmatics.service.util.SecurityUtils;
-import com.bizmatics.service.vo.DeviceAnalogVariableListExportVO;
-import com.bizmatics.service.vo.DeviceCountVO;
-import com.bizmatics.service.vo.DeviceExportVO;
+import com.bizmatics.service.vo.*;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -376,4 +377,38 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         return file.getName();
     }
 
+
+    @Override
+    public void deviceImport(MultipartFile multipartFile) throws Exception {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        ImportParams params = new ImportParams();
+        params.setHeadRows(1);
+        List<DeviceImportVo> result = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
+                DeviceImportVo.class, params);
+        if (result.size()>0){
+            for (int i = 0; i < result.size(); i++) {
+                Device device = new Device();
+                DeviceStatus deviceStatus = new DeviceStatus();;
+                device.setDeviceCode(result.get(i).getDeviceCode());
+                device.setDeviceName(result.get(i).getDeviceName());
+                device.setFloor(result.get(i).getFloor());
+                device.setSiteId(result.get(i).getSiteId());
+                device.setDeviceAddress(result.get(i).getDeviceAddress());
+                device.setDeviceType(result.get(i).getDeviceType());
+                device.setSim(result.get(i).getSim());
+                device.setEnable(1);
+                device.setCreator(user.getUserName());
+                device.setInstallTime(new Date());
+                this.save(device);
+                String deviceCode = device.getDeviceCode();
+                Integer siteId = device.getSiteId();
+                deviceStatus.setDeviceStatus(1);
+                deviceStatus.setDeviceCode(deviceCode);
+                deviceStatus.setStatusTime(new Date());
+                deviceStatus.setSiteId(siteId);
+                deviceStatusService.save(deviceStatus);
+            }
+        }
+    }
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsWorkOrderServiceImpl.java

@@ -1,19 +1,32 @@
 package com.bizmatics.service.impl;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.exception.BusinessException;
+import com.bizmatics.common.core.util.BeanMapperUtils;
+import com.bizmatics.common.core.util.FileUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.common.spring.util.GlobalUtils;
 import com.bizmatics.model.*;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.*;
 import com.bizmatics.persistence.mapper.DevopsWorkOrderMapper;
 import com.bizmatics.service.*;
 import com.bizmatics.service.util.SecurityUtils;
+import com.bizmatics.service.vo.DeviceExportVO;
+import com.bizmatics.service.vo.ProcessingTimeExportVO;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -629,7 +642,6 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
     @Override
     public CommonPage<ProcessingTimeVo> workloadStatisticsLits(Integer siteId,String startTime,String endTime,Integer size , Integer current){
         List<ProcessingTime> processingTimeList = baseMapper.workloadStatisticsLits(siteId, startTime, endTime);
-
         LambdaQueryWrapper<PatrolInspectors> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectors::getStatus, 1);
         List<PatrolInspectors> patrolInspectorsList =  patrolInspectorsService.list(queryWrapper);
@@ -697,4 +709,101 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
         return new CommonPage<>(Active1, processingTimeVoList1.size(), size, current);
     }
 
+    @Override
+    public String workloadStatisticsExport(Integer siteId,String startTime,String endTime){
+        Workbook workbook = null;
+        File file = null;
+        try {
+            ExportParams params = new ExportParams(null, "工作量统计");
+            workbook = ExcelExportUtil.exportBigExcel(params, ProcessingTimeExportVO.class,
+                    (o, i) -> {
+                        List<ProcessingTime> processingTimeList = baseMapper.workloadStatisticsLits(siteId, startTime, endTime);
+                        LambdaQueryWrapper<PatrolInspectors> queryWrapper = Wrappers.lambdaQuery();
+                        queryWrapper.eq(PatrolInspectors::getStatus, 1);
+                        List<PatrolInspectors> patrolInspectorsList =  patrolInspectorsService.list(queryWrapper);
+                        List<ProcessingTimeVo> Active1 = new ArrayList<ProcessingTimeVo>(); // 存放页面需要展示的数据
+                        List<ProcessingTimeVo> processingTimeVoList1 = new ArrayList<>();
+                        if (patrolInspectorsList.size()>0){
+                            for (int k = 0; k < patrolInspectorsList.size(); k++) {
+                                ProcessingTimeVo processingTimeVo1 = new ProcessingTimeVo();
+                                Map<String, Object> map = new HashMap<>();
+                                Integer orderQuantity = 0;
+                                Integer completedQuantity = 0;
+                                Integer incomplete = 0;
+                                Integer responseTime = 0;
+                                Integer processingTime = 0;
+                                if (processingTimeList.size()>0){
+                                    for (Integer j = 0; j < processingTimeList.size(); j++) {
+                                        if (patrolInspectorsList.get(k).getId()==processingTimeList.get(j).getId()){
+                                            switch (processingTimeList.get(j).getWorkOrderStatus()) {
+                                                case 4:
+                                                    orderQuantity += processingTimeList.get(j).getCount();
+                                                    incomplete += processingTimeList.get(j).getCount();
+                                                    break;
+                                                case 5:
+                                                    incomplete += processingTimeList.get(j).getCount();
+                                                    orderQuantity += processingTimeList.get(j).getCount();
+                                                    break;
+                                                case 6:
+                                                    orderQuantity += processingTimeList.get(j).getCount();
+                                                    completedQuantity += processingTimeList.get(j).getCount();
+                                                    processingTime=processingTimeList.get(j).getProcessingTime();
+                                                    break;
+                                                default:
+                                            }
+                                        }
+                                    }
+
+                                    processingTimeVo1.setId(patrolInspectorsList.get(k).getId());
+                                    processingTimeVo1.setInspectorsName(patrolInspectorsList.get(k).getInspectorsName());
+                                    processingTimeVo1.setOrderQuantity(orderQuantity);
+                                    processingTimeVo1.setCompletedQuantity(completedQuantity);
+                                    processingTimeVo1.setIncomplete(incomplete);
+                                    processingTimeVo1.setResponseTime(responseTime);
+                                    processingTimeVo1.setProcessingTime(processingTime);
+                                    processingTimeVo1.setTestimonials("");
+                                }else {
+                                    processingTimeVo1.setId(patrolInspectorsList.get(k).getId());
+                                    processingTimeVo1.setInspectorsName(patrolInspectorsList.get(k).getInspectorsName());
+                                    processingTimeVo1.setOrderQuantity(orderQuantity);
+                                    processingTimeVo1.setCompletedQuantity(completedQuantity);
+                                    processingTimeVo1.setIncomplete(incomplete);
+                                    processingTimeVo1.setResponseTime(responseTime);
+                                    processingTimeVo1.setProcessingTime(processingTime);
+                                    processingTimeVo1.setTestimonials("");
+                                }
+
+                                processingTimeVoList1.add(processingTimeVo1);
+                            }
+                            int currIdx = (i > 1 ? (i -1) * 30: 0);
+                            for (int j = 0; j < 30 && j < processingTimeVoList1.size() - currIdx; j++) { // 判断条件十分巧妙，防止List取值越界
+                                ProcessingTimeVo active = processingTimeVoList1.get(currIdx + j);
+                                Active1.add(active);
+                            }
+                        }
+                        return new ArrayList<>(BeanMapperUtils.mapList(Active1, ProcessingTimeVo.class, ProcessingTimeExportVO.class));
+                    }, null);
+            if (null != workbook) {
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "工作量统计", System.currentTimeMillis() + ""));
+                FileUtils.createFile(file.getAbsolutePath());
+                FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
+                workbook.write(allListingFileOutputStream);
+            } else {
+                throw new BusinessException("表格数据为空");
+            }
+        } catch (Exception e) {
+            log.error("导出文件失败", e);
+            throw new BusinessException("导出文件失败");
+        } finally {
+            if (workbook != null) {
+                try {
+                    workbook.close();
+                } catch (IOException e) {
+                    log.error("===export spec=== 关闭workbook失败", e);
+                }
+            }
+        }
+        return file.getName();
+    }
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -374,7 +374,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                             if (fiied.equals("dataTime")){
                                 map.put(fiied,fields[i].get(htAnalogDataVo));
                             }else {
-                                map.put(htAnalogDataVo.getDeviceName()+"_"+fiied,fields[i].get(htAnalogDataVo));
+                                map.put(fields[2].get(htAnalogDataVo)+"_"+fiied,fields[i].get(htAnalogDataVo));
                             }
                         }catch (Exception e){
 

fiveep-service/src/main/java/com/bizmatics/service/impl/SitedtlServiceImpl.java

@@ -1,7 +1,14 @@
 package com.bizmatics.service.impl;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.exception.BusinessException;
+import com.bizmatics.common.core.util.BeanMapperUtils;
+import com.bizmatics.common.core.util.FileUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.common.spring.util.GlobalUtils;
 import com.bizmatics.model.SiteArchives;
 import com.bizmatics.model.Sitedtl;
 import com.bizmatics.model.system.SysUser;
@@ -10,11 +17,16 @@ import com.bizmatics.model.vo.SitedtlVo;
 import com.bizmatics.persistence.mapper.SitedtlMapper;
 import com.bizmatics.service.SiteArchivesService;
 import com.bizmatics.service.SitedtlService;
-import com.bizmatics.service.es.RtAnalogService;
 import com.bizmatics.service.util.SecurityUtils;
+import com.bizmatics.service.vo.SitedtlExportVO;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -31,7 +43,7 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
     private SiteArchivesService siteArchivesService;
 
     @Override
-    public void sitedtlAdd(SitedtlArchivesVo sitedtlArchivesVo){
+    public void sitedtlAdd(SitedtlArchivesVo sitedtlArchivesVo) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Sitedtl sitedtl = sitedtlArchivesVo.getSitedtl();
         SiteArchives siteArchives = sitedtlArchivesVo.getSiteArchives();
@@ -43,20 +55,55 @@ public class SitedtlServiceImpl extends AbstractCrudService<SitedtlMapper, Sited
         siteArchivesService.save(siteArchives);
     }
 
-    public void sitedtlUpdate(SitedtlArchivesVo sitedtlArchivesVo){
+    public void sitedtlUpdate(SitedtlArchivesVo sitedtlArchivesVo) {
         this.updateById(sitedtlArchivesVo.getSitedtl());
         siteArchivesService.updateById(sitedtlArchivesVo.getSiteArchives());
     }
 
-    public CommonPage<SitedtlVo> sitedtlList(Integer siteId,String electricTestOverdue,Integer size , Integer current){
-        List<SitedtlVo> sitedtlList = baseMapper.sitedtlVoList(siteId,electricTestOverdue,null,null);
+    public CommonPage<SitedtlVo> sitedtlList(Integer siteId, String electricTestOverdue, Integer size, Integer current) {
+        List<SitedtlVo> sitedtlList = baseMapper.sitedtlVoList(siteId, electricTestOverdue, null, null);
         int total = 0;
-        if (sitedtlList.size()>0){
+        if (sitedtlList.size() > 0) {
             total = sitedtlList.size();
         }
 
         int startCurrent = (current - 1) * size;
-        List<SitedtlVo> sitedtlListOne = baseMapper.sitedtlVoList(siteId,electricTestOverdue,startCurrent,size);
+        List<SitedtlVo> sitedtlListOne = baseMapper.sitedtlVoList(siteId, electricTestOverdue, startCurrent, size);
         return new CommonPage<>(sitedtlListOne, total, size, current);
     }
+
+    @Override
+    public String variableListExport(Integer siteId, String electricTestOverdue) {
+        Workbook workbook = null;
+        File file = null;
+        try {
+            ExportParams params = new ExportParams(null, "现场档案");
+            workbook = ExcelExportUtil.exportBigExcel(params, SitedtlExportVO.class,
+                    (o, i) -> {
+                        Page<SitedtlVo> page = new Page<>(i, 30);
+                        page = baseMapper.sitedtlVoListOne(page, siteId, electricTestOverdue, null, null);
+                        return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), SitedtlVo.class, SitedtlExportVO.class));
+                    }, null);
+            if (null != workbook) {
+                file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "现场档案", System.currentTimeMillis() + ""));
+                FileUtils.createFile(file.getAbsolutePath());
+                FileOutputStream allListingFileOutputStream = new FileOutputStream(file);
+                workbook.write(allListingFileOutputStream);
+            } else {
+                throw new BusinessException("表格数据为空");
+            }
+        } catch (Exception e) {
+            log.error("导出文件失败", e);
+            throw new BusinessException("导出文件失败");
+        } finally {
+            if (workbook != null) {
+                try {
+                    workbook.close();
+                } catch (IOException e) {
+                    log.error("===export spec=== 关闭workbook失败", e);
+                }
+            }
+        }
+        return file.getName();
+    }
 }

fiveep-service/src/main/java/com/bizmatics/service/vo/DeviceAnalogVariableListImport.java

@@ -0,0 +1,82 @@
+package com.bizmatics.service.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备变量列表
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-24
+ */
+@Data
+public class DeviceAnalogVariableListImport{
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号")
+    private String deviceCode;
+
+    /**
+     * 变量名
+     */
+    @Excel(name = "变量名")
+    private String variableName;
+
+    /**
+     * 变量编码
+     */
+    @Excel(name = "变量编码")
+    private String variableCoding;
+
+    /**
+     * 监控设备
+     */
+    @Excel(name = "监控设备ID")
+    private Integer monitoringEquipment;
+
+    /**
+     * 通信设备
+     */
+    @Excel(name = "通信设备ID")
+    private Integer communicationEquipment;
+
+    /**
+     * 数据地址
+     */
+    @Excel(name = "数据地址")
+    private String dataAddress;
+
+    /**
+     * 数据类型
+     */
+    @Excel(name = "数据类型")
+    private String dataType;
+
+    /**
+     * 系数
+     */
+    @Excel(name = "系数")
+    private Float coefficient;
+
+    /**
+     * 存盘周期（分钟）
+     */
+    @Excel(name = "存盘周期")
+    private Integer saveCycle;
+
+    /**
+     * 1.模拟量 2.状态量 3.参数量
+     */
+    @Excel(name = "变量类型")
+    private Integer dataArea;
+}

fiveep-service/src/main/java/com/bizmatics/service/vo/DeviceAttributeImportVo.java

@@ -0,0 +1,65 @@
+package com.bizmatics.service.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备属性
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-26
+ */
+@Data
+public class DeviceAttributeImportVo{
+    /**
+     * 监控设备编号
+     */
+    @Excel(name = "监控设备编号")
+    private String monitorDeviceCode;
+    /**
+     * 监控设备名称
+     */
+    @Excel(name = "监控设备名称")
+    private String monitorDeviceName;
+    /**
+     * 回路表计地址
+     */
+    @Excel(name = "回路表计地址")
+    private Integer loopMeterAddress;
+    /**
+     * 额定电压（kv）
+     */
+    @Excel(name = "额定电压")
+    private Double ratedVoltage;
+
+    /**
+     * 额定电流（A）
+     */
+    @Excel(name = "额定电流")
+    private Double ratedCurrent;
+    /**
+     * 电流负载率门限
+     */
+    @Excel(name = "电流负载率门限")
+    private Double currentLoadRate;
+    /**
+     * 站点ID
+     */
+    @Excel(name = "站点ID")
+    private Integer siteId;
+    /**
+     * 电能质量分析
+     */
+    @Excel(name = "电能质量分析")
+    private String qualityAnalysis;
+
+}

fiveep-service/src/main/java/com/bizmatics/service/vo/DeviceImportVo.java

@@ -0,0 +1,65 @@
+package com.bizmatics.service.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+public class DeviceImportVo{
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号")
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /**
+     * 楼层
+     */
+    @Excel(name = "楼层")
+    private String floor;
+    /**
+     * 所属站点
+     */
+    @Excel(name = "所属站点ID")
+    private Integer siteId;
+
+    /**
+     * 设备安装位置
+     */
+    @Excel(name = "设备安装位置")
+    private String deviceAddress;
+
+    /**
+     * 1：183用电设备，2：视频监控设备，3：171用电设备，4：173用电设备，5：158智能网关，6：其他
+     */
+    @Excel(name = "设备类型")
+    private String deviceType;
+
+    /**
+     * sim卡号
+     */
+    @Excel(name = "sim卡号")
+    private String sim;
+
+}

fiveep-service/src/main/java/com/bizmatics/service/vo/ProcessingTimeExportVO.java

@@ -0,0 +1,62 @@
+package com.bizmatics.service.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/7/13 16:21
+ */
+@Data
+public class ProcessingTimeExportVO {
+    /**
+     * 人员表ID
+     */
+    private Integer id;
+
+    /**
+     * 人员名称
+     */
+    @Excel(name = "人员名称", height = 6, width = 20)
+    private String inspectorsName;
+
+    /**
+     * 接单量
+     */
+    @Excel(name = "接单量", height = 6, width = 20)
+    private Integer orderQuantity;
+
+    /**
+     * 完单量
+     */
+    @Excel(name = "完单量", height = 6, width = 20)
+    private Integer completedQuantity;
+
+    /**
+     * 未完成
+     */
+    @Excel(name = "未完成", height = 6, width = 20)
+    private Integer incomplete;
+
+    /**
+     * 响应时间/小时
+     */
+    @Excel(name = "响应时间/小时", height = 6, width = 20)
+    private Integer responseTime;
+
+    /**
+     * 处理时间/小时
+     */
+    @Excel(name = "处理时间/小时", height = 6, width = 20)
+    private Integer processingTime;
+
+    /**
+     * 客户评价
+     */
+    @Excel(name = "客户评价", height = 6, width = 20)
+    private String testimonials;
+}

fiveep-service/src/main/java/com/bizmatics/service/vo/SitedtlExportVO.java

@@ -0,0 +1,189 @@
+package com.bizmatics.service.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/7/13 16:21
+ */
+@Data
+public class SitedtlExportVO {
+    /**
+     * 站点详细信息表ID
+     */
+    private Integer id;
+
+    /**
+     * 户号
+     */
+    @Excel(name = "户号", height = 6, width = 20)
+    private String accountNumber;
+
+    /**
+     * 流变变化
+     */
+    @Excel(name = "流变变化", height = 6, width = 20)
+    private String rheologicalChange;
+
+    /**
+     * 单路电源容量
+     */
+    @Excel(name = "单路电源容量", height = 6, width = 20)
+    private Integer powerCapacity;
+
+    /**
+     * 所属线路
+     */
+    @Excel(name = "线路", height = 6, width = 20)
+    private String routeName;
+
+    /**
+     * 所属站点
+     */
+    @Excel(name = "站点", height = 6, width = 20)
+    private String siteName;
+
+    /**
+     * 所属监察
+     */
+    @Excel(name = "监察人", height = 6, width = 20)
+    private String supervisionName;
+
+    /**
+     * 电缆孔洞（0 否，1 是）
+     */
+    @Excel(name = "电缆孔洞", height = 6, width = 20)
+    private Boolean cableHole;
+
+    /**
+     * 门窗墙壁破损（0 否，1 是）
+     */
+    @Excel(name = "门窗墙壁破损", height = 6, width = 20)
+    private Boolean damage;
+
+    /**
+     * 屋顶、墙壁渗漏水（0 否，1 是）
+     */
+    @Excel(name = "屋顶、墙壁渗漏水", height = 6, width = 20)
+    private Boolean waterLeakage;
+
+    /**
+     * 灭火器配置不足（0 否，1 是）
+     */
+    @Excel(name = "灭火器配置不足", height = 6, width = 20)
+    private Boolean annihilatorInsufficientConfiguration;
+
+    /**
+     * 灭火器超期（时间）
+     */
+    @Excel(name = "灭火器超期（时间）", height = 6, width = 20)
+    private String annihilatorOverdue;
+
+    /**
+     * 缺失门挡板（0 否，1 是）
+     */
+    @Excel(name = "缺失门挡板", height = 6, width = 20)
+    private Boolean doorBaffle;
+
+    /**
+     * 堆放杂物（0 否，1 是）
+     */
+    @Excel(name = "堆放杂物", height = 6, width = 20)
+    private Boolean pileUpSundries;
+
+    /**
+     * 积灰严重（0 否，1 是）
+     */
+    @Excel(name = "积灰严重", height = 6, width = 20)
+    private Boolean seriousAshDeposition;
+
+    /**
+     * 配电房周围环境潮湿（0 否，1 是）
+     */
+    @Excel(name = "配电房周围环境潮湿", height = 6, width = 20)
+    private Boolean aroundEnvironmentHumid;
+
+    /**
+     * 配电房周围堆放杂物（0 否，1 是）
+     */
+    @Excel(name = "配电房周围堆放杂物", height = 6, width = 20)
+    private Boolean aroundPileUpSundries;
+
+    /**
+     * 无电工（0 否，1是）
+     */
+    @Excel(name = "无电工（0 否，1是）", height = 6, width = 20)
+    private Boolean noElectrician;
+
+    /**
+     * 电工人数配置不足（0 否，1 是）
+     */
+    @Excel(name = "电工人数配置不足", height = 6, width = 20)
+    private Boolean electricianLack;
+
+    /**
+     * 电工证超期（0 否，1 是）
+     */
+    @Excel(name = "电工证超期", height = 6, width = 20)
+    private Boolean overdueElectricianCertificate;
+
+    /**
+     * 电试超期（标明电试日期）
+     */
+    @Excel(name = "电试超期（标明电试日期）", height = 6, width = 20)
+    private String electricTestOverdue;
+
+    /**
+     * 高压柜年份
+     */
+    @Excel(name = "高压柜年份", height = 6, width = 20)
+    private String highVoltageCabinet;
+
+    /**
+     * 变压器年份（标明出厂或投运日期）
+     */
+    @Excel(name = "变压器年份（标明出厂或投运日期）", height = 6, width = 20)
+    private String oldEquipment;
+
+    /**
+     * 带电显示器损坏（0 否  1 是）
+     */
+    @Excel(name = "带电显示器损坏", height = 6, width = 20)
+    private Boolean chargedDisplay;
+
+    /**
+     * 缺失照明（0 否 ，1 是）
+     */
+    @Excel(name = "缺失照明", height = 6, width = 20)
+    private Boolean lighting;
+
+    /**
+     * 绝缘毯配置不足（0 否，1 是）
+     */
+    @Excel(name = "绝缘毯配置不足", height = 6, width = 20)
+    private Boolean blanketInsufficientConfiguration;
+
+    /**
+     * 接地线与存放位置（0 否，1 是）
+     */
+    @Excel(name = "接地线与存放位置", height = 6, width = 20)
+    private Boolean groundWire;
+
+    /**
+     * 模拟屏（0 否，1是）
+     */
+    @Excel(name = "模拟屏", height = 6, width = 20)
+    private Boolean analogScreen;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", height = 6, width = 20)
+    private String remarks;
+
+}