2
0

2 Коммиты edbdaac6e8 ... 3ff13a968a

Автор SHA1 Сообщение Дата
  lin 3ff13a968a Merge remote-tracking branch 'origin/20210716' into 20210716 3 лет назад
  lin a2f44dd11f 安装计划 3 лет назад

+ 0 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -61,7 +61,6 @@ public class DeviceController {
             HttpServletResponse httpServletResponse
     ) {
         deviceService.getDeviceListExcel(dto, httpServletResponse);
-        //return  AjaxMessage.success("导出执行成功,请稍后在消息查看导出文件并下载。");
     }
 
 

+ 1 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ImportController.java

@@ -39,7 +39,7 @@ public class ImportController {
             @ApiParam(value = "文件") @RequestParam MultipartFile file,
             HttpServletRequest request, HttpServletResponse response
     ) {
-        //sendOperateLog(importType);
+        sendOperateLog(importType);
         importFileService.importExcel(categoryId, importType, file);
         return AjaxMessage.success();
     }

+ 0 - 6
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/excel/resolver/listener/InstallPlanListener.java

@@ -80,12 +80,6 @@ public class InstallPlanListener extends AnalysisEventListener<InstallPlanExcelD
 
 
 
-    /*@Override
-    public void onException(Exception exception, AnalysisContext context) throws Exception {
-        log.info("InstallPlanListener 解析异常:{}", JSON.toJSONString(exception));
-        // TODO: 2021/8/2 生成异常消息
-
-    }*/
 
     public List<InstallPlanExcelData> getData(){
         return list;