更新

src/main/java/com/chuanghai/student_portrait/controller/GetSchoolUserController.java

@@ -98,9 +98,9 @@ public class GetSchoolUserController {
 
 //    获取组织架构
     @GetMapping("/get")
-//    @Scheduled(cron = "0 22 11 * * ? ")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public Map get() {
-        String token = this.token();
+        String token = token();
         System.out.println("token = " + token);
         String url = "https://open.wecard.qq.com/cgi-bin/user/org-edu-list";
         Map<String, String> param = new HashMap<>();
@@ -120,11 +120,12 @@ public class GetSchoolUserController {
         String encodeName = URLEncoder.encode("\u5b66\u751f","utf-8");
         System.out.println("encodeName = " + encodeName);
     }
+
     //获取组织架构成员
     @GetMapping("/list")
     @DSTransactional
     public List<String> getMessong(Integer page) throws JsonProcessingException {
-        String token = this.token();
+        String token = token();
         String url = "https://open.wecard.qq.com/cgi-bin/user/get-org-users";
         Map<String, Object> param = new HashMap<>();
         ObjectMapper mapper = new ObjectMapper();
@@ -155,7 +156,7 @@ public class GetSchoolUserController {
 
     @GetMapping
     public Boolean a(Integer page) throws JsonProcessingException {
-        List<String> messong = this.getMessong(page);
+        List<String> messong = getMessong(page);
         String token = this.token();
         System.out.println("token = " + token);
         String url = "https://open.wecard.qq.com/cgi-bin/user/get-user-by-card-numbers";
@@ -242,19 +243,55 @@ public class GetSchoolUserController {
 
  //    定时获取微校数据
 //
-    Integer i = 0;
+//    Integer i = 0;
 
     //
 //    @Scheduled(cron = "0 0/1 * * * ? ")
+//    @Scheduled(cron = "0 47 15 * * ? ")
     public void getSchoolUser() {
-        i = i + 1;
-        try {
-            boolean a = this.a(i);
-            System.out.println("a = " + a);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+//        i = i + 1;
+//        try {
+//            boolean a = this.a(i);
+//            System.out.println("a = " + a);
+//        } catch (JsonProcessingException e) {
+//            throw new RuntimeException(e);
+//        }
+//        System.out.println(i);
+        String token = token();
+        String url = "https://open.wecard.qq.com/cgi-bin/user/get-org-users";
+        Map<String, Object> param = new HashMap<>();
+        ObjectMapper mapper = new ObjectMapper();
+        param.put("access_token", token);
+        param.put("org_id", 578692);
+        param.put("fetch_child", 1);
+        param.put("page", 0);
+//        param.put("page", 2);
+        param.put("page_size", 1000);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<Map<String, Object>> request = new HttpEntity<>(param, headers);
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, request, String.class);
+        String body = responseEntity.getBody();
+        JSONObject jsonObject = JSON.parseObject(body);
+//        总数量
+        String total = jsonObject.getString("total");
+        System.out.println("total = " + total);
+        int pageSize=Integer.parseInt(total) /1000;
+//        获取总页数
+        pageSize=pageSize+1;
+        System.out.println("pageSize = " + pageSize);
+
+        for (int j = 0; j <= pageSize; j++) {
+            try {
+                boolean a = a(j);
+                System.out.println("a = " + a);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
         }
-        System.out.println(i);
+
+
+
     }
 
     /**
@@ -307,8 +344,7 @@ public class GetSchoolUserController {
 
 //    @Scheduled(cron = "0 0/1 * * * ? ")
     public Boolean b() throws JsonProcessingException {
-        String token = this.token();
-        System.out.println("token = " + token);
+        String token = token();
         String url = "https://open.wecard.qq.com/cgi-bin/user/search";
         Map<String, Object> param = new HashMap<>();
         param.put("access_token", token);

src/main/java/com/chuanghai/student_portrait/service/impl/CapacityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.chuanghai.student_portrait.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -515,10 +516,10 @@ public class CapacityServiceImpl extends ServiceImpl<CapacityMapper, Capacity> i
     public BaseResponse getOneStudent(String id) {
         ObjectMapper objectMapper = new ObjectMapper();
 
-        //        redis 缓存
+//                redis 缓存
         if (jedisUtil.exists("capacityOne"+id)) {
             String capacityOne = jedisUtil.get("capacityOne"+id);
-            Map map1 = JSON.parseObject(capacityOne,Map.class);
+            Map map1 = JSONObject.parseObject(capacityOne,Map.class);
             return BaseResponse.ok(StatusEnum.SUCCESS, map1);
         }
 

src/main/java/com/chuanghai/student_portrait/service/impl/ConsumeServicelmpl.java

@@ -556,7 +556,7 @@ public class ConsumeServicelmpl extends ServiceImpl<ConsumeMapper, Consume> impl
     private static Integer page = 1;
 
     //每2小时获取一次token
-    @Scheduled(cron = "0 0 0/2 * * ? ")
+//    @Scheduled(cron = "0 0 0/2 * * ? ")
     public String getToken() {
         return tokenConfig.getToken();
     }
@@ -756,12 +756,11 @@ public class ConsumeServicelmpl extends ServiceImpl<ConsumeMapper, Consume> impl
 
     }
 
-    @Scheduled(cron = "0 0 15 * * ? ")
-//    @Scheduled(cron = "0 16 * * * ? ")
+//   专门弄了一个定时任务去调用这个接口
     public void test() {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate localDate = LocalDate.now();
-        LocalDate localDateYesterDay = localDate.minusDays(2);
+        LocalDate localDateYesterDay = localDate.minusDays(1);
         String yesterDay = localDateYesterDay.format(dateTimeFormatter);
         bankApi(yesterDay,yesterDay);
     }

src/main/java/com/chuanghai/student_portrait/service/impl/NewSchooluserServiceImpl.java

@@ -2,6 +2,7 @@ package com.chuanghai.student_portrait.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -128,6 +129,7 @@ public class NewSchooluserServiceImpl extends ServiceImpl<NewSchooluserMapper, N
         BaseResponse oneStudent = capacityService.getOneStudent(id);
         Map<String, List<CapacityDto>> data1 = (Map<String, List<CapacityDto>>) oneStudent.getData();
         List<CapacityDto> average = data1.get("average");
+        System.out.println("average = " + average);
         List<CapacityDto> list = data1.get("list");
 
         String label = "";

src/main/java/com/chuanghai/student_portrait/service/impl/OldSchooluserServiceImpl.java

@@ -31,22 +31,26 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
     private NewSchooluserService newSchooluserService;
 
 
-    Integer i = 0;
+//    Integer i = 0;
 
 //    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 50 14 * * ? ")
     public void getSchoolUser() {
-        Page<OldSchooluser> page = this.page(new Page<>(i, 1000));
+        Page<OldSchooluser> page = this.page(new Page<>(1, 1000));
         long pages = page.getPages();
-        if (pages >= i) {
-            i = i + 1;
-        } else {
-            i = i - 1;
+//        if (pages >= i) {
+//            i = i + 1;
+//        } else {
+//            i = i - 1;
+//        }
+        for (int i = 1; i <= pages; i++) {
+            Boolean aBoolean = addNewSchooluser(i);
+            System.out.println("aBoolean = " + aBoolean);
         }
 
-        Boolean aBoolean = addNewSchooluser(i);
 
-    }
 
+    }
 
     @Override
     @DSTransactional
@@ -93,6 +97,8 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
             String profession = oldSchooluser.getProfession();
             String clazz = oldSchooluser.getClazz();
             String nation = oldSchooluser.getNation();
+
+
 //            身份证号码
             newSchooluser.setIdCard(card);
 //电子卡号
@@ -124,6 +130,19 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
 //            头像
             newSchooluser.setHeadImage(oldSchooluser.getHeadImage());
 
+            //            宿舍号
+            String dormNumber = oldSchooluser.getDormNumber();
+            if (ObjectUtils.isNotEmpty(dormNumber)) {
+                String build = dormNumber.substring(0,dormNumber.length() - 4);
+                newSchooluser.setBuild(build+"栋");
+                String floors = dormNumber.substring(dormNumber.length() - 3).substring(0, 1);
+                newSchooluser.setFloors(floors+"层");
+                String room = dormNumber.substring(dormNumber.length() - 3).substring(0, 3);
+                newSchooluser.setDormNumber(build+"-"+room);
+            }
+
+
+
 
             if (card != null && card.length() == 18) {
 //                获取身份证前2位
@@ -142,7 +161,7 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
             NewSchooluser newSchooluser1 = queryNewSchoolUser(newSchooluser.getIdCard());
             if (ObjectUtils.isNotEmpty(newSchooluser1)) {
                 newSchooluser.setId(newSchooluser1.getId());
-//                newSchooluserService.updateById(newSchooluser);
+                newSchooluserService.updateById(newSchooluser);
             } else {
                 newSchoolusers.add(newSchooluser);
             }
@@ -155,6 +174,23 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
         return b;
     }
 
+    public static void main(String[] args) {
+        String dom="13-514";
+        if (dom.contains("栋")) {
+            String s=dom.replace("栋","-");
+            System.out.println("s = " + s);
+        }
+//        String dom="4-514";
+        String build = dom.substring(0,dom.length() - 4);
+        System.out.println("build = " + build);
+        String floors = dom.substring(dom.length() - 3).substring(0, 1);
+        System.out.println("floors = " + floors);
+        String romm = dom.substring(dom.length() - 3).substring(0, 3);
+        System.out.println("romm = " + romm);
+        String rooNumber=build+"-"+romm;
+        System.out.println("rooNumber = " + rooNumber);
+    }
+
     @Override
     public NewSchooluser getNewSchoolUser(OldSchooluser oldSchooluser) {
         NewSchooluser newSchooluser = new NewSchooluser();

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Nov 13 14:29:35 CST 2024
+#Thu Jan 09 18:03:33 CST 2025
 version=0.0.1-SNAPSHOT
 groupId=com.chuanghai
 artifactId=student_portrait