修复redis 时间
This commit is contained in:
@@ -1,20 +0,0 @@
|
|||||||
package com.yunhai.bschclassmanage.service.com;
|
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import com.yunhai.bschclassmanage.model.tool.BaseGroup;
|
|
||||||
|
|
||||||
import java.lang.reflect.Array;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
public class BestOpenApi {
|
|
||||||
|
|
||||||
|
|
||||||
public BaseGroup getGroupFirst (Integer id){
|
|
||||||
return new BaseGroup();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String addGroup (BaseGroup group){
|
|
||||||
return JSON.toJSONString(new BaseGroup[]{group});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+10
-14
@@ -1,7 +1,6 @@
|
|||||||
package com.yunhai.bschclassmanage.service.com;
|
package com.yunhai.bschclassmanage.service.impl.com;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.yunhai.bschclassmanage.Repository.BaseYearTermRepository;
|
|
||||||
import com.yunhai.bschclassmanage.Repository.SchClassRepository;
|
import com.yunhai.bschclassmanage.Repository.SchClassRepository;
|
||||||
import com.yunhai.bschclassmanage.Repository.SchDicMajorsRepository;
|
import com.yunhai.bschclassmanage.Repository.SchDicMajorsRepository;
|
||||||
import com.yunhai.bschclassmanage.Repository.SchTeacherGroupRepository;
|
import com.yunhai.bschclassmanage.Repository.SchTeacherGroupRepository;
|
||||||
@@ -11,9 +10,7 @@ import com.yunhai.bschclassmanage.enums.NodeType;
|
|||||||
import com.yunhai.bschclassmanage.enums.SchType;
|
import com.yunhai.bschclassmanage.enums.SchType;
|
||||||
import com.yunhai.bschclassmanage.model.vo.SchSystemTreeVO;
|
import com.yunhai.bschclassmanage.model.vo.SchSystemTreeVO;
|
||||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||||
import com.yunhai.bschclassmanage.model.vo.SelectStrVO;
|
|
||||||
import com.yunhai.bschclassmanage.service.*;
|
import com.yunhai.bschclassmanage.service.*;
|
||||||
import com.yunhai.bschclassmanage.utils.OtherUtil;
|
|
||||||
import com.yunhai.bschclassmanage.utils.RedisConstants;
|
import com.yunhai.bschclassmanage.utils.RedisConstants;
|
||||||
import com.yunhai.bschclassmanage.utils.RedisUtil;
|
import com.yunhai.bschclassmanage.utils.RedisUtil;
|
||||||
import com.yunhai.platform.openapi.client.YschBaseOpenApi;
|
import com.yunhai.platform.openapi.client.YschBaseOpenApi;
|
||||||
@@ -25,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.sql.Array;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@@ -106,14 +102,14 @@ public class ComSchTreeService implements IComSchTreeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<BoaGroup> getSchTree(Integer schId) {
|
// public List<BoaGroup> getSchTree(Integer schId) {
|
||||||
BoaGroup group = YschBaseOpenApi.getGroupById(schId,true);
|
// BoaGroup group = YschBaseOpenApi.getGroupById(schId,true);
|
||||||
return Collections.singletonList(group);
|
// return Collections.singletonList(group);
|
||||||
// String cacheKey = RedisConstants.SCHOOL_TREE + "_" + schId;
|
//// String cacheKey = RedisConstants.SCHOOL_TREE + "_" + schId;
|
||||||
// String json = redisUtil.get(cacheKey,String.class);
|
//// String json = redisUtil.get(cacheKey,String.class);
|
||||||
// List<BoaGroup> treeList = OtherUtil.jsonParseArrayTree(json, BoaGroup.class);
|
//// List<BoaGroup> treeList = OtherUtil.jsonParseArrayTree(json, BoaGroup.class);
|
||||||
// return treeList;
|
//// return treeList;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
public String getSchoolName(Integer schId) {
|
public String getSchoolName(Integer schId) {
|
||||||
@@ -215,7 +211,7 @@ public class ComSchTreeService implements IComSchTreeService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<BoaGroup> getCacheSchGroupTree(Integer schId) {
|
public List<BoaGroup> getSchTree(Integer schId) {
|
||||||
String cacheKey= RedisConstants.SYSTEM_GROUP_TREE+"_"+schId;
|
String cacheKey= RedisConstants.SYSTEM_GROUP_TREE+"_"+schId;
|
||||||
List<BoaGroup> cached = redisUtil.getList(cacheKey, BoaGroup.class);
|
List<BoaGroup> cached = redisUtil.getList(cacheKey, BoaGroup.class);
|
||||||
if (cached != null && !cached.isEmpty()) {
|
if (cached != null && !cached.isEmpty()) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.yunhai.bschclassmanage.service.com;
|
package com.yunhai.bschclassmanage.service.impl.com;
|
||||||
|
|
||||||
import com.yunhai.bschclassmanage.Repository.OperationLogRecordRepository;
|
import com.yunhai.bschclassmanage.Repository.OperationLogRecordRepository;
|
||||||
import com.yunhai.bschclassmanage.Repository.specification.OperationLogSpecifications;
|
import com.yunhai.bschclassmanage.Repository.specification.OperationLogSpecifications;
|
||||||
+3
-2
@@ -1,4 +1,4 @@
|
|||||||
package com.yunhai.bschclassmanage.service.impl.sync;
|
package com.yunhai.bschclassmanage.service.impl.com;
|
||||||
|
|
||||||
import com.yunhai.bschclassmanage.entity.SchStudent;
|
import com.yunhai.bschclassmanage.entity.SchStudent;
|
||||||
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
||||||
@@ -27,8 +27,9 @@ import java.lang.reflect.Array;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
//SendUserBase
|
||||||
@Service
|
@Service
|
||||||
public class SyncUserBaseService implements ISyncUserBaseService {
|
public class SendUserBaseService implements ISyncUserBaseService {
|
||||||
|
|
||||||
@SyncOpLog(SyncDataType.SEND_EDIT_GROUP)
|
@SyncOpLog(SyncDataType.SEND_EDIT_GROUP)
|
||||||
public BoaGroup addGroup(String name, Integer parentId, Integer sort, NodeType type){
|
public BoaGroup addGroup(String name, Integer parentId, Integer sort, NodeType type){
|
||||||
Reference in New Issue
Block a user