From 016202e022cf1b9fc138c0843c6fc28455953079 Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Sun, 23 Apr 2023 11:25:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3#I6UY6K,#I6UWOW,=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=B8=8BPO=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ProjectPageObjectMapper.java | 6 +- .../service/IProjectPageObjectService.java | 2 + .../service/ProjectPageObjectServiceImpl.java | 26 ++++ .../testmanagmt/ProjectPageObjectMapper.xml | 120 ++++++++++-------- .../testmanagmt/projectPageDetail/edit.html | 8 +- .../testmanagmt/projectPageObject/add.html | 11 +- .../testmanagmt/projectPageObject/edit.html | 7 +- 7 files changed, 117 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java index 7de3528..57bed93 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/mapper/ProjectPageObjectMapper.java @@ -1,5 +1,6 @@ package com.luckyframe.project.testmanagmt.projectPageObject.mapper; +import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase; import com.luckyframe.project.testmanagmt.projectPageObject.domain.ProjectPageObject; import java.util.List; @@ -59,5 +60,8 @@ public interface ProjectPageObjectMapper * @return 结果 */ public int deleteProjectPageObjectByIds(String[] projectIds); - + + public List selectProjectCaseByPageId(int pageId); + + } \ No newline at end of file diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java index 0cd75d1..ca0650d 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/IProjectPageObjectService.java @@ -1,5 +1,6 @@ package com.luckyframe.project.testmanagmt.projectPageObject.service; +import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase; import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCaseSteps; import com.luckyframe.project.testmanagmt.projectPageObject.domain.ProjectPageObject; @@ -61,5 +62,6 @@ public interface IProjectPageObjectService { */ public List getAllPageObject2(int projectId); + public List selectProjectCaseByPageId(int pageId); } diff --git a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java index 554d143..c621504 100644 --- a/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java +++ b/src/main/java/com/luckyframe/project/testmanagmt/projectPageObject/service/ProjectPageObjectServiceImpl.java @@ -1,13 +1,16 @@ package com.luckyframe.project.testmanagmt.projectPageObject.service; import com.luckyframe.common.constant.Constants; +import com.luckyframe.common.exception.BusinessException; import com.luckyframe.common.support.Convert; +import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCase; import com.luckyframe.project.testmanagmt.projectCase.domain.ProjectCaseSteps; import com.luckyframe.project.testmanagmt.projectPageDetail.domain.ProjectPageDetail; import com.luckyframe.project.testmanagmt.projectPageDetail.mapper.ProjectPageDetailMapper; import com.luckyframe.project.testmanagmt.projectPageObject.domain.IbasePageObject; import com.luckyframe.project.testmanagmt.projectPageObject.domain.ProjectPageObject; import com.luckyframe.project.testmanagmt.projectPageObject.mapper.ProjectPageObjectMapper; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,6 +21,7 @@ import java.util.Map; /** * 页面配置管理 服务层实现 + * * @author YSS陈再兴 * @date 2022-03-10 */ @@ -81,6 +85,23 @@ public class ProjectPageObjectServiceImpl implements IProjectPageObjectService, */ @Override public int deleteProjectPageObjectByIds(String ids) { + //增加判断，如果关联了用例，则不能进行删除 + String[] idss = ids.split(","); + StringBuilder sb = new StringBuilder(); + for (String id : idss) { + List list = projectPageObjectMapper.selectProjectCaseByPageId(Integer.parseInt(id)); + if (CollectionUtils.isNotEmpty(list)) { + StringBuilder stringBuilder = new StringBuilder(); + for (ProjectCase projectCase : list) { + stringBuilder.append(projectCase.getCaseName()).append(";"); + } + ProjectPageObject pageObject = projectPageObjectMapper.selectProjectPageObjectById(Integer.parseInt(id)); + sb.append("页面不能被删除,页面:" + pageObject.getPageName() + "关联了用例:" + stringBuilder.toString()).append(";"); + } + } + if (sb.length() != 0) { + throw new BusinessException(sb.toString()); + } return projectPageObjectMapper.deleteProjectPageObjectByIds(Convert.toStrArray(ids)); } @@ -98,4 +119,9 @@ public class ProjectPageObjectServiceImpl implements IProjectPageObjectService, } return projectPageObjectsList; } + + @Override + public List selectProjectCaseByPageId(int pageId) { + return projectPageObjectMapper.selectProjectCaseByPageId(pageId); + } } diff --git a/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml b/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml index 089ce23..af37c41 100644 --- a/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml +++ b/src/main/resources/mybatis/testmanagmt/ProjectPageObjectMapper.xml @@ -1,74 +1,94 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + select project_id, create_by, create_time, update_by, update_time, remark, page_id, page_name,page_parentmenu,page_menu from project_page_object - + - + - + + + + insert into project_page_object - - project_id, - create_by, - create_time, - update_by, - update_time, - remark, - page_id, - page_name, + + project_id, + create_by, + create_time, + update_by, + update_time, + remark, + page_id, + page_name, page_parentmenu, page_menu, - #{projectId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{pageId}, - #{pageName}, + #{projectId}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{pageId}, + #{pageName}, #{pageParentMenu}, #{pageMenu}, @@ -91,15 +111,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where page_id = #{pageId} - + delete from project_page_object where page_id = #{page_id} - + delete from project_page_object where page_id in #{pageId} - + \ No newline at end of file diff --git a/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html b/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html index 884f3f7..3bbb51b 100644 --- a/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html +++ b/src/main/resources/templates/testmanagmt/projectPageDetail/edit.html @@ -21,7 +21,13 @@
- +
diff --git a/src/main/resources/templates/testmanagmt/projectPageObject/add.html b/src/main/resources/templates/testmanagmt/projectPageObject/add.html index 3eff554..e6e933b 100644 --- a/src/main/resources/templates/testmanagmt/projectPageObject/add.html +++ b/src/main/resources/templates/testmanagmt/projectPageObject/add.html @@ -8,15 +8,12 @@
- + -
+
-
diff --git a/src/main/resources/templates/testmanagmt/projectPageObject/edit.html b/src/main/resources/templates/testmanagmt/projectPageObject/edit.html index 0eb534e..25f6156 100644 --- a/src/main/resources/templates/testmanagmt/projectPageObject/edit.html +++ b/src/main/resources/templates/testmanagmt/projectPageObject/edit.html @@ -9,10 +9,9 @@
- +
-- Gitee From 3cb25a4271d7a0194f25a16e7da4553f9eff8a04 Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Sun, 23 Apr 2023 11:27:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E6=8C=87=E5=AE=9A1.6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E7=BC=96=E8=AF=91=EF=BC=8C=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e27f015..35b465b 100644 --- a/pom.xml +++ b/pom.xml @@ -345,14 +345,7 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 6 - 6 - - + -- Gitee From 54f19f826eebd77f438fb7f42829afac280be0b0 Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Sun, 23 Apr 2023 11:34:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"fix:=E5=8E=BB=E6=8E=89=E6=8C=87?= =?UTF-8?q?=E5=AE=9A1.6=E7=89=88=E6=9C=AC=E7=9A=84=E7=BC=96=E8=AF=91?= =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3cb25a42 --- pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35b465b..e27f015 100644 --- a/pom.xml +++ b/pom.xml @@ -345,7 +345,14 @@ - + + org.apache.maven.plugins + maven-compiler-plugin + + 6 + 6 + + -- Gitee From a6c690af659bee86e6934fba2d79a6b486c08e8a Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Sun, 23 Apr 2023 11:51:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=8D=E6=96=B0pull=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 31e276b..7f7412d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.luckyframe @@ -32,7 +32,7 @@ 2.5 1.3.3 1.19 - + 1.7 2.3.2 2.7.0 @@ -49,7 +49,7 @@ org.springframework.boot spring-boot-starter - @@ -286,11 +286,11 @@ io.netty netty-all - - org.projectlombok - lombok - - + + org.projectlombok + lombok + + @@ -345,16 +345,16 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 6 - 6 - - - - + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + -- Gitee From 85880752f2a232945b26d672e1e1bad7a9d3bb2e Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Sun, 23 Apr 2023 13:09:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=87=8D=E6=96=B0pull=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=A7=A3=E5=86=B3#I6UY6K,#I6UWOW,?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=8BPO=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/testmanagmt/projectPageObject/add.html | 7 +++---- .../templates/testmanagmt/projectPageObject/edit.html | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/testmanagmt/projectPageObject/add.html b/src/main/resources/templates/testmanagmt/projectPageObject/add.html index 27ee789..c2368de 100644 --- a/src/main/resources/templates/testmanagmt/projectPageObject/add.html +++ b/src/main/resources/templates/testmanagmt/projectPageObject/add.html @@ -8,10 +8,9 @@
- +
diff --git a/src/main/resources/templates/testmanagmt/projectPageObject/edit.html b/src/main/resources/templates/testmanagmt/projectPageObject/edit.html index 25f6156..7104fb3 100644 --- a/src/main/resources/templates/testmanagmt/projectPageObject/edit.html +++ b/src/main/resources/templates/testmanagmt/projectPageObject/edit.html @@ -11,7 +11,7 @@
-- Gitee From 445318ac1cf83745153a7fc207c81327ec6bb969 Mon Sep 17 00:00:00 2001 From: chenzaixing Date: Wed, 26 Apr 2023 13:45:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=EF=BC=9A=E6=96=87=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/luckyframe/common/netty/ServerHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/luckyframe/common/netty/ServerHandler.java b/src/main/java/com/luckyframe/common/netty/ServerHandler.java index 9f316f7..6db632e 100644 --- a/src/main/java/com/luckyframe/common/netty/ServerHandler.java +++ b/src/main/java/com/luckyframe/common/netty/ServerHandler.java @@ -263,7 +263,7 @@ public class ServerHandler extends ChannelHandlerAdapter { JSONObject tmp = new JSONObject(); tmp.put(CLIENT_METHOD, "upload"); tmp.put(CLIENT_SUCCESS, "1"); - if(IMG_NAME.endsWith(".png")){ + if(json.get(IMG_NAME).toString().endsWith(".png")){ FileUploadFile ef = re.getFileUploadFile(); byte[] bytes = ef.getBytes(); int byteRead = ef.getEndPos(); -- Gitee