diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java index 6ca2e68..aa0d0a5 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java @@ -89,12 +89,11 @@ public class HttpUtil { Map input = new HashMap<>(); input.put("ver", version_name); String infno = String.valueOf(type); - System.out.println("上个版本号:" + version_name); JSONObject result = null; try { - result = callBackMsgId(infno, "data", input); + result = call(infno, "data", input); } catch (Exception e) { - return null; + return new ArrayList<>(); } String filename = result.getString("filename"); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index 00cf9ed..6fd04d6 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java @@ -7,6 +7,7 @@ import com.syjiaer.clinic.server.controller.BaseController; import com.syjiaer.clinic.server.entity.social.SocialDirectory; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.service.social.SocialDirectoryService; +import com.syjiaer.clinic.server.service.social.SocialItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +31,8 @@ public class SocialDirectoryController extends BaseController { @Autowired private SocialDirectoryService socialDirectoryService; @Autowired + private SocialItemService socialItemService; + @Autowired private DictoryUtil dictoryUtil; @RequestMapping("search") @@ -57,10 +60,14 @@ public class SocialDirectoryController extends BaseController { // 处理参数为空的情况,这里假设返回一个错误结果 return error("参数 ver 不能为空"); } - Map result= null; + String version_name= null; if(type==1301||type==1302||type==1306){ - result =socialDirectoryService.download(ver, type); - return success(result); + version_name =socialDirectoryService.download(ver, type); + return success(version_name); + } + if(type==1305){ + version_name =socialItemService.download(ver); + return success(version_name); } return error("参数 type 不正确"); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index a2e6e19..c1d1391 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -53,7 +53,7 @@ public class SocialDirectoryService extends BaseService { * @param type 类型 */ @Transactional(rollbackFor = Exception.class) - public Map download(String version_name, int type) { + public String download(String version_name, int type) { Integer[] type_list = {1301, 1302, 1306}; //判断type在数组中 if (!Arrays.asList(type_list).contains(type)) { @@ -73,18 +73,16 @@ public class SocialDirectoryService extends BaseService { queryWrapper.in("code", code_list); socialDirectoryMapper.delete(queryWrapper); } - String current_version_name = insertSocialDirectorys(version_name, type, tab_list); - Map hashMap = new HashMap<>(); - hashMap.put("current_version_name", current_version_name); - hashMap.put("pre_version_name", version_name); - return hashMap; + return insertSocialDirectorys(version_name, type, tab_list); } private String insertSocialDirectorys(String version_name, int type, List tab_list) { Map title_map = dictoryUtil.getTitleMap(String.valueOf(type)); List list = new ArrayList<>(); HashMap tmp_map = new HashMap<>(); - for (String[] line_array : tab_list) { + String next_version_name=""; + for (int i=0;i tab_list = httpUtil.download(version_name, type); + public String download( String version_name) { + List tab_list = httpUtil.download(version_name, 1305); List list = new ArrayList<>(); - String value = String.valueOf(type); + String value = String.valueOf(1305); List codeList = new ArrayList<>(); - for (String[] line_array : tab_list) { + String next_version_name=""; + for (int i=0;i queryWrapper = new QueryWrapper<>(); - queryWrapper.in("social_code", codeList); - socialItemMapper.delete(queryWrapper); + socialDirectoryVersionService.setSocialDirectoryVersion(1305, version_name, next_version_name, list.size()); + if(list.isEmpty()){ + return next_version_name; + } + if(!codeList.isEmpty()){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("social_code", codeList); + socialItemMapper.delete(queryWrapper); + } + socialItemMapper.insert(list, 100); - socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size()); - return list.get(0).getVersionName(); + + return next_version_name; } }