diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java index 89e5b73c5..111f2f5e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.exception.JeroBootException; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectYearNameInfoEO; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -37,7 +36,7 @@ public class SpaceJobHandler implements Job { @Autowired private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService; - /*String jsonData = "{\n" + + String jsonData = "{\n" + " \"resultData\": [\n" + " {\n" + " \"modelCode\": \"ES8_00\",\n" + @@ -196,13 +195,13 @@ public class SpaceJobHandler implements Job { " ],\n" + " \"resultCode\": \"WL-0000\",\n" + " \"resultDesc\": \"Success\"\n" + - "}";*/ + "}"; @Override public void execute(JobExecutionContext context) throws JobExecutionException { - String jsonData =""; +// String jsonData =""; try { - jsonData = spaceService.getSign(); + // jsonData = spaceService.getSign(); if(StringUtils.isNotBlank(jsonData)) { JSONObject result = (JSONObject) JSON.parse(jsonData); @@ -273,30 +272,24 @@ public class SpaceJobHandler implements Job { List yearNameDataList = yearNameInfoDataList.stream().filter(e -> e.getProjectNameId().equals(nameInfoId)).map(e -> e.getYearName()).collect(Collectors.toList()); //获得不同年款 - yearNameList.remove(yearNameDataList); + for(String yearNameData : yearNameDataList) { + yearNameList.remove(yearNameData); + } if(yearNameList.size()>0){//存在不同年款 List diffYearNameList = new ArrayList<>(); for (ProjectYearNameInfoEO projectYearNameInfoEO: yearNameInfoEOList) { - if(! yearNameList.contains(projectYearNameInfoEO.getYearName())) { + if( yearNameList.contains(projectYearNameInfoEO.getYearName())) { diffYearNameList.add(projectYearNameInfoEO); } } - projectYearNameInfoEOService.saveBatch(yearNameInfoDataList); + projectYearNameInfoEOService.saveBatch(diffYearNameList); + log.error("从Space获取项目名称相关数据,成功保存"); } } -// if(CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("从Space获取项目名称相关数据,成功保存"); -// }else{ -// throw new JeroBootException("Get the data related to the project name from Space and save it successfully."); -// } } }else{ -// if(CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("从Space获取项目名称相关数据为空"); -// }else{ -// throw new JeroBootException("Data related to obtaining project name from Space is empty."); -// } + log.error("从Space获取项目名称相关数据为空"); } } catch (Exception e) { e.printStackTrace();