beetlsql3-dev
Mlxa0324
parent 03d2cf5ba5
commit 9eb350103b

@ -27,7 +27,7 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
List<CoreDict> findAllList(String type); List<CoreDict> findAllList(String type);
//根据表名、字段名查询 主键名和注释 和 字段名和注释 //根据表名、字段名查询 主键名和注释 和 字段名和注释
// @Cacheable(value = "core.coreDict:findPkAndValue", key = "#tableName+#columnName") @Cacheable(value = "core.coreDict.findPkAndValue", key = "#tableName+#columnName")
List<Map<String,Object>> findPkAndValue (String tableName, String columnNames); List<Map<String,Object>> findPkAndValue (String tableName, String columnNames);
//根据表名、字段名查询 注释 //根据表名、字段名查询 注释

@ -52,7 +52,7 @@ public class CoreDictService extends CoreBaseService<CoreDict> {
* .. , ... * .. , ...
* @return List * @return List
*/ */
//@Cacheable(value = CorePlatformService.DICT_CACHE_TYPE) @Cacheable(value = CorePlatformService.DICT_CACHE_TYPE, key="#type")
public List<CoreDict> findAllByTable(String type) { public List<CoreDict> findAllByTable(String type) {
String str[] = type.split("\\."); String str[] = type.split("\\.");
String tableName = null,filedName = null,params = null; String tableName = null,filedName = null,params = null;
@ -97,6 +97,7 @@ public class CoreDictService extends CoreBaseService<CoreDict> {
} }
} }
@Cacheable(value = "core.coreDict:.findCoreDictByTable", key="#type+\"_\"+#value")
public CoreDict findCoreDictByTable(String type,String value) { public CoreDict findCoreDictByTable(String type,String value) {
List<CoreDict> list = findAllByTable(type); List<CoreDict> list = findAllByTable(type);
if(list==null) { if(list==null) {

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.InsertIgnore; import org.beetl.sql.annotation.entity.InsertIgnore;
import org.beetl.sql.annotation.entity.UpdateIgnore; import org.beetl.sql.annotation.entity.UpdateIgnore;
import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.Fetch;
@ -23,8 +23,8 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity {
//ID //ID
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME) // @SeqID(name = ORACLE_CORE_SEQ_NAME)
@AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo") // @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo")
@AutoID
private Long teacherOpenCourseMergeCourseInfoId ; private Long teacherOpenCourseMergeCourseInfoId ;
//开课ID //开课ID

@ -1,5 +1,6 @@
package com.ibeetl.jlw.entity; package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict;
import lombok.Data; import lombok.Data;
import org.beetl.sql.annotation.entity.AutoID; import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.InsertIgnore; import org.beetl.sql.annotation.entity.InsertIgnore;
@ -45,6 +46,7 @@ public class TeacherOpenCourseMergeCourseInfoTree {
private String courseInfoThumbnail ; private String courseInfoThumbnail ;
//课程标签ID //课程标签ID
@Dict
private Long courseLabelId ; private Long courseLabelId ;
@UpdateIgnore @UpdateIgnore

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.AutoID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -16,8 +16,8 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
//ID //ID
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME) // @SeqID(name = ORACLE_CORE_SEQ_NAME)
@AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo") // @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
@AutoID
private Long teacherOpenCourseMergeResourcesInfoId ; private Long teacherOpenCourseMergeResourcesInfoId ;
//开课课程ID //开课课程ID

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.AutoID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -17,8 +17,8 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
//ID //ID
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME) // @SeqID(name = ORACLE_CORE_SEQ_NAME)
@AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion") // @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion")
@AutoID
private Long teacherOpenCourseMergeResourcesQuestionId ; private Long teacherOpenCourseMergeResourcesQuestionId ;
//开课ID //开课ID

@ -34,7 +34,6 @@ import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -116,17 +115,16 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
* *
* @param key * @param key
*/ */
@Async
@SneakyThrows @SneakyThrows
public void refreshCourseInfoTreeLocalCache(Long key) { public void invalidateCourseInfoTreeLocalCache(Long key) {
treeLocalCache.refresh(key); treeLocalCache.refresh(key);
} }
/** /**
* *
*/ */
@SneakyThrows @SneakyThrows
public void cleanUpCourseInfoTreeLocalCache() { public void invalidateAllCleanUpCourseInfoTreeLocalCache() {
treeLocalCache.cleanUp(); treeLocalCache.invalidateAll();
} }
public void deleteByList(List list){ public void deleteByList(List list){
@ -138,18 +136,14 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
if(StringUtils.isNotBlank(ids)){ if(StringUtils.isNotBlank(ids)){
teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids); teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids);
for (String id : ids.split(",")) { teacherOpenCourseMergeCourseInfoService.invalidateAllCleanUpCourseInfoTreeLocalCache();
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(Long.valueOf(id));
}
} }
} }
public void deleteTeacherOpenCourseMergeCourseInfo(@NotBlank(message = "ID不能为空") String ids){ public void deleteTeacherOpenCourseMergeCourseInfo(@NotBlank(message = "ID不能为空") String ids){
try { try {
teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids); teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids);
for (String id : ids.split(",")) { teacherOpenCourseMergeCourseInfoService.invalidateAllCleanUpCourseInfoTreeLocalCache();
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(Long.valueOf(id));
}
} catch (Exception e) { } catch (Exception e) {
throw new PlatformException("批量删除开课课程拉取失败", e); throw new PlatformException("批量删除开课课程拉取失败", e);
} }
@ -176,7 +170,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
// 循环刷新缓存 // 循环刷新缓存
for (TeacherOpenCourseMergeCourseInfo openCourseMergeCourseInfo : teacherOpenCourseMergeCourseInfoList) { for (TeacherOpenCourseMergeCourseInfo openCourseMergeCourseInfo : teacherOpenCourseMergeCourseInfoList) {
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(openCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId()); teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(openCourseMergeCourseInfo.getTeacherOpenCourseId());
} }
} }
return msg; return msg;
@ -185,9 +179,10 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
public JsonResult add(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery){ public JsonResult add(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery){
String msg = ""; String msg = "";
TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoQuery.pojo(); TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoQuery.pojo();
teacherOpenCourseMergeCourseInfo.setCourseInfoStatus(1);
teacherOpenCourseMergeCourseInfoDao.insert(teacherOpenCourseMergeCourseInfo); teacherOpenCourseMergeCourseInfoDao.insert(teacherOpenCourseMergeCourseInfo);
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId()); teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId());
teacherOpenCourseMergeCourseInfoQuery.setTeacherOpenCourseMergeCourseInfoId(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId()); teacherOpenCourseMergeCourseInfoQuery.setTeacherOpenCourseMergeCourseInfoId(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();
jsonResult.setData(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());//自增的ID丢进去 jsonResult.setData(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());//自增的ID丢进去
@ -200,7 +195,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
String msg = ""; String msg = "";
TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoQuery.pojo(); TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoQuery.pojo();
teacherOpenCourseMergeCourseInfoDao.updateTemplateById(teacherOpenCourseMergeCourseInfo); teacherOpenCourseMergeCourseInfoDao.updateTemplateById(teacherOpenCourseMergeCourseInfo);
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId()); teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId());
return msg; return msg;
} }

@ -118,7 +118,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
jsonResult.setMsg(msg); jsonResult.setMsg(msg);
// 刷新缓存 // 刷新缓存
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId()); teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId());
return jsonResult; return jsonResult;
} }
@ -128,7 +128,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(teacherOpenCourseMergeResourcesInfo); teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(teacherOpenCourseMergeResourcesInfo);
// 刷新缓存 // 刷新缓存
teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId()); teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId());
return msg; return msg;
} }

Loading…
Cancel
Save