修改数据

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 "湖南":
@@ -107,7 +107,15 @@ public class CollegeData {
                 break;
             case "河北":
                 /**
-                 * 河北账号：15111084970 / 002380011107，密码：45695013
+                 * 河北账号：河北	13437248803	41186990
+                 * "id":3,"provinceName":"河北" 完成
+                 */
+                currentUser = new User().setCode("13437248803").setPassword("41186990").setIsHn(false).setIsNewGaokao(true).setProvinceName(processProvinceName);
+
+                break;
+            case "江苏":
+                /**
+                 * 江苏账号：15111084970 / 002380011107，密码：45695013
                  * "id":3,"provinceName":"河北" 完成
                  */
                 currentUser = new User().setCode("15111084970").setPassword("45695013").setIsHn(false).setIsNewGaokao(true).setProvinceName(processProvinceName);
@@ -158,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 = 1;
+        int count = 0, total = 5000, page = 35;
         JSONObject res=new JSONObject();
         do {
             try {
@@ -186,9 +194,10 @@ public class CollegeData {
                      * 选科数据 xuanke(collegeId);
                      */
                     List<Integer> colledgeIds = Arrays.asList(
-                            2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266,2267,2268,2269);
+                            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){
@@ -209,22 +218,22 @@ public class CollegeData {
                              * 院校录取数据：新高考
                              */
                             for(Integer type:typeList){
-//                                byHistoryNew(collegeId,liberalScience,type,Location,ProvinceId);
+                                byHistoryNew(collegeId,liberalScience,type,Location,ProvinceId);
                             }
                         }else {
                             /**
                              * 院校录取数据：非新高考
                              * type 类型，普通省份(非新高考)不传或传1
                              */
-//                            byHistoryNew(collegeId,liberalScience,1,Location,ProvinceId);
+                            byHistoryNew(collegeId,liberalScience,1,Location,ProvinceId);
                         }
 
 
                         /**
                          * 专业录取数据
                          */
-//                        ThreadUtil.safeSleep(2 * 1000);
-//                        byCollege(collegeId,collegeName,liberalScience,2,Location,ProvinceId,provinceData);
+                        ThreadUtil.safeSleep(2 * 1000);
+                        byCollege(collegeId,collegeName,liberalScience,2,Location,ProvinceId,provinceData);
                         /**
                          * 招生计划数据
                          */
@@ -345,6 +354,9 @@ public class CollegeData {
             for (int i = 0; i < tdDatas.size(); i++) {
                 //sy_colledge_enroll_data
                 JSONObject row = tdDatas.getJSONObject(i);
+                if(row.getInteger("Year")!=2022){
+//                    continue;
+                }
                 row.put("Location",Location);
                 row.put("type",type);
                 row.put("font_id",fontId);
@@ -354,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");
+                Entity subjectTable4 = Entity.create("sy_colledge_enroll_data_js");
                 subjectTable4.putAll(row);
                 subjectList.add(subjectTable4);
                 if(!isBatchInsert){
@@ -428,18 +440,20 @@ public class CollegeData {
 //                dataJSONObject.put("id",yearLast);
 //                dataJSONObject.put("year",yearLast);
 //                Integer year = dataJSONObject.getInteger("year");
-            List<Integer> yearList = Arrays.asList(2022);
+            List<Integer> yearList = Arrays.asList(2022,2021,2020);
 //            List<Integer> yearList = Arrays.asList(2021);
             for(int year:yearList){
                 sb = new StringBuilder(host);
                 if(queryType==2){
-                    if(year==Calendar.getInstance().getWeekYear()){
+                    if(year==2022){
 //                        continue;//当前年份无专业录取数据
                     }
                     sb.append("/query/majorScore/byCollege");
                 }else if(queryType==3){
                     sb.append("/query/majorPlan/byCollege");
-
+                    if(year==2021){
+//                        continue;
+                    }
                 }
                 sb.append("?provinceId=").append(ProvinceId);
                 sb.append("&collegeId=").append(collegeId);
@@ -504,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";
+                            tableName = "sy_colledge_enroll_major_data_js";
                         }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_hebei";
+                            tableName = "sy_colledge_recruit_data_2022_js";
                         }
                         Entity subjectTable4 = Entity.create(tableName);
                         subjectTable4.putAll(row);