From 1f7d1e69dba3e40411a45b038b747ab389f372fa Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 17 Aug 2022 10:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E5=AD=98=E5=9C=A8=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResourceServiceImpl.java     | 24 +++++++++++++++----
 .../resources/mapper/resource/ResourceDao.xml |  2 ++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index cc7f7e6d..ed7354a2 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -94,6 +94,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
     private static final String SELECT_DEPT_LIST_KEY = "selectDeptList";
     private static final String SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY = "selectDTOPageSpecilTotal";
+    private static final String SELECTWITHATTRS_KEY = "selectWithAttrs";
 
     @Value("${system.startDay}")
     private String systemDay;
@@ -214,9 +215,22 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         return wrapper;
     }
 
+    @Override
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
+    public void save(ResourceDTO dto) {
+        super.save(dto);
+    }
+
+    @Override
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
+    public void update(ResourceDTO dto) {
+        super.update(dto);
+    }
+
+
     @Override
     @Transactional
-    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY}, allEntries = true)
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
     public void insertWithAttrs(ResourceDTO dto) {
         ResourceEntity resourceEntity = new ResourceEntity();
         BeanUtils.copyProperties(dto, resourceEntity);
@@ -280,7 +294,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
     @Override
     @Transactional
-    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY}, allEntries = true)
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
     public void createMixAbility(ResourceDTO dto) {
         ResourceEntity resourceEntity = new ResourceEntity();
         BeanUtils.copyProperties(dto, resourceEntity);
@@ -324,7 +338,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
     @Override
     @Transactional
-    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY}, allEntries = true)
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
     public void deleteWithAttrs(JSONObject jsonObject) {
         JSONArray jsonArray = jsonObject.getJSONArray("ids");
         List<Long> idList = jsonArray.toJavaList(Long.class);
@@ -338,7 +352,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
     @Override
     @Transactional
-    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY}, allEntries = true)
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
     public void updateWithAttrs(ResourceDTO dto) {
         ResourceEntity resourceEntity = new ResourceEntity();
         BeanUtils.copyProperties(dto, resourceEntity);
@@ -1135,7 +1149,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
      * 同步知识库
      */
     @Override
-    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY}, allEntries = true)
+    @CacheEvict(cacheNames = {SELECT_DEPT_LIST_KEY, SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, SELECTWITHATTRS_KEY}, allEntries = true)
     public void KnowledgeBase() {
         final List<String> knowledgeUUID = jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库' AND note1 IS NOT NULL FOR UPDATE;", String.class).stream().distinct().collect(Collectors.toList());
         final int pageSize = CPU_NUM * 10;
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 2ab328f7..ab38f832 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -315,6 +315,8 @@
         tdr.undercarriage_reason,
         tdr.undercarriage_user_name,
         tdr.info_list,
+        tdr.pin_top,
+        tdr.pin_top_time,
         IFNULL( trs.score, 0 ) AS "score",
         IFNULL( taa.applyCount, 0 ) AS "applyCount",
         IFNULL( trc.collectCount, 0 ) AS "collectCount",