fix: page update api

Author: lu-yg

base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java

@@ -148,7 +148,7 @@ public enum ExceptionEnum implements IBaseError {
     /**
      * Cm 301 exception enum.
      */
-    CM301("CM301", "默认页面不能删除和修改"),
+    CM301("CM301", "默认页面修改失败"),
     /**
      * Cm 302 exception enum.
      */

base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java

@@ -1,18 +1,18 @@
 /**
  * Copyright (c) 2023 - present TinyEngine Authors.
  * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
+ * <p>
  * Use of this source code is governed by an MIT-style license.
- *
+ * <p>
  * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
  * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
  * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
  */
 
 package com.tinyengine.it.service.app.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.tinyengine.it.common.base.Result;
 import com.tinyengine.it.common.enums.Enums;
 import com.tinyengine.it.common.exception.ExceptionEnum;
@@ -190,9 +190,6 @@ public Result<Page> delPage(Integer id) {
             // 如果是文件夹，调folder service的处理逻辑
             return del(id);
         }
-        // 保护默认页面
-        protectDefaultPage(pages, id);
-
         // 删除
         Page pageResult = pageMapper.queryPageById(id);
         int result = pageMapper.deletePageById(id);
@@ -317,9 +314,11 @@ public Result<Page> updatePage(Page page) {
             return Result.failed("isHome parameter error");
         }
         int appId = pageTemp.getApp();
-        // 保护默认页面
-        protectDefaultPage(pageTemp, appId);
-
+        // 默认页面
+        boolean isUpdate = protectDefaultPage(pageTemp);
+        if (!isUpdate) {
+            return Result.failed(ExceptionEnum.CM301);
+        }
         // 针对参数中isHome的传值进行isHome字段的判定
         if (page.getIsHome()) {
             setAppHomePage(appId, id);
@@ -531,18 +530,74 @@ public boolean iCanDoIt(User occupier, User user) {
 
     /**
      * 保护默认页面
-     *
-     * @param pages the pages
-     * @param id    the id
-     */
-    public void protectDefaultPage(Page pages, Integer id) {
-        if (pages.getIsDefault()) {
-            // 查询是否是模板应用，不是的话不能删除或修改
-            App app = appMapper.queryAppById(id);
-            if (app.getTemplateType() == null) {
-                Result.failed(ExceptionEnum.CM310.getResultCode());
+     * @param page the pages
+     * @return boolean
+     */
+    public boolean protectDefaultPage(Page page) {
+        String id = page.getParentId();
+        if("0".equals(id)){
+            return true;
+        }
+        String parentId = this.getParentPage(id);
+        int subPageId = this.getSubPage(parentId);
+        if (subPageId == 0) {
+            return true;
+        }
+
+        UpdateWrapper<Page> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", subPageId)
+                .set("is_default", false);
+        int result = pageMapper.update(null, updateWrapper);
+
+        if (result < 1) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 查询父页面
+     * @param parentId the parentId
+     * @return parentId the parentId
+     */
+    private String getParentPage(String parentId) {
+
+        Page page = pageMapper.queryPageById(Integer.parseInt(parentId));
+        if (page.getIsPage() || "0".equals(page.getParentId())) {
+            return parentId;
+        }
+        return this.getParentPage(page.getParentId());
+    }
+
+    /**
+     * 查询默认子页面
+     * @param parentId the parentId
+     * @return subPageId the subPageId
+     */
+    private int getSubPage(String parentId) {
+        // 基础的检查
+        if ("0".equals(parentId)) {
+            return 0; // 0 表示没有父页面
+        }
+        // 查找子页面列表
+        Page pageParam = new Page();
+        pageParam.setParentId(parentId);
+        List<Page> pageList = pageMapper.queryPageByCondition(pageParam);
+
+        // 遍历页面列表，查找默认的子页面
+        for (Page page : pageList) {
+            if (page.getIsPage() && page.getIsDefault()) {
+                return page.getId(); // 找到默认子页面，返回其ID
+            } else if (!page.getIsPage()) {
+                // 如果不是页面，递归查找子页面
+                int subPageId = getSubPage(String.valueOf(page.getId()));
+                if (subPageId > 0) {
+                    return subPageId; // 如果找到了子页面ID，返回
+                }
             }
         }
+
+        return 0; // 如果没有找到符合条件的子页面，返回null
     }
 
     /**

base/src/main/resources/mappers/BlockGroupMapper.xml

@@ -356,8 +356,7 @@
         <set>
             <include refid="BlockGroupSetColumns"/>
         </set>
-        WHERE
-        id=#{id}
+        WHERE id = #{id}
     </update>
 
     <!-- 新增表t_block_group数据 -->

base/src/main/resources/mappers/PageMapper.xml

@@ -305,55 +305,54 @@
         <set>
             <include refid="PageSetColumns"/>
         </set>
-        WHERE
-        id=#{id}
+        WHERE id = #{id}
     </update>
 
     <!-- 新增表t_page数据 -->
     <insert id="createPage" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.tinyengine.it.model.entity.Page">
         INSERT INTO t_page ( id
-        , name
-        , app_id
-        , route
-        , page_content
-        , is_body
-        , parent_id
-        , `group`
-        , `depth`
-        , is_page
-        , occupier_by
-        , is_default
-        , content_blocks
-        , latest_version
-        , latest_history_id
-        , created_by
-        , last_updated_by
-        , created_time
-        , last_updated_time
-        , tenant_id, renter_id
-        , site_id)
+                           , name
+                           , app_id
+                           , route
+                           , page_content
+                           , is_body
+                           , parent_id
+                           , `group`
+                           , `depth`
+                           , is_page
+                           , occupier_by
+                           , is_default
+                           , content_blocks
+                           , latest_version
+                           , latest_history_id
+                           , created_by
+                           , last_updated_by
+                           , created_time
+                           , last_updated_time
+                           , tenant_id, renter_id
+                           , site_id)
         VALUES ( #{id}
-        , #{name}
-        , #{app}
-        , #{route}
-        , #{pageContent}
-        , #{isBody}
-        , #{parentId}
-        , #{group}
-        , #{depth}
-        , #{isPage}
-        , #{occupierBy}
-        , #{isDefault}
-        , #{contentBlocks}
-        , #{latestVersion}
-        , #{latestHistoryId}
-        , #{createdBy}
-        , #{lastUpdatedBy}
-        , #{createdTime}
-        , #{lastUpdatedTime}
-        , #{tenantId}
-        , #{renterId}
-        , #{siteId})
+               , #{name}
+               , #{app}
+               , #{route}
+               , #{pageContent}
+               , #{isBody}
+               , #{parentId}
+               , #{group}
+               , #{depth}
+               , #{isPage}
+               , #{occupierBy}
+               , #{isDefault}
+               , #{contentBlocks}
+               , #{latestVersion}
+               , #{latestHistoryId}
+               , #{createdBy}
+               , #{lastUpdatedBy}
+               , #{createdTime}
+               , #{lastUpdatedTime}
+               , #{tenantId}
+               , #{renterId}
+               , #{siteId})
     </insert>
 </mapper>

base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java

@@ -98,19 +98,5 @@ void testExecuteChatRequest() {
         Map<String, Object> returnData = aiChatClient.executeChatRequest(param);
         Assertions.assertNull(returnData.get("data"));
     }
-
-    @Test
-    void testInvalidTokenExecuteChatRequest() {
-        HashMap<String, String> foundationModel = new HashMap<>();
-        foundationModel.put("model", "gpt-3.5-turbo");
-        foundationModel.put("token","你好");
-        ArrayList<AiMessages> messages = new ArrayList<>();
-        AiMessages aiMessages = new AiMessages();
-        aiMessages.setContent("dddd编码时遵从以下几条要求aaa");
-        messages.add(aiMessages);
-        AiParam param = new AiParam(foundationModel,Arrays.asList(aiMessages));
-        Map<String, Object> returnData = aiChatClient.executeChatRequest(param);
-        Assertions.assertEquals("Invalid token format",returnData.get("error_message"));
-    }
 }
 

base/src/test/java/com/tinyengine/it/service/app/impl/PageServiceImplTest.java

@@ -202,14 +202,14 @@ void testUpdatePage() {
         int pageId = 123;
         param.setId(pageId);
         param.setIsHome(false);
-        param.setParentId("1");
+        param.setParentId("0");
         param.setOccupierBy("555");
 
         Page queryPage = new Page();
         queryPage.setApp(222);
         queryPage.setIsPage(false);
         queryPage.setIsHome(false);
-        queryPage.setParentId("1");
+        queryPage.setParentId("0");
         queryPage.setIsDefault(false);
         when(pageMapper.queryPageById(pageId)).thenReturn(queryPage);