From 6d661046d610b9602d5c05dc6bff607244bcc337 Mon Sep 17 00:00:00 2001 From: pengren Date: Thu, 25 Apr 2024 14:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApplyListInfoController.java | 3 ++ .../sf/common/enums/RequestHeaderEnums.java | 42 +++++++++++++++++++ .../sf/common/utils/http/RequestUtils.java | 20 +++++++++ .../DeploymentApplyEnvironmentController.java | 11 +++++ .../DeploymentModuleListController.java | 6 ++- .../DeploymentServicePublishController.java | 4 ++ .../controller/SysApkInfoController.java | 4 ++ .../domain/DeploymentApplyEnvironment.java | 12 +++--- .../DeploymentApplyEnvironmentMapper.xml | 13 +++--- .../DeploymentServicePublishMapper.xml | 3 ++ .../system/deployment/SysApkInfoMapper.xml | 8 ++-- 11 files changed, 109 insertions(+), 17 deletions(-) create mode 100644 sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java create mode 100644 sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java diff --git a/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java b/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java index 90ca829..bfc6939 100644 --- a/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java +++ b/sf-admin/src/main/java/com/sf/index/controller/ApplyListInfoController.java @@ -77,6 +77,8 @@ public class ApplyListInfoController extends BaseController @PostMapping public AjaxResult add(@RequestBody ApplyListInfo applyListInfo) { + applyListInfo.setCreated(getUsername()); + applyListInfo.setModified(getUsername()); return toAjax(applyListInfoService.insertApplyListInfo(applyListInfo)); } @@ -88,6 +90,7 @@ public class ApplyListInfoController extends BaseController @PutMapping public AjaxResult edit(@RequestBody ApplyListInfo applyListInfo) { + applyListInfo.setModified(getUsername()); return toAjax(applyListInfoService.updateApplyListInfo(applyListInfo)); } diff --git a/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java b/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java new file mode 100644 index 0000000..ec004a2 --- /dev/null +++ b/sf-common/src/main/java/com/sf/common/enums/RequestHeaderEnums.java @@ -0,0 +1,42 @@ +package com.sf.common.enums; + +import java.util.HashMap; +import java.util.Map; + +/** + * header参数 + * + * @author ztzh + * + */ +public enum RequestHeaderEnums +{ + /** + * 通知完成指令，用于客户端收到通知消息的确认 + */ + APP_CODE("appCode"), + ; + + private static Map map = new HashMap<>(); + + static { + for (RequestHeaderEnums type : RequestHeaderEnums.values()) { + map.put(type.code, type); + } + } + + + private String code; + + RequestHeaderEnums(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + + public static final RequestHeaderEnums getByCode(String code) { + return map.get(code); + } +} diff --git a/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java b/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java new file mode 100644 index 0000000..e9d20df --- /dev/null +++ b/sf-common/src/main/java/com/sf/common/utils/http/RequestUtils.java @@ -0,0 +1,20 @@ +package com.sf.common.utils.http; + +import com.sf.common.utils.StringUtils; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +public class RequestUtils { + + public static String getHeader(String code){ + RequestAttributes requestAttributes1 = RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = ((ServletRequestAttributes) requestAttributes1).getRequest(); + if(StringUtils.isBlank(request.getHeader(code))){ + throw new SecurityException("参数异常appCode为空"); + } + return request.getHeader(code); + } +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java index bd25e7b..53b31fa 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java @@ -1,8 +1,14 @@ package com.sf.system.deployment.controller; import java.util.List; +import javax.servlet.ServletRequest; +import javax.servlet.ServletRequestAttributeEvent; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.sf.common.enums.RequestHeaderEnums; +import com.sf.common.utils.StringUtils; +import com.sf.common.utils.http.RequestUtils; import com.sf.system.deployment.domain.DeploymentApplyEnvironment; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +27,9 @@ import com.sf.common.enums.BusinessType; import com.sf.deployment.service.IDeploymentApplyEnvironmentService; import com.sf.common.utils.poi.ExcelUtil; import com.sf.common.core.page.TableDataInfo; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; /** * 环境维护Controller @@ -42,6 +51,7 @@ public class DeploymentApplyEnvironmentController extends BaseController @GetMapping("/list") public TableDataInfo list(DeploymentApplyEnvironment deploymentApplyEnvironment) { + deploymentApplyEnvironment.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); startPage(); List list = deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment); return getDataTable(list); @@ -78,6 +88,7 @@ public class DeploymentApplyEnvironmentController extends BaseController @PostMapping public AjaxResult add(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) { + deploymentApplyEnvironment.setAppCode( RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); return toAjax(deploymentApplyEnvironmentService.insertDeploymentApplyEnvironment(deploymentApplyEnvironment)); } diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java index ac95292..7418ce4 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java @@ -3,7 +3,9 @@ package com.sf.system.deployment.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.sf.common.enums.RequestHeaderEnums; import com.sf.common.utils.StringUtils; +import com.sf.common.utils.http.RequestUtils; import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +46,7 @@ public class DeploymentModuleListController extends BaseController @GetMapping("/list") public TableDataInfo list(DeploymentModuleList deploymentModuleList) { + deploymentModuleList.setAppCore(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); startPage(); List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); return getDataTable(list); @@ -55,7 +58,7 @@ public class DeploymentModuleListController extends BaseController public AjaxResult queryByCore(ModuleListByCoreRequest request) { if(StringUtils.isEmpty(request.getAppCore())){ - return error("appCore不能为空"); + throw new SecurityException("参数异常appCode为空"); } DeploymentModuleList deploymentModuleList = new DeploymentModuleList(); deploymentModuleList.setAppCore(request.getAppCore()); @@ -95,6 +98,7 @@ public class DeploymentModuleListController extends BaseController @PostMapping public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList) { + deploymentModuleList.setAppCore(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); return toAjax(deploymentModuleListService.insertDeploymentModuleList(deploymentModuleList)); } diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java index afe1e18..6c04f89 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java @@ -3,7 +3,9 @@ package com.sf.system.deployment.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.sf.common.enums.RequestHeaderEnums; import com.sf.common.utils.DateUtils; +import com.sf.common.utils.http.RequestUtils; import com.sf.system.deployment.domain.DeploymentServicePublish; import com.sf.system.deployment.service.IDeploymentServicePublishService; import org.springframework.security.access.prepost.PreAuthorize; @@ -44,6 +46,7 @@ public class DeploymentServicePublishController extends BaseController @GetMapping("/list") public TableDataInfo list(DeploymentServicePublish deploymentServicePublish) { + deploymentServicePublish.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); startPage(); List list = deploymentServicePublishService.selectDeploymentServicePublishList(deploymentServicePublish); return getDataTable(list); @@ -80,6 +83,7 @@ public class DeploymentServicePublishController extends BaseController @PostMapping public AjaxResult add(@RequestBody DeploymentServicePublish deploymentServicePublish) { + deploymentServicePublish.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); return toAjax(deploymentServicePublishService.insertDeploymentServicePublish(deploymentServicePublish)); } diff --git a/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java b/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java index 65b298e..dfc5970 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/SysApkInfoController.java @@ -5,6 +5,8 @@ import com.sf.common.core.controller.BaseController; import com.sf.common.core.domain.AjaxResult; import com.sf.common.core.page.TableDataInfo; import com.sf.common.enums.BusinessType; +import com.sf.common.enums.RequestHeaderEnums; +import com.sf.common.utils.http.RequestUtils; import com.sf.common.utils.poi.ExcelUtil; import com.sf.system.deployment.domain.SysApkInfo; import com.sf.system.deployment.service.ISysApkInfoService; @@ -35,6 +37,7 @@ public class SysApkInfoController extends BaseController @GetMapping("/list") public TableDataInfo list(SysApkInfo sysApkInfo) { + sysApkInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); startPage(); List list = sysApkInfoService.selectSysApkInfoList(sysApkInfo); return getDataTable(list); @@ -71,6 +74,7 @@ public class SysApkInfoController extends BaseController @PostMapping public AjaxResult add(@RequestBody SysApkInfo sysApkInfo) { + sysApkInfo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); sysApkInfo.setCreated(getUsername()); sysApkInfo.setModified(getUsername()); return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo)); diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java index 6531a20..7e2872d 100644 --- a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java +++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java @@ -22,7 +22,7 @@ public class DeploymentApplyEnvironment extends BaseEntity private Long appId; /** 应用编号 */ - private String applyCode; + private String appCode; /** 环境名称 */ @Excel(name = "环境名称") @@ -58,14 +58,14 @@ public class DeploymentApplyEnvironment extends BaseEntity { return appId; } - public void setApplyCode(String applyCode) + public void setAppCode(String appCode) { - this.applyCode = applyCode; + this.appCode = appCode; } - public String getApplyCode() + public String getAppCode() { - return applyCode; + return appCode; } public void setName(String name) { @@ -109,7 +109,7 @@ public class DeploymentApplyEnvironment extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("appId", getAppId()) - .append("applyCode", getApplyCode()) + .append("applyCode", getAppCode()) .append("name", getName()) .append("serverAddress", getServerAddress()) .append("remark", getRemark()) diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml index 81b5f73..0438c2c 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml +++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,12 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, app_id, apply_code, name, server_address, remark, is_delete, create_dept, create_time, create_by, update_time, update_by from DEPLOYMENT_APPLY_ENVIRONMENT + select id, app_id, app_code, name, server_address, remark, is_delete, create_dept, create_time, create_by, update_time, update_by from DEPLOYMENT_APPLY_ENVIRONMENT @@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into DEPLOYMENT_APPLY_ENVIRONMENT app_id, - apply_code, + app_code, name, server_address, remark, @@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{appId}, - #{applyCode}, + #{appCode}, #{name}, #{serverAddress}, #{remark}, @@ -69,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update DEPLOYMENT_APPLY_ENVIRONMENT app_id = #{appId}, - apply_code = #{applyCode}, + apply_code = #{appCode}, name = #{name}, server_address = #{serverAddress}, remark = #{remark}, diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml index 0d66211..c2623bb 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml +++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml @@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and app_name like concat('%', #{appName}, '%') + and app_code = #{appCode} and version = #{version} and validity_start_time = #{validityStartTime} and validity_end_time = #{validityEndTime} @@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" apply_id, app_name, + app_code, apk_url, system_type, apk_id, @@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{applyId}, #{appName}, + #{appCode}, #{apkUrl}, #{systemType}, #{apkId}, diff --git a/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml index 6a898e4..d741c83 100644 --- a/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml +++ b/sf-system/src/main/resources/mapper/system/deployment/SysApkInfoMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, app_id,app_code, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from SYS_APK_INFO + select id, app_id,app_code, uploading_type, sys_apk_name, version, sys_apk, sys_apk_size, sys_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_APK_INFO - insert into SYS_APK_INFO + insert into DEPLOYMENT_APK_INFO uploading_type, sys_apk_name, @@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update SYS_APK_INFO + update DEPLOYMENT_APK_INFO uploading_type = #{uploadingType}, sys_apk_name = #{sysApkName}, @@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from SYS_APK_INFO where id = #{id} + delete from DEPLOYMENT_APK_INFO where id = #{id}