监控设备与变量列表导出添加2

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

@@ -118,6 +118,13 @@ public class DeviceAnalogVariableListController {
     }
 
 
+    /**
+     * 变量列表-导出
+     * @param siteId 站点ID
+     * @param variableName 变量名称
+     * @param dataArea 1.模拟量 2.状态量 3.参数量
+     * @return
+     */
     @GetMapping("variableListExport")
     public ApiResult<String> variableListExport(@RequestParam Integer siteId,
                                                 @RequestParam(required = false) String variableName,

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

@@ -21,6 +21,7 @@ import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 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.DeviceAttributeExportVO;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
@@ -120,11 +121,11 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
         File file = null;
         try {
             ExportParams params = new ExportParams(null, "变量列表");
-            workbook = ExcelExportUtil.exportBigExcel(params, DeviceAttributeExportVO.class,
+            workbook = ExcelExportUtil.exportBigExcel(params, DeviceAnalogVariableListExportVO.class,
                     (o, i) -> {
                         Page<DeviceAnalogVariableListOneVo> page = new Page<>(i, 30);
                         page = baseMapper.variableListExport(page,siteId, variableName, dataArea);
-                        return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), DeviceAnalogVariableListOneVo.class, DeviceAttributeExportVO.class));
+                        return new ArrayList<>(BeanMapperUtils.mapList(page.getRecords(), DeviceAnalogVariableListOneVo.class, DeviceAnalogVariableListExportVO.class));
                     }, null);
             if (null != workbook) {
                 file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), String.format("%s-%s.xlsx", "变量列表", System.currentTimeMillis() + ""));