diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java index 1d1b90c7..3513eac9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -6,6 +6,7 @@ import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Repository; @@ -57,9 +58,10 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends * * @param beforeDays * @param afterDays + * @param orgId * @return {@link List< UniversitiesCollegesJurisdictionExperimentalSystem >} * @Author: lx * @Date: 2023/3/19 23:38 */ - List getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays); + List getAllOverdueAuthByBeforeAndAfterDays(@Param("beforeDays") Long beforeDays, @Param("afterDays") Long afterDays, @Param("orgId") Long orgId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java index 55913837..60a395a3 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java @@ -4,6 +4,7 @@ import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Repository; @@ -37,9 +38,10 @@ public interface UniversitiesCollegesJurisdictionExperimentalSystemDao extends B * * @param beforeDays * @param afterDays + * @param orgId * @return {@link List< UniversitiesCollegesJurisdictionExperimentalSystem>} * @Author: lx * @Date: 2023/3/19 23:38 */ - List getAllOverdueAuthByBeforeAndAfterDays( Long beforeDays, Long afterDays); + List getAllOverdueAuthByBeforeAndAfterDays(@Param("beforeDays") Long beforeDays, @Param("afterDays") Long afterDays, @Param("orgId") Long orgId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java index 67b50c1f..64330a1c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -203,4 +203,10 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends public List getAllOverdueAuthUnUpdateStatus(){ return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthUnUpdateStatus(); } + + + @Cacheable(value = "cache:core:resources:getAllOverdueAuthByBeforeAndAfterDays", key = "#orgId", unless="#result == null || #result.size() == 0", cacheManager = "cacheManager1Hour") + public List getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays, Long orgId) { + return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, orgId); + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java index 0a28ec80..17b34558 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java @@ -19,6 +19,7 @@ import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSyst import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -176,5 +177,8 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionExperimentalSystem.getUniversitiesCollegesJurisdictionExperimentalSystemValues"),UniversitiesCollegesJurisdictionExperimentalSystem.class,paras); } - + @Cacheable(value = "cache:core:experimentalSystem:getAllOverdueAuthByBeforeAndAfterDays", key = "#orgId", unless="#result == null || #result.size() == 0", cacheManager = "cacheManager1Hour") + public List getAllOverdueAuthByBeforeAndAfterDays(Long beforeDays, Long afterDays, Long orgId) { + return universitiesCollegesJurisdictionExperimentalSystemDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, orgId); + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java index eb43b9ee..8bdeec14 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java @@ -18,8 +18,6 @@ import com.ibeetl.admin.core.service.CoreDictService; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.admin.core.util.HttpRequestLocal; -import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao; -import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.web.IndexController; import lombok.extern.slf4j.Slf4j; @@ -57,9 +55,9 @@ public class WebPlatformService { @Autowired private RoleConsoleService roleConsoleService; @Autowired - private UniversitiesCollegesJurisdictionExperimentalSystemDao universitiesCollegesJurisdictionExperimentalSystemDao; + private UniversitiesCollegesJurisdictionExperimentalSystemService universitiesCollegesJurisdictionExperimentalSystemService; @Autowired - private UniversitiesCollegesJurisdictionCurriculumResourcesDao universitiesCollegesJurisdictionCurriculumResourcesDao; + private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService; @Autowired private CoreDictService coreDictService; @@ -291,7 +289,7 @@ public class WebPlatformService { * @Author: lx * @Date: 2023/3/19 22:49 */ - public List getAuthResourcesAndSystemInfo() { + public List getAuthResourcesAndSystemInfo(CoreUser coreUser) { // 返回值 List result = new ArrayList<>(10); @@ -309,9 +307,9 @@ public class WebPlatformService { // 查询需要通知续约的应用和课程 List systemList = - universitiesCollegesJurisdictionExperimentalSystemDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays); + universitiesCollegesJurisdictionExperimentalSystemService.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, coreUser.getOrgId()); List resourcesList = - universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays); + universitiesCollegesJurisdictionCurriculumResourcesService.getAllOverdueAuthByBeforeAndAfterDays(beforeDays, afterDays, coreUser.getOrgId()); // 快要到期的数据处理 List authApplicationList = systemList.stream().map(item -> { diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java index 14b6e0ed..369ab417 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java @@ -1114,6 +1114,6 @@ public class IndexController { @GetMapping("getAuthResourcesAndSystemInfo.json") @ResponseBody public JsonResult> getAuthResourcesAndSystemInfo(@SCoreUser CoreUser coreUser) { - return JsonResult.success(webPlatformService.getAuthResourcesAndSystemInfo()); + return JsonResult.success(webPlatformService.getAuthResourcesAndSystemInfo(coreUser)); } } diff --git a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md index 60283743..346c835b 100644 --- a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md +++ b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md @@ -432,3 +432,6 @@ getAllOverdueAuthByBeforeAndAfterDays where 1 = 1 AND now() BETWEEN date_add( t.use_end_time, INTERVAL -#beforeDays# DAY ) AND date_add( t.use_end_time, INTERVAL #afterDays# DAY ) + @if(!isEmpty(orgId) && orgId != 1){ + and t.org_id =#orgId# + @} diff --git a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md index b0689b64..6292828b 100644 --- a/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md +++ b/web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md @@ -239,4 +239,7 @@ getAllOverdueAuthByBeforeAndAfterDays where 1 = 1 AND now() BETWEEN date_add( t.use_end_time, INTERVAL -#beforeDays# DAY ) AND date_add( t.use_end_time, INTERVAL #afterDays# DAY ) + @if(!isEmpty(orgId) && orgId != 1){ + and t.org_id =#orgId# + @}