上传

src/test/java/spider/CollegeData.java

@@ -58,7 +58,7 @@ public class CollegeData {
             JSONObject jsonObject = (JSONObject)ll;
             provinceMap.put(jsonObject.getString("provinceName"),JSONObject.parseObject(JSONObject.toJSONString(jsonObject),ProvinceData.class));
         });
-        String processProvinceName= "江苏";
+        String processProvinceName= "山西";
         User currentUser = new User();
         switch (processProvinceName){
             case "湖南":
@@ -166,7 +166,7 @@ public class CollegeData {
 //        int count = 0, total = 5000, page = 79;
         Integer ProvinceId=provinceData.getId();
         String Location=provinceData.getProvinceName();//湖北的1-5页之前需要修正ProvinceId,表示学校所在省份
-        int count = 0, total = 5000, page = 35;
+        int count = 0, total = 5000, page = 1;
         JSONObject res=new JSONObject();
         do {
             try {
@@ -197,7 +197,7 @@ public class CollegeData {
                             739,2892,977,48,2749,2487,1920,1261,1084,727,162,1538,1547);
 //                            473,476,477,478,479,480,481,482,483,484,485,486,487);
                     if(colledgeIds.contains(collegeId)){
-                        continue;
+//                        continue;
                     }
                     if("湖南".equalsIgnoreCase(provinceData.getProvinceName())){
                         if(processColledgeCount>5){
@@ -355,7 +355,7 @@ public class CollegeData {
                 //sy_colledge_enroll_data
                 JSONObject row = tdDatas.getJSONObject(i);
                 if(row.getInteger("Year")!=2022){
-//                    continue;
+                    continue;
                 }
                 row.put("Location",Location);
                 row.put("type",type);
@@ -366,7 +366,7 @@ public class CollegeData {
                 replaceEncryptDate(fontId,row,thDatasArray);
                 row.put("LiberalScienceType",liberalScienceMap.get(row.getInteger("LiberalScience")));
 
-                Entity subjectTable4 = Entity.create("sy_colledge_enroll_data_js");
+                Entity subjectTable4 = Entity.create("sy_colledge_enroll_data_sxgz_1");
                 subjectTable4.putAll(row);
                 subjectList.add(subjectTable4);
                 if(!isBatchInsert){
@@ -440,20 +440,20 @@ public class CollegeData {
 //                dataJSONObject.put("id",yearLast);
 //                dataJSONObject.put("year",yearLast);
 //                Integer year = dataJSONObject.getInteger("year");
-            List<Integer> yearList = Arrays.asList(2022,2021,2020);
-//            List<Integer> yearList = Arrays.asList(2021);
+//            List<Integer> yearList = Arrays.asList(2022,2021,2020);
+            List<Integer> yearList = Arrays.asList(2021,2022);
+            sb = new StringBuilder(host);
             for(int year:yearList){
-                sb = new StringBuilder(host);
                 if(queryType==2){
-                    if(year==2022){
-//                        continue;//当前年份无专业录取数据
+                    if(year!=2021){
+                        continue;//当前年份无专业录取数据
                     }
                     sb.append("/query/majorScore/byCollege");
                 }else if(queryType==3){
-                    sb.append("/query/majorPlan/byCollege");
-                    if(year==2021){
-//                        continue;
+                    if(year!=2022){
+                        continue;
                     }
+                    sb.append("/query/majorPlan/byCollege");
                 }
                 sb.append("?provinceId=").append(ProvinceId);
                 sb.append("&collegeId=").append(collegeId);
@@ -518,11 +518,11 @@ public class CollegeData {
                         String tableName = StringUtils.EMPTY;
                         if(queryType==2){
                             row.put("LiberalScienceType",liberalScienceMap.get(row.getInteger("LiberalScience")));
-                            tableName = "sy_colledge_enroll_major_data_js";
+                            tableName = "sy_colledge_enroll_major_data_sxgz_1";
                         }else if(queryType==3){
 //                            tableName = "sy_colledge_recruit_data_"+year+"_"+provinceData.getProvinceSpell();
                             row.put("LiberalScienceType",liberalScienceMap.get(row.getInteger("Liberalscience")));
-                            tableName = "sy_colledge_recruit_data_2022_js";
+                            tableName = "sy_colledge_recruit_data_sxgz_1";
                         }
                         Entity subjectTable4 = Entity.create(tableName);
                         subjectTable4.putAll(row);

src/test/java/spider/YouZy.java

@@ -31,9 +31,11 @@ public class YouZy {
 
     @Test
     public void test() throws Exception {
+        //院校排名
+        getUniversityRanking();
         //高校
 //        getUniversityList();
-        getMajorData();
+//        getMajorData();
 //        processVocationalHotAndLack();
         /**
          * 职业库三级树、职业概况、就业岗位
@@ -803,6 +805,9 @@ public class YouZy {
                 for (Object aa : result) {
                     JSONObject param = (JSONObject) aa;
                     Integer year = param.getInteger("year");
+                    if(year!=2023){
+                        continue;
+                    }
                     JSONArray rankTypes = param.getJSONArray("rankTypes");
 
                     for (Object rankType : rankTypes) {