feat:[1006950]图书sop

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -8,7 +8,6 @@ import com.pcloud.advertising.advertising.dto.AdvertisingSpaceDTO;
 import com.pcloud.advertising.advertising.dto.AdvertisingSpaceItemDTO;
 import com.pcloud.analysisengine.browse.dto.BrowseRecordStatisticDTO;
 import com.pcloud.appcenter.app.dto.AppDto;
-import com.pcloud.appcenter.app.dto.AppRaysDTO;
 import com.pcloud.appcenter.app.dto.app.MapBaseStatusDTO;
 import com.pcloud.appcenter.app.dto.AppRaysDTO;
 import com.pcloud.book.applet.biz.AppletBooklistBiz;
@@ -431,13 +430,16 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 bookAppletScene.setAccountSettingId(BookProps.getMiniOfficialAccountsId());
                 bookAppletSceneDao.insert(bookAppletScene);
             }
-            //同一本书其他码下关闭小睿流程
-            resourcePageDao.setOtherPageRaysClose(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), sceneId, null);
-            //为了维护缓存。要先查出来其他码。然后更新
-            List<ResourcePage> otherPageRaysClose = resourcePageDao.getOtherPageRaysClose(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), sceneId, null);
-            if(CollUtil.isNotEmpty(otherPageRaysClose)){
-                otherPageRaysClose.forEach(e->{
-                    addResourcePageToRedis(e);
+            //同一本书其他码下关闭小睿流程,查出要关闭的资源页，然后更新
+            List<ResourcePage> otherPageRaysOpen = resourcePageDao.getOtherPageRaysOpen(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), sceneId, null);
+            //删除修改过的二维码缓存
+            if(CollUtil.isNotEmpty(otherPageRaysOpen)){
+                otherPageRaysOpen.forEach(e->{
+                    delResourcePageToRedis(e);
+                    ResourcePage page = new ResourcePage();
+                    page.setId(e.getId());
+                    page.setOpenRays(0);
+                    resourcePageDao.update(page);
                 });
             }
         } else {
@@ -467,11 +469,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     private void delResourcePageToRedis(ResourcePage resourcePage) {
         if(null!=resourcePage.getSceneId()) {
             JedisClusterUtils.hdel(BookConstant.RESOURCE_PAGE_BY_SCENE_ID,resourcePage.getSceneId().toString());
-            qrcodeSceneConsr.deleteParseRedis(resourcePage.getSceneId(),null);
+            ThreadPoolUtils.OTHER_THREAD_POOL.execute(()->qrcodeSceneConsr.deleteParseRedis(resourcePage.getSceneId(),null));
         }
         if(null!=resourcePage.getBookGroupId()) {
             JedisClusterUtils.hdel(BookConstant.RESOURCE_PAGE_BY_BOOK_GROUP_ID,resourcePage.getBookGroupId().toString());
-            qrcodeSceneConsr.deleteParseRedis(null,resourcePage.getBookGroupId());
+            ThreadPoolUtils.OTHER_THREAD_POOL.execute(()->qrcodeSceneConsr.deleteParseRedis(null,resourcePage.getBookGroupId()));
         }
     }
 
@@ -534,13 +536,16 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 bookAppletScene.setAccountSettingId(BookProps.getMiniOfficialAccountsId());
                 bookAppletSceneDao.insert(bookAppletScene);
             }
-            //同一本书其他码下关闭小睿流程
-            resourcePageDao.setOtherPageRaysClose(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), null, bookGroupId);
-            //为了维护缓存。要先查出来其他码。然后更新
-            List<ResourcePage> otherPageRaysClose = resourcePageDao.getOtherPageRaysClose(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), null, bookGroupId);
-            if(CollUtil.isNotEmpty(otherPageRaysClose)){
-                otherPageRaysClose.forEach(e->{
-                    addResourcePageToRedis(e);
+            //同一本书其他码下关闭小睿流程,查出要关闭的资源页，然后更新
+            List<ResourcePage> otherPageRaysOpen = resourcePageDao.getOtherPageRaysOpen(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), null, bookGroupId);
+            //删除修改过的二维码缓存
+            if(CollUtil.isNotEmpty(otherPageRaysOpen)){
+                otherPageRaysOpen.forEach(e->{
+                    delResourcePageToRedis(e);
+                    ResourcePage page = new ResourcePage();
+                    page.setId(e.getId());
+                    page.setOpenRays(0);
+                    resourcePageDao.update(page);
                 });
             }
         } else {

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/ResourcePageDao.java

@@ -129,4 +129,6 @@ public interface ResourcePageDao extends BaseDao<ResourcePage>{
     Long getBookIdByBookGroupId(Long bookGroupId);
 
     Long getBookIdBySceneId(Long sceneId);
+
+    List<ResourcePage> getOtherPageRaysOpen(Long bookId, Long channelId, Long createUser, Long sceneId, Long bookGroupId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/ResourcePageDaoImpl.java

@@ -176,4 +176,15 @@ public class ResourcePageDaoImpl extends BaseDaoImpl<ResourcePage> implements Re
     public Long getBookIdBySceneId(Long sceneId) {
         return getSessionTemplate().selectOne(getStatement("getBookIdBySceneId"), sceneId);
     }
+
+    @Override
+    public List<ResourcePage> getOtherPageRaysOpen(Long bookId, Long channelId, Long createUser, Long sceneId, Long bookGroupId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("bookId", bookId);
+        map.put("channelId", channelId);
+        map.put("createUser", createUser);
+        map.put("bookGroupId", bookGroupId);
+        map.put("sceneId", sceneId);
+        return getSessionTemplate().selectList(getStatement("getOtherPageRaysOpen"), map);
+    }
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml

@@ -372,4 +372,20 @@
         limit 1
     </select>
 
+    <select id="getOtherPageRaysOpen" parameterType="map" resultMap="ResourcePageMap">
+        select
+        <include refid="Base_Column_List"/>
+        from resource_page
+        WHERE
+        book_id = #{bookId}
+        AND channel_id = #{channelId}
+        AND create_user = #{createUser}
+        and open_rays = 1
+        <if test="sceneId != null">
+            AND scene_id != #{sceneId}
+        </if>
+        <if test="bookGroupId != null">
+            AND book_group_id != #{bookGroupId}
+        </if>
+    </select>
 </mapper>