优化转换任务

single-matter/src/main/java/com/mortals/xhx/daemon/task/MatterDatumConvertTaskImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.framework.util.HttpUtil;
@@ -59,7 +61,9 @@ public class MatterDatumConvertTaskImpl implements ITaskExcuteService {
         log.info("事项材料处理...");
         SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
         siteMatterQuery.setIsConvert(0);
-        List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(siteMatterQuery);
+        PageInfo pageInfo = new PageInfo();
+        Result<SiteMatterEntity> resultList = siteMatterService.find(siteMatterQuery,pageInfo,null);
+        List<SiteMatterEntity> siteMatterEntities = resultList.getList();
         if(CollectionUtils.isNotEmpty(siteMatterEntities)){
             List<Long> matterIds = new ArrayList<>();
             for(SiteMatterEntity siteMatterEntity:siteMatterEntities){
@@ -71,6 +75,7 @@ public class MatterDatumConvertTaskImpl implements ITaskExcuteService {
 
             if(CollectionUtils.isNotEmpty(matterDatumEntityList)){
                 List<Long> convertIdList = new ArrayList<>();
+                List<Long> errorConvertIdList = new ArrayList<>();
                 for(MatterDatumEntity datumEntity:matterDatumEntityList){
                     MatterDatumFileQuery fileQuery = new MatterDatumFileQuery();
                     fileQuery.setDatumId(datumEntity.getId());
@@ -98,6 +103,7 @@ public class MatterDatumConvertTaskImpl implements ITaskExcuteService {
                                 }
                             }catch (Exception e){
                                 log.error("DatumId:"+datumFileEntity.getDatumId()+",文件下载失败...",e);
+                                errorConvertIdList.add(datumEntity.getMatterId());
                                 continue;
                             }
                             MatterDatumFileEntity update = new MatterDatumFileEntity();
@@ -130,6 +136,19 @@ public class MatterDatumConvertTaskImpl implements ITaskExcuteService {
                         log.info("站点事项已更新,id:"+matterEntity.getId());
                     }
                 }
+                if(errorConvertIdList.size()>0){
+                    SiteMatterQuery matterQuery = new SiteMatterQuery();
+                    matterQuery.setMatterIdList(errorConvertIdList);
+                    List<SiteMatterEntity> matterEntities = siteMatterService.find(matterQuery);
+                    for(SiteMatterEntity matterEntity:matterEntities){
+                        SiteMatterEntity updateEntity = new SiteMatterEntity();
+                        updateEntity.setId(matterEntity.getId());
+                        updateEntity.setIsConvert(2);        //转换失败
+                        updateEntity.setUpdateTime(new Date());
+                        siteMatterService.update(updateEntity);
+                        log.info("站点事项已更新,id:"+matterEntity.getId());
+                    }
+                }
             }
 
         }