1.基础数据-往来单位信息导出修改为导出json文件

2.删除导出记录同步删除磁盘文件

api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java

@@ -10,6 +10,7 @@ import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
 import com.glxp.api.admin.service.basic.CorpExportLogService;
 import com.glxp.api.admin.thread.BasicGenExcelService;
+import com.glxp.api.admin.thread.BasicGenJsonService;
 import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -35,6 +36,8 @@ public class CorpExportLogController {
     CorpExportLogService corpExportLogService;
     @Resource
     private BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
+    private BasicGenJsonService basicGenJsonService;;
 
     @GetMapping("/udiwms/corps/exportLog/filter")
     public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@@ -103,7 +106,7 @@ public class CorpExportLogController {
     //往来单位导出生成Excel，并创建生成记录
     @PostMapping("/udiwms/corps/importLog/export")
     public BaseResponse excelDownload(@RequestBody CorpsExportRequest corpsExportRequest) {
-        String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".xls";
+        String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".json";
         CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity();
         corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();
@@ -111,10 +114,11 @@ public class CorpExportLogController {
         corpExportLogEntity.setFilePath(fileName);
         corpExportLogEntity.setUpdateTime(new Date());
         corpExportLogEntity.setDlCount(0);
-        corpExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL);
+        corpExportLogEntity.setType(BasicProcessStatus.EXPORT_JSON);
         corpExportLogService.insertCorpExportLog(corpExportLogEntity);
-        basicGenExcelService.exportCorp(genKey, corpsExportRequest);
-        return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!");
+        //basicGenExcelService.exportCorp(genKey, corpsExportRequest);
+        basicGenJsonService.exportCorp(genKey, corpsExportRequest);
+        return ResultVOUtils.success("后台正在导出生成Json文件，请稍后刷新查看!");
     }
 
     //往来单位上传SMP，并创建生成记录

api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java

@@ -16,4 +16,12 @@ public interface CorpExportLogDao {
     boolean updateCorpExportLog(CorpExportLogEntity corpExportLogEntity);
 
     boolean deleteById(@Param("id") String id);
+
+    /**
+     * 根据ID查询文件路径
+     *
+     * @param id
+     * @return
+     */
+    String selectFilePathById(@Param("id") String id);
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java

@@ -1,9 +1,10 @@
 package com.glxp.api.admin.service.basic.impl;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.basic.CorpExportLogDao;
 import com.glxp.api.admin.entity.basic.CorpExportLogEntity;
-import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity;
 import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest;
 import com.glxp.api.admin.service.basic.CorpExportLogService;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,11 @@ public class CorpExportLogServiceImpl implements CorpExportLogService {
 
     @Override
     public boolean deleteById(String id) {
+        //删除日志同步删除磁盘文件
+        String filePath = corpExportLogDao.selectFilePathById(id);
+        if (StrUtil.isNotBlank(filePath)) {
+            FileUtil.del(filePath);
+        }
         return corpExportLogDao.deleteById(id);
     }
 }

api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml

@@ -19,6 +19,9 @@
         </where>
         ORDER BY updateTime DESC
     </select>
+    <select id="selectFilePathById" resultType="java.lang.String">
+        select filePath from basic_corps_export_log where id = #{id}
+    </select>
 
 
     <insert id="insertCorpExportLog" keyProperty="id"