Merge branch 'feature-dispatch-zx' into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/ExtractServiceImpl.java

@@ -83,7 +83,7 @@ public class ExtractServiceImpl implements ExtractService {
      */
      */
     @Transactional
     @Transactional
     @Override
     @Override
-    public void saveSolutionToDispatch(String groupId, String batchNo, DispatchSolution solution) throws RuntimeException, IOException {
+    public void saveSolutionToDispatch(String groupId, String batchNo, DispatchSolution solution) throws RuntimeException {
         log.info("算法结果回写dispatch, groupId:{}, batchNo:{}", groupId, batchNo);
         log.info("算法结果回写dispatch, groupId:{}, batchNo:{}", groupId, batchNo);
         // 清理当前批次指派结果
         // 清理当前批次指派结果
 
 
@@ -139,8 +139,12 @@ public class ExtractServiceImpl implements ExtractService {
         String fileName = String.format("dispatchSolution-%s-%s.json", groupId, batchNo);
         String fileName = String.format("dispatchSolution-%s-%s.json", groupId, batchNo);
         File tempFile = new File(fileName);
         File tempFile = new File(fileName);
         exporter.write(solution, tempFile);
         exporter.write(solution, tempFile);
-        String dispatchResultJson = FileUtil.readAsString(tempFile);
-
+        String dispatchResultJson = "{}";
+        try {
+            dispatchResultJson = FileUtil.readAsString(tempFile);
+        } catch (IOException e) {
+            log.error("json算法结果回写 error , groupId:{}, batchNo:{} ", groupId, batchNo, e);
+        }
 
 
         Object[] paramBatch = {LocalDateTime.now(), dispatchResultJson, groupId, batchNo};
         Object[] paramBatch = {LocalDateTime.now(), dispatchResultJson, groupId, batchNo};
         jdbcTemplate.update(" update dispatch_batch set status='DONE', end_time=? , ext=?  where group_id=? and batch_no=? ", paramBatch);
         jdbcTemplate.update(" update dispatch_batch set status='DONE', end_time=? , ext=?  where group_id=? and batch_no=? ", paramBatch);