diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java index c5c90b7..69d180a 100644 --- a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java +++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java @@ -17,6 +17,8 @@ import org.springframework.data.domain.*; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -80,7 +82,6 @@ public class GradeBiz { pageNo = pageNo -1; } UserVo admin = feignUser.getByUserNo(userNo); - Integer pageSize= vo.getPageSize(); Pageable pageable = PageRequest.of(pageNo,pageSize); Page onePage = null; @@ -90,8 +91,21 @@ public class GradeBiz { onePage = gradeDao.findAllBySchoolId(admin.getSchoolId(),pageable); } +// ListGradeDTO dto = new ListGradeDTO(); +// dto.setList(onePage); +// return Result.success(dto); + // 获取分页数据中的列表 + List gradeList = new ArrayList<>(onePage.getContent()); + + // 对 gradeList 按 createTime 进行排序(时间大的排前面) + gradeList.sort(Comparator.comparing(Grade::getCreateTime).reversed()); + + // 将排序后的列表设置回分页对象 + Page sortedPage = new PageImpl<>(gradeList, pageable, onePage.getTotalElements()); + + // 构建返回结果 ListGradeDTO dto = new ListGradeDTO(); - dto.setList(onePage); + dto.setList(sortedPage); // 设置排序后的分页数据 return Result.success(dto); } diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java b/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java index 7b993f3..287d159 100644 --- a/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java +++ b/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java @@ -1,9 +1,11 @@ package com.tz.platform.user.api; import com.auth0.jwt.JWT; +import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; +import com.auth0.jwt.interfaces.Verification; import com.tz.platform.common.core.base.BaseController; import com.tz.platform.common.core.base.Result; import com.tz.platform.common.core.enmus.UserTypeEnum; @@ -66,7 +68,7 @@ public class UserLoginController extends BaseController { // Integer roleId = 1; try { int year = Calendar.getInstance().get(Calendar.YEAR)*7; - DecodedJWT decodedJWT = JWT.require(Algorithm.HMAC256("wx_zjjy_"+year)).build().verify(tk.getTk()); + DecodedJWT decodedJWT = JWT.require(Algorithm.HMAC256("wx_zjjy_"+14175)).build().verify(tk.getTk()); Map rs = decodedJWT.getClaims(); username = decodedJWT.getClaim("username").asString(); schoolId = decodedJWT.getClaim("schoolId").asInt(); diff --git a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java index 9500455..b9db78d 100644 --- a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java +++ b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java @@ -97,16 +97,20 @@ public class ZhiyunAccountBiz { Thread t = new Thread(() -> { String jobName = "zhiyunSynJob2"; boolean lr = lock(jobName,ms); + if(!lr){ + System.out.println("************锁未释放***************"); + } if(lr){ try { synSchool(); List schoolVoList = feignSchool.list(); // List schoolVoList2 = new ArrayList<>(); // for (int i = 0; i < schoolVoList.size(); i++) { -// if(schoolVoList.get(i).getName().equals("湖南工学院")){ +// if(schoolVoList.get(i).getName().equals("北京财贸职业学院")){ // schoolVoList2.add(schoolVoList.get(i)); // } // } +// schoolVoList2.forEach(schoolVo -> { schoolVoList.forEach(schoolVo -> { try{ synSingle(schoolVo); @@ -114,6 +118,7 @@ public class ZhiyunAccountBiz { ex.printStackTrace(); } }); + System.out.println("同步成功"); }catch (Exception ex){ ex.printStackTrace(); log.error("大赛状态更新任务失败: {}",ex.getMessage()); @@ -291,20 +296,24 @@ public class ZhiyunAccountBiz { if(code == 200 || code==0){ JSONArray jsonArray = jsonObject.getJSONArray("data"); List gradeVoList = new ArrayList<>(); + List outerIdList=new ArrayList<>(); jsonArray.forEach(jo->{ JSONObject studentOb = (JSONObject)jo; Integer outerId = studentOb.getInt("id"); - String name = studentOb.getStr("name"); - GradeVo vo = feignGrade.getByOuterId(outerId); - if(vo == null){ - vo = new GradeVo(); - vo.setCreateTime(new Date()); + if (!outerIdList.contains(outerId)){ + outerIdList.add(outerId); + String name = studentOb.getStr("name"); + GradeVo vo = feignGrade.getByOuterId(outerId); + if(vo == null){ + vo = new GradeVo(); + vo.setCreateTime(new Date()); + } + vo.setName(name); + vo.setOuterId(outerId); + vo.setUserNo(0L); + vo.setSchoolId(school.getId()); + gradeVoList.add(vo); } - vo.setName(name); - vo.setOuterId(outerId); - vo.setUserNo(0L); - vo.setSchoolId(school.getId()); - gradeVoList.add(vo); }); feignGrade.saveAllGrade(gradeVoList); }