优化

src/main/java/com/template/controller/SmartUserController.java

@@ -6615,20 +6615,24 @@ public class SmartUserController implements SmartUserControllerAPI {
     @Override
     @PassToken
     public CommonResult updateSmartUserTimeById() throws Exception {
-
         List<String> gradeIds = new ArrayList<>();
         //2025 17
         //2024 16
         //2023 1
-        //gradeIds.add("17");
+        gradeIds.add("20230101");
         //gradeIds.add("16");
-        gradeIds.add("1");
-        List<SmartUser> users = smartUserService.queryStudentsByGrade(gradeIds);
-
+        //gradeIds.add("1");
+        List<SmartUser> users = smartUserService.querySmartUserByCardNos(gradeIds);
+        List<SmartClass> classes = smartClassService.list(null);
         for (SmartUser user:users) {
+            Optional<SmartClass> oClass = classes.stream().filter(e -> e.getId().equals(user.getSchoolClass())).findFirst();
+            if (!(oClass != null && oClass.isPresent())) {
+                return CommonResult.fail("班级数据无效，批量同步时间组失败！");
+            }
+
             System.out.println("1");
             Thread.sleep(2000);
-            bsUpdateStudentTimes(user);
+            bsUpdateStudentTimes(user,oClass.get().getBsClassNo());
         }
 
         System.out.println("操作完成");
@@ -6637,7 +6641,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
 
     //region 百胜更新学生时间组信息
-    public CommonResult bsUpdateStudentTimes(SmartUser su) throws Exception {
+    public CommonResult bsUpdateStudentTimes(SmartUser su,String bsClassNo) throws Exception {
         //region 更新百胜学生信息
         String appId = controlConfig.getAppId();
         String schoolno = controlConfig.getSchoolCode();
@@ -6650,13 +6654,13 @@ public class SmartUserController implements SmartUserControllerAPI {
         String bsGroupNo = "STG1712456245769408";
         JSONObject jsonobject = new JSONObject();
         jsonobject.put("appid", appId);
-        String str = "{\"student_no\":\"" + su.getBsStudentNo() + "\",\"student_name\":\"" + su.getName() + "\",\"student_number\":\"" + su.getCardNo() + "\",\"student_sex\":\"" + su.getSexId() + idCardStr + "\",\"student_stgno\":\"" + bsGroupNo + "\"}";
+        String str = "{\"student_no\":\"" + su.getBsStudentNo() + "\",\"student_name\":\"" + su.getName() + "\",\"classtab_no\":\"" + bsClassNo + "\",\"student_number\":\"" + su.getCardNo() + "\",\"student_sex\":\"" + su.getSexId() + idCardStr + "\",\"student_stgno\":\"" + bsGroupNo + "\"}";
         String aesStr = URLEncoder.encode(AesTestOne.encrypt(str, controlConfig.getAppSecret()), "UTF-8");
         jsonobject.put("data", aesStr);
         jsonobject.put("schoolno", schoolno);
         jsonobject.put("timestamp", timestamp);
 
-        String md5Str = "appid=" + appId + "&data={\"student_no\":\"" + su.getBsStudentNo() + "\",\"student_name\":\"" + su.getName() + "\",\"student_number\":\"" + su.getCardNo() + "\",\"student_sex\":\"" + su.getSexId() + idCardStr + "\",\"student_stgno\":\"" + bsGroupNo + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
+        String md5Str = "appid=" + appId + "&data={\"student_no\":\"" + su.getBsStudentNo() + "\",\"student_name\":\"" + su.getName() + "\",\"classtab_no\":\"" + bsClassNo + "\",\"student_number\":\"" + su.getCardNo() + "\",\"student_sex\":\"" + su.getSexId() + idCardStr + "\",\"student_stgno\":\"" + bsGroupNo + "\"}" + "&schoolno=" + schoolno + "&timestamp=" + timestamp + "&key=" + appSecret;
         String sign = CommonUtil.MD5(md5Str);
         //sign签名
         jsonobject.put("sign", sign);