diff --git a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java index 3654e15..cd9f7c4 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java +++ b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java @@ -33,5 +33,6 @@ public class Constant { public static final String THEORY = "理论考试模块"; public static final String RESOURCE = "资源中心模块"; public static final String API_URL = "http://120.79.54.255:8889"; +// public static final String API_URL = "http://192.168.2.11:8889"; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java index c97fb8d..a985736 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java @@ -240,9 +240,9 @@ public class ExerciseExperimentalTraining { } catch (IOException e) { return false; } - if (resourceDataList != null) { + if(resourceDataList.size()>0){ return true; - } else { + }else { return false; } } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java index 686004d..b15f378 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java @@ -110,11 +110,8 @@ public class StuIndexController { @PostMapping("getIndexResourceCenter") public ResultEntity> getIndexResourceCenter(@RequestParam String schoolId, @RequestParam String systemOwner) { Map resourceTypeCount = null; - try { - resourceTypeCount = ResourceCenterApi.getResourceTypeCount(schoolId, systemOwner); - } catch (IOException e) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "资源中心获取资源数量异常"); - } + resourceTypeCount = ResourceCenterApi.getResourceTypeCount(schoolId, systemOwner); +// return new ResultEntity(HttpStatus.BAD_REQUEST, "资源中心获取资源数量异常"); return new ResultEntity<>(resourceTypeCount); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index a3ed4d6..2d58b1d 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -217,6 +217,7 @@ public class UserController { @AnonymousAccess public String checkOrCreateForexSimulationUser(@RequestBody List zyUserInfoList, @RequestParam String systemOwner) { + System.out.println(systemOwner); List users = new ArrayList<>(); Map map = new HashMap<>(); for (int i = 0; i < zyUserInfoList.size(); i++) { diff --git a/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java b/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java index 42b01ed..47f2d6b 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java +++ b/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Type; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -88,11 +89,19 @@ public class ResourceCenterApi { /** * 获取资源类型数量 */ - public static Map getResourceTypeCount(String schoolId ,String systemOwner) throws IOException { + public static Map getResourceTypeCount(String schoolId ,String systemOwner){ String requestBody="schoolId="+schoolId+"&systemOwner="+systemOwner; - JSONObject object = HttpUtils.sendPost( - getResourceTypeCount, - requestBody); + JSONObject object = null; + try { + object = HttpUtils.sendPost( + getResourceTypeCount, + requestBody); + } catch (IOException e) { + if(object==null){ + return new HashMap<>(); + } + e.printStackTrace(); + } Gson gson = new GsonBuilder() .registerTypeAdapter(Date.class, new DateTypeAdapter()) .create();