修改授权状态的定时脚本

web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java

@@ -50,11 +50,11 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends
      * 获取所有的过期的授权课程
      * @return
      */
-    List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuth();
+    List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthUnUpdateStatus();
 
     /**
      * 功能描述: <br>
-     * 获取所有的过期的授权课程, 指定前移几天和后移几天
+     * 获取所有快要过期的、过期几天内的授权课程, 指定前移几天和后移几天
      *
      * @param beforeDays
      * @param afterDays

web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java

@@ -30,11 +30,11 @@ public interface UniversitiesCollegesJurisdictionExperimentalSystemDao extends B
      * 获取所有的过期的授权应用
      * @return
      */
-    List<UniversitiesCollegesJurisdictionExperimentalSystem> getAllOverdueAuth();
+    List<UniversitiesCollegesJurisdictionExperimentalSystem> getAllOverdueAuthUnUpdateStatus();
 
     /**
      * 功能描述: <br>
-     * 获取所有的过期的授权应用, 指定前移几天和后移几天
+     * 获取所有快要过期的、过期几天内的授权应用, 指定前移几天和后移几天
      *
      * @param beforeDays
      * @param afterDays

web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java

@@ -14,6 +14,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
+
 /* 
 * 课程管理 - 课程配置
 * gen by Spring Boot2 Admin 2021-06-24
@@ -356,4 +358,8 @@ public class CourseInfo extends BaseEntity{
     public void setOrderIndex(BigDecimal orderIndex) {
         this.orderIndex = orderIndex;
     }
+
+    public String getCourseLabelType() {
+        return defaultIfNull(this.get("courseLabelType"), this.get("course_label_type")) + "";
+    }
 }

web/src/main/java/com/ibeetl/jlw/job/UpdateAuthApplicationAndResourcesJob.java

@@ -45,11 +45,11 @@ public class UpdateAuthApplicationAndResourcesJob implements Job {
 
             // 过期的授权课程
             List<UniversitiesCollegesJurisdictionCurriculumResources> curriculumResourcesAllOverdueAuth =
-                    universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuth();
+                    universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthUnUpdateStatus();
 
             // 过期的授权应用
             List<UniversitiesCollegesJurisdictionExperimentalSystem> experimentSystemsAllOverdueAuth    =
-                    universitiesCollegesJurisdictionExperimentalSystemDao.getAllOverdueAuth();
+                    universitiesCollegesJurisdictionExperimentalSystemDao.getAllOverdueAuthUnUpdateStatus();
 
             List<UniversitiesCollegesJurisdictionCurriculumResources> resourcesUpdateList = curriculumResourcesAllOverdueAuth.stream().map(item -> {
                 UniversitiesCollegesJurisdictionCurriculumResources o = new UniversitiesCollegesJurisdictionCurriculumResources();

web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java

@@ -1,13 +1,14 @@
 package com.ibeetl.jlw.service;
 
-
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
+import com.ibeetl.jlw.dao.CourseInfoDao;
 import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao;
 import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources;
 import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
+import com.ibeetl.jlw.web.query.CourseInfoQuery;
 import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
 import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.core.SQLReady;
@@ -19,8 +20,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
+import static cn.hutool.core.collection.ListUtil.empty;
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
+import static java.util.stream.Collectors.groupingBy;
 
 
 /**
@@ -166,16 +171,35 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      */
     @Cacheable(value = "cache:core:getResourcesCourseInfoAuthDetails", key="#orgId", cacheManager="cacheManager1Hour")
     public ResourcesCourseInfoAuthDetailsVO getResourcesCourseInfoAuthDetails(Long orgId) {
-        ResourcesCourseInfoAuthDetailsVO authDetailsVO = sqlManager.executeQueryOne(
-                new SQLReady("SELECT ? as org_id", orgId), ResourcesCourseInfoAuthDetailsVO.class);
-        return authDetailsVO;
+        // 超管
+        if (orgId == 1) {
+            CourseInfoQuery courseInfoQuery = new CourseInfoQuery();
+            courseInfoQuery.setCourseLabelType("理论课程类,应用课程类,考证课程类");
+            courseInfoQuery.setCourseInfoStatus(1);
+            List<CourseInfo> courseInfoList = sqlManager.getMapper(CourseInfoDao.class).getCourseInfoValues(courseInfoQuery);
+            Map<String, List<CourseInfo>> stringListMap = courseInfoList.stream().collect(groupingBy(CourseInfo::getCourseLabelType));
+
+            ResourcesCourseInfoAuthDetailsVO authDetailsVO = new ResourcesCourseInfoAuthDetailsVO();
+            authDetailsVO.setCourseInfoId(-1L);
+            authDetailsVO.setOrgId(1L);
+            authDetailsVO.setApplicationCourseList(defaultIfNull(stringListMap.get("应用课程类"), empty()));
+            authDetailsVO.setTheoryCourseList(defaultIfNull(stringListMap.get("理论课程类"), empty()));
+            authDetailsVO.setTextualResearchCourseList(defaultIfNull(stringListMap.get("考证课程类"), empty()));
+            return authDetailsVO;
+        }
+        // 其他身份
+        else {
+            ResourcesCourseInfoAuthDetailsVO authDetailsVO = sqlManager.executeQueryOne(
+                    new SQLReady("SELECT ? as org_id", orgId), ResourcesCourseInfoAuthDetailsVO.class);
+            return authDetailsVO;
+        }
     }
 
     /**
      * 获取过期的所有授权
      * @return
      */
-    public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuth(){
-        return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuth();
+    public List<UniversitiesCollegesJurisdictionCurriculumResources> getAllOverdueAuthUnUpdateStatus(){
+        return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllOverdueAuthUnUpdateStatus();
     }
 }

web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionCurriculumResources.md

@@ -405,18 +405,26 @@ getAllAuthCourseInfoByOrgId
   @ }
   order by add_time desc
 
-getAllOverdueAuth
+getAllOverdueAuthUnUpdateStatus
 ===
-* 获取所有的过期的授权课程
+* 获取所有过期未修改授权状态的课程
+
+  SELECT
+  t.*,
+  ta.course_info_name AS `name`,
+  '课程授权' AS `authType`
+  FROM
+  universities_colleges_jurisdiction_curriculum_resources t
+  LEFT JOIN course_info ta ON ta.course_info_id = t.course_info_id
+  WHERE
+  NOT now() BETWEEN t.use_start_time
+  AND t.use_end_time
+  AND t.use_type <> 0
   
-  select t.*, ta.course_info_name as `name`, '课程授权' as `authType`
-  from universities_colleges_jurisdiction_curriculum_resources t
-  left join course_info ta on ta.course_info_id = t.course_info_id
-  where not now() between t.use_start_time and t.use_end_time
 
 getAllOverdueAuthByBeforeAndAfterDays
 ===
-* 获取所有的过期的授权应用, 指定前移几天和后移几天
+* 获取所有快要过期的、过期几天内的授权课程, 指定前移几天和后移几天
   
   select t.*, ta.course_info_name as `name`, '课程授权' as `authType`
   from universities_colleges_jurisdiction_curriculum_resources t

web/src/main/resources/sql/jlw/universitiesCollegesJurisdictionExperimentalSystem.md

@@ -213,18 +213,25 @@ getAllByQuery
   order by t.add_time desc
 
 
-getAllOverdueAuth
+getAllOverdueAuthUnUpdateStatus
 ===
-* 获取所有的过期的授权应用
-
-  select t.*, ta.application_name as `name`, '应用授权' as `authType`
-  from universities_colleges_jurisdiction_experimental_system t
-  left join resources_application ta on ta.resources_application_id = t.type_id
-  where not now() between t.use_start_time and t.use_end_time
+* 获取所有过期未修改授权状态的应用
+
+  SELECT
+  t.*,
+  ta.application_name AS `name`,
+  '应用授权' AS `authType`
+  FROM
+  universities_colleges_jurisdiction_experimental_system t
+  LEFT JOIN resources_application ta ON ta.resources_application_id = t.type_id
+  WHERE
+  NOT now() BETWEEN t.use_start_time
+  AND t.use_end_time
+  AND t.use_type <> 0
 
 getAllOverdueAuthByBeforeAndAfterDays
 ===
-* 获取所有的过期的授权应用, 指定前移几天和后移几天
+* 获取所有快要过期的、过期几天内的授权应用, 指定前移几天和后移几天
 
   select t.*, ta.application_name as `name`, '应用授权' as `authType`
   from universities_colleges_jurisdiction_experimental_system t