From beefea5aaf7e582a271bb5c8949458ac020ecafc Mon Sep 17 00:00:00 2001 From: pengren Date: Fri, 19 Apr 2024 17:21:04 +0800 Subject: [PATCH 1/4] =?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=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=8E=E7=8E=AF=E5=A2=83=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeploymentApplyEnvironmentController.java | 105 ++++ .../DeploymentServicePublishController.java | 105 ++++ .../domain/DeploymentApplyEnvironment.java | 124 +++++ .../domain/DeploymentServicePublish.java | 321 ++++++++++++ .../DeploymentApplyEnvironmentMapper.java | 62 +++ .../DeploymentServicePublishMapper.java | 62 +++ .../IDeploymentApplyEnvironmentService.java | 62 +++ .../IDeploymentServicePublishService.java | 62 +++ ...DeploymentApplyEnvironmentServiceImpl.java | 96 ++++ .../DeploymentServicePublishServiceImpl.java | 96 ++++ .../DeploymentApplyEnvironmentMapper.xml | 96 ++++ .../DeploymentServicePublishMapper.xml | 147 ++++++ sf-ui/src/api/deployment/environment.js | 44 ++ sf-ui/src/api/deployment/publish.js | 44 ++ .../views/deployment/environment/index.vue | 274 ++++++++++ sf-ui/src/views/deployment/publish/index.vue | 472 ++++++++++++++++++ 16 files changed, 2172 insertions(+) create mode 100644 sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java create mode 100644 sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml create mode 100644 sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml create mode 100644 sf-ui/src/api/deployment/environment.js create mode 100644 sf-ui/src/api/deployment/publish.js create mode 100644 sf-ui/src/views/deployment/environment/index.vue create mode 100644 sf-ui/src/views/deployment/publish/index.vue 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 new file mode 100644 index 0000000..c52a34d --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java @@ -0,0 +1,105 @@ +package com.sf.deployment.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.sf.system.deployment.domain.DeploymentApplyEnvironment; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.sf.common.annotation.Log; +import com.sf.common.core.controller.BaseController; +import com.sf.common.core.domain.AjaxResult; +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; + +/** + * 环境维护Controller + * + * @author ztzh + * @date 2024-04-19 + */ +@RestController +@RequestMapping("/deployment/environment") +public class DeploymentApplyEnvironmentController extends BaseController +{ + @Autowired + private IDeploymentApplyEnvironmentService deploymentApplyEnvironmentService; + + /** + * 查询环境维护列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:environment:list')") + @GetMapping("/list") + public TableDataInfo list(DeploymentApplyEnvironment deploymentApplyEnvironment) + { + startPage(); + List list = deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment); + return getDataTable(list); + } + + /** + * 导出环境维护列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:environment:export')") + @Log(title = "环境维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DeploymentApplyEnvironment deploymentApplyEnvironment) + { + List list = deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment); + ExcelUtil util = new ExcelUtil(DeploymentApplyEnvironment.class); + util.exportExcel(response, list, "环境维护数据"); + } + + /** + * 获取环境维护详细信息 + */ + @PreAuthorize("@ss.hasPermi('deployment:environment:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(deploymentApplyEnvironmentService.selectDeploymentApplyEnvironmentById(id)); + } + + /** + * 新增环境维护 + */ + @PreAuthorize("@ss.hasPermi('deployment:environment:add')") + @Log(title = "环境维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) + { + return toAjax(deploymentApplyEnvironmentService.insertDeploymentApplyEnvironment(deploymentApplyEnvironment)); + } + + /** + * 修改环境维护 + */ + @PreAuthorize("@ss.hasPermi('deployment:environment:edit')") + @Log(title = "环境维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DeploymentApplyEnvironment deploymentApplyEnvironment) + { + return toAjax(deploymentApplyEnvironmentService.updateDeploymentApplyEnvironment(deploymentApplyEnvironment)); + } + + /** + * 删除环境维护 + */ + @PreAuthorize("@ss.hasPermi('deployment:environment:remove')") + @Log(title = "环境维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(deploymentApplyEnvironmentService.deleteDeploymentApplyEnvironmentByIds(ids)); + } +} 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 new file mode 100644 index 0000000..12d0459 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java @@ -0,0 +1,105 @@ +package com.sf.system.deployment.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.sf.system.deployment.domain.DeploymentServicePublish; +import com.sf.system.deployment.service.IDeploymentServicePublishService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.sf.common.annotation.Log; +import com.sf.common.core.controller.BaseController; +import com.sf.common.core.domain.AjaxResult; +import com.sf.common.enums.BusinessType; +import com.sf.common.utils.poi.ExcelUtil; +import com.sf.common.core.page.TableDataInfo; + +/** + * 发布列表Controller + * + * @author ztzh + * @date 2024-04-19 + */ +@RestController +@RequestMapping("/deployment/publish") +public class DeploymentServicePublishController extends BaseController +{ + @Autowired + private IDeploymentServicePublishService deploymentServicePublishService; + + /** + * 查询发布列表列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:publish:list')") + @GetMapping("/list") + public TableDataInfo list(DeploymentServicePublish deploymentServicePublish) + { + startPage(); + List list = deploymentServicePublishService.selectDeploymentServicePublishList(deploymentServicePublish); + return getDataTable(list); + } + + /** + * 导出发布列表列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:publish:export')") + @Log(title = "发布列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DeploymentServicePublish deploymentServicePublish) + { + List list = deploymentServicePublishService.selectDeploymentServicePublishList(deploymentServicePublish); + ExcelUtil util = new ExcelUtil(DeploymentServicePublish.class); + util.exportExcel(response, list, "发布列表数据"); + } + + /** + * 获取发布列表详细信息 + */ + @PreAuthorize("@ss.hasPermi('deployment:publish:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(deploymentServicePublishService.selectDeploymentServicePublishById(id)); + } + + /** + * 新增发布列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:publish:add')") + @Log(title = "发布列表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DeploymentServicePublish deploymentServicePublish) + { + return toAjax(deploymentServicePublishService.insertDeploymentServicePublish(deploymentServicePublish)); + } + + /** + * 修改发布列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:publish:edit')") + @Log(title = "发布列表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DeploymentServicePublish deploymentServicePublish) + { + return toAjax(deploymentServicePublishService.updateDeploymentServicePublish(deploymentServicePublish)); + } + + /** + * 删除发布列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:publish:remove')") + @Log(title = "发布列表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(deploymentServicePublishService.deleteDeploymentServicePublishByIds(ids)); + } +} 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 new file mode 100644 index 0000000..6531a20 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java @@ -0,0 +1,124 @@ +package com.sf.system.deployment.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.sf.common.annotation.Excel; +import com.sf.common.core.domain.BaseEntity; + +/** + * 环境维护对象 DEPLOYMENT_APPLY_ENVIRONMENT + * + * @author ztzh + * @date 2024-04-19 + */ +public class DeploymentApplyEnvironment extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 应用id */ + private Long appId; + + /** 应用编号 */ + private String applyCode; + + /** 环境名称 */ + @Excel(name = "环境名称") + private String name; + + /** 服务器地址 */ + @Excel(name = "服务器地址") + private String serverAddress; + + /** 逻辑删除标识 +0:未删除 +1:已删除 */ + private Long isDelete; + + /** 创建部门 */ + private Long createDept; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAppId(Long appId) + { + this.appId = appId; + } + + public Long getAppId() + { + return appId; + } + public void setApplyCode(String applyCode) + { + this.applyCode = applyCode; + } + + public String getApplyCode() + { + return applyCode; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setServerAddress(String serverAddress) + { + this.serverAddress = serverAddress; + } + + public String getServerAddress() + { + return serverAddress; + } + public void setIsDelete(Long isDelete) + { + this.isDelete = isDelete; + } + + public Long getIsDelete() + { + return isDelete; + } + public void setCreateDept(Long createDept) + { + this.createDept = createDept; + } + + public Long getCreateDept() + { + return createDept; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("appId", getAppId()) + .append("applyCode", getApplyCode()) + .append("name", getName()) + .append("serverAddress", getServerAddress()) + .append("remark", getRemark()) + .append("isDelete", getIsDelete()) + .append("createDept", getCreateDept()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .toString(); + } +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java new file mode 100644 index 0000000..8dd44a9 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java @@ -0,0 +1,321 @@ +package com.sf.system.deployment.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.sf.common.annotation.Excel; +import com.sf.common.core.domain.BaseEntity; + +/** + * 发布列表对象 DEPLOYMENT_SERVICE_PUBLISH + * + * @author ztzh + * @date 2024-04-19 + */ +public class DeploymentServicePublish extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 应用id */ + @Excel(name = "应用id") + private Long applyId; + + /** 应用name */ + @Excel(name = "应用name") + private String appName; + + /** 系统类型 */ + @Excel(name = "系统类型") + private String systemType; + + /** 安装包编号 */ + @Excel(name = "安装包编号") + private String apkId; + + /** app store地址 */ + @Excel(name = "app store地址") + private String appStoreAddress; + + /** 版本号 */ + @Excel(name = "版本号") + private String version; + + /** 版本说明 */ + @Excel(name = "版本说明") + private String versionDesc; + + /** 发布环境 */ + @Excel(name = "发布环境") + private Long publishEnvironment; + + /** 发布策略 */ + @Excel(name = "发布策略") + private Long publishStrategy; + + /** 通知 */ + @Excel(name = "通知") + private Long resultNotify; + + /** 公开版 */ + @Excel(name = "公开版") + private Long publicVersion; + + /** 强制更新 */ + @Excel(name = "强制更新") + private Long forceUpdate; + + /** 下载验证 */ + @Excel(name = "下载验证") + private Long downloadVerification; + + /** 更新对象(-1: 不限制, 白名单id) */ + @Excel(name = "更新对象(-1: 不限制, 白名单id)") + private Long updateObject; + + /** 有效期开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "有效期开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date validityStartTime; + + /** 有效期结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "有效期结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date validityEndTime; + + /** 0:保存,1:已发布,2:已下架 */ + @Excel(name = "0:保存,1:已发布,2:已下架") + private Long status; + + /** 逻辑删除,0:未删除,1:删除 */ + private Long isDelete; + + /** 创建人 */ + private String created; + + /** 更新人 */ + private String modified; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setApplyId(Long applyId) + { + this.applyId = applyId; + } + + public Long getApplyId() + { + return applyId; + } + public void setAppName(String appName) + { + this.appName = appName; + } + + public String getAppName() + { + return appName; + } + public void setSystemType(String systemType) + { + this.systemType = systemType; + } + + public String getSystemType() + { + return systemType; + } + public void setApkId(String apkId) + { + this.apkId = apkId; + } + + public String getApkId() + { + return apkId; + } + public void setAppStoreAddress(String appStoreAddress) + { + this.appStoreAddress = appStoreAddress; + } + + public String getAppStoreAddress() + { + return appStoreAddress; + } + public void setVersion(String version) + { + this.version = version; + } + + public String getVersion() + { + return version; + } + public void setVersionDesc(String versionDesc) + { + this.versionDesc = versionDesc; + } + + public String getVersionDesc() + { + return versionDesc; + } + public void setPublishEnvironment(Long publishEnvironment) + { + this.publishEnvironment = publishEnvironment; + } + + public Long getPublishEnvironment() + { + return publishEnvironment; + } + public void setPublishStrategy(Long publishStrategy) + { + this.publishStrategy = publishStrategy; + } + + public Long getPublishStrategy() + { + return publishStrategy; + } + public void setResultNotify(Long resultNotify) + { + this.resultNotify = resultNotify; + } + + public Long getResultNotify() + { + return resultNotify; + } + public void setPublicVersion(Long publicVersion) + { + this.publicVersion = publicVersion; + } + + public Long getPublicVersion() + { + return publicVersion; + } + public void setForceUpdate(Long forceUpdate) + { + this.forceUpdate = forceUpdate; + } + + public Long getForceUpdate() + { + return forceUpdate; + } + public void setDownloadVerification(Long downloadVerification) + { + this.downloadVerification = downloadVerification; + } + + public Long getDownloadVerification() + { + return downloadVerification; + } + public void setUpdateObject(Long updateObject) + { + this.updateObject = updateObject; + } + + public Long getUpdateObject() + { + return updateObject; + } + public void setValidityStartTime(Date validityStartTime) + { + this.validityStartTime = validityStartTime; + } + + public Date getValidityStartTime() + { + return validityStartTime; + } + public void setValidityEndTime(Date validityEndTime) + { + this.validityEndTime = validityEndTime; + } + + public Date getValidityEndTime() + { + return validityEndTime; + } + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + public void setIsDelete(Long isDelete) + { + this.isDelete = isDelete; + } + + public Long getIsDelete() + { + return isDelete; + } + public void setCreated(String created) + { + this.created = created; + } + + public String getCreated() + { + return created; + } + public void setModified(String modified) + { + this.modified = modified; + } + + public String getModified() + { + return modified; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("applyId", getApplyId()) + .append("appName", getAppName()) + .append("systemType", getSystemType()) + .append("apkId", getApkId()) + .append("appStoreAddress", getAppStoreAddress()) + .append("version", getVersion()) + .append("versionDesc", getVersionDesc()) + .append("publishEnvironment", getPublishEnvironment()) + .append("publishStrategy", getPublishStrategy()) + .append("resultNotify", getResultNotify()) + .append("publicVersion", getPublicVersion()) + .append("forceUpdate", getForceUpdate()) + .append("downloadVerification", getDownloadVerification()) + .append("updateObject", getUpdateObject()) + .append("validityStartTime", getValidityStartTime()) + .append("validityEndTime", getValidityEndTime()) + .append("remark", getRemark()) + .append("status", getStatus()) + .append("isDelete", getIsDelete()) + .append("created", getCreated()) + .append("modified", getModified()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java new file mode 100644 index 0000000..905b7cc --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java @@ -0,0 +1,62 @@ +package com.sf.deployment.mapper; + +import com.sf.system.deployment.domain.DeploymentApplyEnvironment; + +import java.util.List; + +/** + * 环境维护Mapper接口 + * + * @author ztzh + * @date 2024-04-19 + */ +public interface DeploymentApplyEnvironmentMapper +{ + /** + * 查询环境维护 + * + * @param id 环境维护主键 + * @return 环境维护 + */ + public DeploymentApplyEnvironment selectDeploymentApplyEnvironmentById(Long id); + + /** + * 查询环境维护列表 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 环境维护集合 + */ + public List selectDeploymentApplyEnvironmentList(DeploymentApplyEnvironment deploymentApplyEnvironment); + + /** + * 新增环境维护 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 结果 + */ + public int insertDeploymentApplyEnvironment(DeploymentApplyEnvironment deploymentApplyEnvironment); + + /** + * 修改环境维护 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 结果 + */ + public int updateDeploymentApplyEnvironment(DeploymentApplyEnvironment deploymentApplyEnvironment); + + /** + * 删除环境维护 + * + * @param id 环境维护主键 + * @return 结果 + */ + public int deleteDeploymentApplyEnvironmentById(Long id); + + /** + * 批量删除环境维护 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeploymentApplyEnvironmentByIds(Long[] ids); +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java new file mode 100644 index 0000000..cf459aa --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentServicePublishMapper.java @@ -0,0 +1,62 @@ +package com.sf.system.deployment.mapper; + +import com.sf.system.deployment.domain.DeploymentServicePublish; + +import java.util.List; + +/** + * 发布列表Mapper接口 + * + * @author ztzh + * @date 2024-04-19 + */ +public interface DeploymentServicePublishMapper +{ + /** + * 查询发布列表 + * + * @param id 发布列表主键 + * @return 发布列表 + */ + public DeploymentServicePublish selectDeploymentServicePublishById(Long id); + + /** + * 查询发布列表列表 + * + * @param deploymentServicePublish 发布列表 + * @return 发布列表集合 + */ + public List selectDeploymentServicePublishList(DeploymentServicePublish deploymentServicePublish); + + /** + * 新增发布列表 + * + * @param deploymentServicePublish 发布列表 + * @return 结果 + */ + public int insertDeploymentServicePublish(DeploymentServicePublish deploymentServicePublish); + + /** + * 修改发布列表 + * + * @param deploymentServicePublish 发布列表 + * @return 结果 + */ + public int updateDeploymentServicePublish(DeploymentServicePublish deploymentServicePublish); + + /** + * 删除发布列表 + * + * @param id 发布列表主键 + * @return 结果 + */ + public int deleteDeploymentServicePublishById(Long id); + + /** + * 批量删除发布列表 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeploymentServicePublishByIds(Long[] ids); +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java new file mode 100644 index 0000000..3f8d855 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java @@ -0,0 +1,62 @@ +package com.sf.deployment.service; + +import com.sf.system.deployment.domain.DeploymentApplyEnvironment; + +import java.util.List; + +/** + * 环境维护Service接口 + * + * @author ztzh + * @date 2024-04-19 + */ +public interface IDeploymentApplyEnvironmentService +{ + /** + * 查询环境维护 + * + * @param id 环境维护主键 + * @return 环境维护 + */ + public DeploymentApplyEnvironment selectDeploymentApplyEnvironmentById(Long id); + + /** + * 查询环境维护列表 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 环境维护集合 + */ + public List selectDeploymentApplyEnvironmentList(DeploymentApplyEnvironment deploymentApplyEnvironment); + + /** + * 新增环境维护 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 结果 + */ + public int insertDeploymentApplyEnvironment(DeploymentApplyEnvironment deploymentApplyEnvironment); + + /** + * 修改环境维护 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 结果 + */ + public int updateDeploymentApplyEnvironment(DeploymentApplyEnvironment deploymentApplyEnvironment); + + /** + * 批量删除环境维护 + * + * @param ids 需要删除的环境维护主键集合 + * @return 结果 + */ + public int deleteDeploymentApplyEnvironmentByIds(Long[] ids); + + /** + * 删除环境维护信息 + * + * @param id 环境维护主键 + * @return 结果 + */ + public int deleteDeploymentApplyEnvironmentById(Long id); +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java new file mode 100644 index 0000000..a9ab32a --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java @@ -0,0 +1,62 @@ +package com.sf.system.deployment.service; + +import com.sf.system.deployment.domain.DeploymentServicePublish; + +import java.util.List; + +/** + * 发布列表Service接口 + * + * @author ztzh + * @date 2024-04-19 + */ +public interface IDeploymentServicePublishService +{ + /** + * 查询发布列表 + * + * @param id 发布列表主键 + * @return 发布列表 + */ + public DeploymentServicePublish selectDeploymentServicePublishById(Long id); + + /** + * 查询发布列表列表 + * + * @param deploymentServicePublish 发布列表 + * @return 发布列表集合 + */ + public List selectDeploymentServicePublishList(DeploymentServicePublish deploymentServicePublish); + + /** + * 新增发布列表 + * + * @param deploymentServicePublish 发布列表 + * @return 结果 + */ + public int insertDeploymentServicePublish(DeploymentServicePublish deploymentServicePublish); + + /** + * 修改发布列表 + * + * @param deploymentServicePublish 发布列表 + * @return 结果 + */ + public int updateDeploymentServicePublish(DeploymentServicePublish deploymentServicePublish); + + /** + * 批量删除发布列表 + * + * @param ids 需要删除的发布列表主键集合 + * @return 结果 + */ + public int deleteDeploymentServicePublishByIds(Long[] ids); + + /** + * 删除发布列表信息 + * + * @param id 发布列表主键 + * @return 结果 + */ + public int deleteDeploymentServicePublishById(Long id); +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java new file mode 100644 index 0000000..47945cc --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java @@ -0,0 +1,96 @@ +package com.sf.deployment.service.impl; + +import java.util.List; +import com.sf.common.utils.DateUtils; +import com.sf.system.deployment.domain.DeploymentApplyEnvironment; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.sf.deployment.mapper.DeploymentApplyEnvironmentMapper; +import com.sf.deployment.service.IDeploymentApplyEnvironmentService; + +/** + * 环境维护Service业务层处理 + * + * @author ztzh + * @date 2024-04-19 + */ +@Service +public class DeploymentApplyEnvironmentServiceImpl implements IDeploymentApplyEnvironmentService +{ + @Autowired + private DeploymentApplyEnvironmentMapper deploymentApplyEnvironmentMapper; + + /** + * 查询环境维护 + * + * @param id 环境维护主键 + * @return 环境维护 + */ + @Override + public DeploymentApplyEnvironment selectDeploymentApplyEnvironmentById(Long id) + { + return deploymentApplyEnvironmentMapper.selectDeploymentApplyEnvironmentById(id); + } + + /** + * 查询环境维护列表 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 环境维护 + */ + @Override + public List selectDeploymentApplyEnvironmentList(DeploymentApplyEnvironment deploymentApplyEnvironment) + { + return deploymentApplyEnvironmentMapper.selectDeploymentApplyEnvironmentList(deploymentApplyEnvironment); + } + + /** + * 新增环境维护 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 结果 + */ + @Override + public int insertDeploymentApplyEnvironment(DeploymentApplyEnvironment deploymentApplyEnvironment) + { + deploymentApplyEnvironment.setCreateTime(DateUtils.getNowDate()); + return deploymentApplyEnvironmentMapper.insertDeploymentApplyEnvironment(deploymentApplyEnvironment); + } + + /** + * 修改环境维护 + * + * @param deploymentApplyEnvironment 环境维护 + * @return 结果 + */ + @Override + public int updateDeploymentApplyEnvironment(DeploymentApplyEnvironment deploymentApplyEnvironment) + { + deploymentApplyEnvironment.setUpdateTime(DateUtils.getNowDate()); + return deploymentApplyEnvironmentMapper.updateDeploymentApplyEnvironment(deploymentApplyEnvironment); + } + + /** + * 批量删除环境维护 + * + * @param ids 需要删除的环境维护主键 + * @return 结果 + */ + @Override + public int deleteDeploymentApplyEnvironmentByIds(Long[] ids) + { + return deploymentApplyEnvironmentMapper.deleteDeploymentApplyEnvironmentByIds(ids); + } + + /** + * 删除环境维护信息 + * + * @param id 环境维护主键 + * @return 结果 + */ + @Override + public int deleteDeploymentApplyEnvironmentById(Long id) + { + return deploymentApplyEnvironmentMapper.deleteDeploymentApplyEnvironmentById(id); + } +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java new file mode 100644 index 0000000..1e1749c --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java @@ -0,0 +1,96 @@ +package com.sf.system.deployment.service.impl; + +import java.util.List; +import com.sf.common.utils.DateUtils; +import com.sf.system.deployment.domain.DeploymentServicePublish; +import com.sf.system.deployment.mapper.DeploymentServicePublishMapper; +import com.sf.system.deployment.service.IDeploymentServicePublishService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 发布列表Service业务层处理 + * + * @author ztzh + * @date 2024-04-19 + */ +@Service +public class DeploymentServicePublishServiceImpl implements IDeploymentServicePublishService +{ + @Autowired + private DeploymentServicePublishMapper deploymentServicePublishMapper; + + /** + * 查询发布列表 + * + * @param id 发布列表主键 + * @return 发布列表 + */ + @Override + public DeploymentServicePublish selectDeploymentServicePublishById(Long id) + { + return deploymentServicePublishMapper.selectDeploymentServicePublishById(id); + } + + /** + * 查询发布列表列表 + * + * @param deploymentServicePublish 发布列表 + * @return 发布列表 + */ + @Override + public List selectDeploymentServicePublishList(DeploymentServicePublish deploymentServicePublish) + { + return deploymentServicePublishMapper.selectDeploymentServicePublishList(deploymentServicePublish); + } + + /** + * 新增发布列表 + * + * @param deploymentServicePublish 发布列表 + * @return 结果 + */ + @Override + public int insertDeploymentServicePublish(DeploymentServicePublish deploymentServicePublish) + { + deploymentServicePublish.setCreateTime(DateUtils.getNowDate()); + return deploymentServicePublishMapper.insertDeploymentServicePublish(deploymentServicePublish); + } + + /** + * 修改发布列表 + * + * @param deploymentServicePublish 发布列表 + * @return 结果 + */ + @Override + public int updateDeploymentServicePublish(DeploymentServicePublish deploymentServicePublish) + { + deploymentServicePublish.setUpdateTime(DateUtils.getNowDate()); + return deploymentServicePublishMapper.updateDeploymentServicePublish(deploymentServicePublish); + } + + /** + * 批量删除发布列表 + * + * @param ids 需要删除的发布列表主键 + * @return 结果 + */ + @Override + public int deleteDeploymentServicePublishByIds(Long[] ids) + { + return deploymentServicePublishMapper.deleteDeploymentServicePublishByIds(ids); + } + + /** + * 删除发布列表信息 + * + * @param id 发布列表主键 + * @return 结果 + */ + @Override + public int deleteDeploymentServicePublishById(Long id) + { + return deploymentServicePublishMapper.deleteDeploymentServicePublishById(id); + } +} diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml new file mode 100644 index 0000000..81b5f73 --- /dev/null +++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into DEPLOYMENT_APPLY_ENVIRONMENT + + app_id, + apply_code, + name, + server_address, + remark, + is_delete, + create_dept, + create_time, + create_by, + update_time, + update_by, + + + #{appId}, + #{applyCode}, + #{name}, + #{serverAddress}, + #{remark}, + #{isDelete}, + #{createDept}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + + + + + update DEPLOYMENT_APPLY_ENVIRONMENT + + app_id = #{appId}, + apply_code = #{applyCode}, + name = #{name}, + server_address = #{serverAddress}, + remark = #{remark}, + is_delete = #{isDelete}, + create_dept = #{createDept}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from DEPLOYMENT_APPLY_ENVIRONMENT where id = #{id} + + + + delete from DEPLOYMENT_APPLY_ENVIRONMENT where id in + + #{id} + + + \ No newline at end of file diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml new file mode 100644 index 0000000..bd838e4 --- /dev/null +++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, apply_id, app_name, system_type, apk_id, app_store_address, version, version_desc, publish_environment, publish_strategy, result_notify, public_version, force_update, download_verification, update_object, validity_start_time, validity_end_time, remark, status, is_delete, created, modified, create_time, update_time from DEPLOYMENT_SERVICE_PUBLISH + + + + + + + + insert into DEPLOYMENT_SERVICE_PUBLISH + + apply_id, + app_name, + system_type, + apk_id, + app_store_address, + version, + version_desc, + publish_environment, + publish_strategy, + result_notify, + public_version, + force_update, + download_verification, + update_object, + validity_start_time, + validity_end_time, + remark, + status, + is_delete, + created, + modified, + create_time, + update_time, + + + #{applyId}, + #{appName}, + #{systemType}, + #{apkId}, + #{appStoreAddress}, + #{version}, + #{versionDesc}, + #{publishEnvironment}, + #{publishStrategy}, + #{resultNotify}, + #{publicVersion}, + #{forceUpdate}, + #{downloadVerification}, + #{updateObject}, + #{validityStartTime}, + #{validityEndTime}, + #{remark}, + #{status}, + #{isDelete}, + #{created}, + #{modified}, + #{createTime}, + #{updateTime}, + + + + + update DEPLOYMENT_SERVICE_PUBLISH + + apply_id = #{applyId}, + app_name = #{appName}, + system_type = #{systemType}, + apk_id = #{apkId}, + app_store_address = #{appStoreAddress}, + version = #{version}, + version_desc = #{versionDesc}, + publish_environment = #{publishEnvironment}, + publish_strategy = #{publishStrategy}, + result_notify = #{resultNotify}, + public_version = #{publicVersion}, + force_update = #{forceUpdate}, + download_verification = #{downloadVerification}, + update_object = #{updateObject}, + validity_start_time = #{validityStartTime}, + validity_end_time = #{validityEndTime}, + remark = #{remark}, + status = #{status}, + is_delete = #{isDelete}, + created = #{created}, + modified = #{modified}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from DEPLOYMENT_SERVICE_PUBLISH where id = #{id} + + + + delete from DEPLOYMENT_SERVICE_PUBLISH where id in + + #{id} + + + \ No newline at end of file diff --git a/sf-ui/src/api/deployment/environment.js b/sf-ui/src/api/deployment/environment.js new file mode 100644 index 0000000..8f31673 --- /dev/null +++ b/sf-ui/src/api/deployment/environment.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询环境维护列表 +export function listEnvironment(query) { + return request({ + url: '/deployment/environment/list', + method: 'get', + params: query + }) +} + +// 查询环境维护详细 +export function getEnvironment(id) { + return request({ + url: '/deployment/environment/' + id, + method: 'get' + }) +} + +// 新增环境维护 +export function addEnvironment(data) { + return request({ + url: '/deployment/environment', + method: 'post', + data: data + }) +} + +// 修改环境维护 +export function updateEnvironment(data) { + return request({ + url: '/deployment/environment', + method: 'put', + data: data + }) +} + +// 删除环境维护 +export function delEnvironment(id) { + return request({ + url: '/deployment/environment/' + id, + method: 'delete' + }) +} diff --git a/sf-ui/src/api/deployment/publish.js b/sf-ui/src/api/deployment/publish.js new file mode 100644 index 0000000..a944419 --- /dev/null +++ b/sf-ui/src/api/deployment/publish.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询发布列表列表 +export function listPublish(query) { + return request({ + url: '/deployment/publish/list', + method: 'get', + params: query + }) +} + +// 查询发布列表详细 +export function getPublish(id) { + return request({ + url: '/deployment/publish/' + id, + method: 'get' + }) +} + +// 新增发布列表 +export function addPublish(data) { + return request({ + url: '/deployment/publish', + method: 'post', + data: data + }) +} + +// 修改发布列表 +export function updatePublish(data) { + return request({ + url: '/deployment/publish', + method: 'put', + data: data + }) +} + +// 删除发布列表 +export function delPublish(id) { + return request({ + url: '/deployment/publish/' + id, + method: 'delete' + }) +} diff --git a/sf-ui/src/views/deployment/environment/index.vue b/sf-ui/src/views/deployment/environment/index.vue new file mode 100644 index 0000000..dc7924b --- /dev/null +++ b/sf-ui/src/views/deployment/environment/index.vue @@ -0,0 +1,274 @@ + + + diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue new file mode 100644 index 0000000..741090e --- /dev/null +++ b/sf-ui/src/views/deployment/publish/index.vue @@ -0,0 +1,472 @@ + + + From b0f7b4a627ba35472938d3499a08b83ee1b90eb7 Mon Sep 17 00:00:00 2001 From: pengren Date: Mon, 22 Apr 2024 11:15:51 +0800 Subject: [PATCH 2/4] =?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=E4=BF=AE=E6=94=B9=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeploymentApplyEnvironmentController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c52a34d..bd25e7b 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,4 +1,4 @@ -package com.sf.deployment.controller; +package com.sf.system.deployment.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; From a73e58d1ab0f9927753bcca22aa2d802cb5aae6e Mon Sep 17 00:00:00 2001 From: pengren Date: Mon, 22 Apr 2024 14:34:27 +0800 Subject: [PATCH 3/4] =?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=9AH5=E5=AE=89=E8=A3=85=E5=8C=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf-admin/src/main/resources/application.yml | 2 +- .../DeploymentModuleListController.java | 122 +++++++ .../domain/DeploymentModuleList.java | 241 +++++++++++++ .../domain/rqs/ModuleListByCoreRequest.java | 16 + .../mapper/DeploymentModuleListMapper.java | 61 ++++ .../service/IDeploymentModuleListService.java | 61 ++++ .../impl/DeploymentModuleListServiceImpl.java | 96 +++++ .../deployment/DeploymentModuleListMapper.xml | 129 +++++++ sf-ui/src/api/deployment/module.js | 44 +++ sf-ui/src/views/deployment/module/index.vue | 341 ++++++++++++++++++ 10 files changed, 1112 insertions(+), 1 deletion(-) create mode 100644 sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java create mode 100755 sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java create mode 100644 sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java create mode 100644 sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml create mode 100644 sf-ui/src/api/deployment/module.js create mode 100644 sf-ui/src/views/deployment/module/index.vue diff --git a/sf-admin/src/main/resources/application.yml b/sf-admin/src/main/resources/application.yml index 843f1c4..c7483a6 100644 --- a/sf-admin/src/main/resources/application.yml +++ b/sf-admin/src/main/resources/application.yml @@ -132,7 +132,7 @@ xss: file: ceph: #endpoint: http://127.0.0.1:9000 - endpoint: http://minio.zsmarter.com:8000 + endpoint: http://file.sac.zsmarter.com # 50M defaultMaxSize: 52428800 access: 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 new file mode 100644 index 0000000..ac95292 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentModuleListController.java @@ -0,0 +1,122 @@ +package com.sf.system.deployment.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.sf.common.utils.StringUtils; +import com.sf.system.deployment.domain.rqs.ModuleListByCoreRequest; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.sf.common.annotation.Log; +import com.sf.common.core.controller.BaseController; +import com.sf.common.core.domain.AjaxResult; +import com.sf.common.enums.BusinessType; +import com.sf.system.deployment.domain.DeploymentModuleList; +import com.sf.system.deployment.service.IDeploymentModuleListService; +import com.sf.common.utils.poi.ExcelUtil; +import com.sf.common.core.page.TableDataInfo; + +/** + * H5模块包Controller + * + * @author ztzh + * @date 2024-04-22 + */ +@RestController +@RequestMapping("/deployment/module") +public class DeploymentModuleListController extends BaseController +{ + @Autowired + private IDeploymentModuleListService deploymentModuleListService; + + /** + * 查询H5模块包列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:module:list')") + @GetMapping("/list") + public TableDataInfo list(DeploymentModuleList deploymentModuleList) + { + startPage(); + List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); + return getDataTable(list); + } + /** + * 查询H5模块包列表 + */ + @GetMapping("/qurey/list") + public AjaxResult queryByCore(ModuleListByCoreRequest request) + { + if(StringUtils.isEmpty(request.getAppCore())){ + return error("appCore不能为空"); + } + DeploymentModuleList deploymentModuleList = new DeploymentModuleList(); + deploymentModuleList.setAppCore(request.getAppCore()); + deploymentModuleList.setSysType(request.getSysType()); + List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); + return success(list); + } + + /** + * 导出H5模块包列表 + */ + @PreAuthorize("@ss.hasPermi('deployment:module:export')") + @Log(title = "H5模块包", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DeploymentModuleList deploymentModuleList) + { + List list = deploymentModuleListService.selectDeploymentModuleListList(deploymentModuleList); + ExcelUtil util = new ExcelUtil(DeploymentModuleList.class); + util.exportExcel(response, list, "H5模块包数据"); + } + + /** + * 获取H5模块包详细信息 + */ + @PreAuthorize("@ss.hasPermi('deployment:module:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(deploymentModuleListService.selectDeploymentModuleListById(id)); + } + + /** + * 新增H5模块包 + */ + @PreAuthorize("@ss.hasPermi('deployment:module:add')") + @Log(title = "H5模块包", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DeploymentModuleList deploymentModuleList) + { + return toAjax(deploymentModuleListService.insertDeploymentModuleList(deploymentModuleList)); + } + + /** + * 修改H5模块包 + */ + @PreAuthorize("@ss.hasPermi('deployment:module:edit')") + @Log(title = "H5模块包", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DeploymentModuleList deploymentModuleList) + { + return toAjax(deploymentModuleListService.updateDeploymentModuleList(deploymentModuleList)); + } + + /** + * 删除H5模块包 + */ + @PreAuthorize("@ss.hasPermi('deployment:module:remove')") + @Log(title = "H5模块包", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(deploymentModuleListService.deleteDeploymentModuleListByIds(ids)); + } +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java new file mode 100644 index 0000000..fa4f3ef --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentModuleList.java @@ -0,0 +1,241 @@ +package com.sf.system.deployment.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.sf.common.annotation.Excel; +import com.sf.common.core.domain.BaseEntity; + +/** + * H5模块包对象 DEPLOYMENT_MODULE_LIST + * + * @author ztzh + * @date 2024-04-22 + */ +public class DeploymentModuleList extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 应用id */ + private Long appId; + + /** 应用core */ + private String appCore; + + /** 上传类型 */ + private String uploadingType; + + /** 模块包名称名称 */ + @Excel(name = "模块包名称名称") + private String moduleName; + + /** 版本号 */ + @Excel(name = "版本号") + private String version; + + /** 安装包 */ + @Excel(name = "安装包") + private String moduleUrl; + + /** 安装包大小 */ + @Excel(name = "安装包大小") + private String moduleSize; + + /** 系统类型 */ + @Excel(name = "系统类型") + private String sysType; + + /** 模块类型 */ + @Excel(name = "模块类型") + private String moduleType; + + /** 上传状态 */ + @Excel(name = "上传状态") + private String uploadingStatus; + + /** 日志id */ + private Long uploadingLogId; + + /** 排序 */ + private Long orderNum; + + /** 逻辑删除,0:未删除,1:删除 */ + private Long isDelete; + + /** 创建人 */ + private String created; + + /** 更新人 */ + private String modified; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAppId(Long appId) + { + this.appId = appId; + } + + public Long getAppId() + { + return appId; + } + public void setAppCore(String appCore) + { + this.appCore = appCore; + } + + public String getAppCore() + { + return appCore; + } + public void setUploadingType(String uploadingType) + { + this.uploadingType = uploadingType; + } + + public String getUploadingType() + { + return uploadingType; + } + public void setModuleName(String moduleName) + { + this.moduleName = moduleName; + } + + public String getModuleName() + { + return moduleName; + } + public void setVersion(String version) + { + this.version = version; + } + + public String getVersion() + { + return version; + } + public void setModuleUrl(String moduleUrl) + { + this.moduleUrl = moduleUrl; + } + + public String getModuleUrl() + { + return moduleUrl; + } + public void setModuleSize(String moduleSize) + { + this.moduleSize = moduleSize; + } + + public String getModuleSize() + { + return moduleSize; + } + public void setSysType(String sysType) + { + this.sysType = sysType; + } + + public String getSysType() + { + return sysType; + } + public void setModuleType(String moduleType) + { + this.moduleType = moduleType; + } + + public String getModuleType() + { + return moduleType; + } + public void setUploadingStatus(String uploadingStatus) + { + this.uploadingStatus = uploadingStatus; + } + + public String getUploadingStatus() + { + return uploadingStatus; + } + public void setUploadingLogId(Long uploadingLogId) + { + this.uploadingLogId = uploadingLogId; + } + + public Long getUploadingLogId() + { + return uploadingLogId; + } + public void setOrderNum(Long orderNum) + { + this.orderNum = orderNum; + } + + public Long getOrderNum() + { + return orderNum; + } + public void setIsDelete(Long isDelete) + { + this.isDelete = isDelete; + } + + public Long getIsDelete() + { + return isDelete; + } + public void setCreated(String created) + { + this.created = created; + } + + public String getCreated() + { + return created; + } + public void setModified(String modified) + { + this.modified = modified; + } + + public String getModified() + { + return modified; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("appId", getAppId()) + .append("appCore", getAppCore()) + .append("uploadingType", getUploadingType()) + .append("moduleName", getModuleName()) + .append("version", getVersion()) + .append("moduleUrl", getModuleUrl()) + .append("moduleSize", getModuleSize()) + .append("sysType", getSysType()) + .append("moduleType", getModuleType()) + .append("uploadingStatus", getUploadingStatus()) + .append("uploadingLogId", getUploadingLogId()) + .append("orderNum", getOrderNum()) + .append("isDelete", getIsDelete()) + .append("created", getCreated()) + .append("modified", getModified()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java b/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java new file mode 100755 index 0000000..998f1f2 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/domain/rqs/ModuleListByCoreRequest.java @@ -0,0 +1,16 @@ +package com.sf.system.deployment.domain.rqs; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + + +@Data +public class ModuleListByCoreRequest { + + @NotBlank + private String appCore; + + @NotBlank + private String sysType; +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java new file mode 100644 index 0000000..614b741 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentModuleListMapper.java @@ -0,0 +1,61 @@ +package com.sf.system.deployment.mapper; + +import java.util.List; +import com.sf.system.deployment.domain.DeploymentModuleList; + +/** + * H5模块包Mapper接口 + * + * @author ztzh + * @date 2024-04-22 + */ +public interface DeploymentModuleListMapper +{ + /** + * 查询H5模块包 + * + * @param id H5模块包主键 + * @return H5模块包 + */ + public DeploymentModuleList selectDeploymentModuleListById(Long id); + + /** + * 查询H5模块包列表 + * + * @param deploymentModuleList H5模块包 + * @return H5模块包集合 + */ + public List selectDeploymentModuleListList(DeploymentModuleList deploymentModuleList); + + /** + * 新增H5模块包 + * + * @param deploymentModuleList H5模块包 + * @return 结果 + */ + public int insertDeploymentModuleList(DeploymentModuleList deploymentModuleList); + + /** + * 修改H5模块包 + * + * @param deploymentModuleList H5模块包 + * @return 结果 + */ + public int updateDeploymentModuleList(DeploymentModuleList deploymentModuleList); + + /** + * 删除H5模块包 + * + * @param id H5模块包主键 + * @return 结果 + */ + public int deleteDeploymentModuleListById(Long id); + + /** + * 批量删除H5模块包 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeploymentModuleListByIds(Long[] ids); +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java new file mode 100644 index 0000000..3e503b1 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentModuleListService.java @@ -0,0 +1,61 @@ +package com.sf.system.deployment.service; + +import java.util.List; +import com.sf.system.deployment.domain.DeploymentModuleList; + +/** + * H5模块包Service接口 + * + * @author ztzh + * @date 2024-04-22 + */ +public interface IDeploymentModuleListService +{ + /** + * 查询H5模块包 + * + * @param id H5模块包主键 + * @return H5模块包 + */ + public DeploymentModuleList selectDeploymentModuleListById(Long id); + + /** + * 查询H5模块包列表 + * + * @param deploymentModuleList H5模块包 + * @return H5模块包集合 + */ + public List selectDeploymentModuleListList(DeploymentModuleList deploymentModuleList); + + /** + * 新增H5模块包 + * + * @param deploymentModuleList H5模块包 + * @return 结果 + */ + public int insertDeploymentModuleList(DeploymentModuleList deploymentModuleList); + + /** + * 修改H5模块包 + * + * @param deploymentModuleList H5模块包 + * @return 结果 + */ + public int updateDeploymentModuleList(DeploymentModuleList deploymentModuleList); + + /** + * 批量删除H5模块包 + * + * @param ids 需要删除的H5模块包主键集合 + * @return 结果 + */ + public int deleteDeploymentModuleListByIds(Long[] ids); + + /** + * 删除H5模块包信息 + * + * @param id H5模块包主键 + * @return 结果 + */ + public int deleteDeploymentModuleListById(Long id); +} diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java new file mode 100644 index 0000000..12de1f6 --- /dev/null +++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentModuleListServiceImpl.java @@ -0,0 +1,96 @@ +package com.sf.system.deployment.service.impl; + +import java.util.List; +import com.sf.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.sf.system.deployment.mapper.DeploymentModuleListMapper; +import com.sf.system.deployment.domain.DeploymentModuleList; +import com.sf.system.deployment.service.IDeploymentModuleListService; + +/** + * H5模块包Service业务层处理 + * + * @author ztzh + * @date 2024-04-22 + */ +@Service +public class DeploymentModuleListServiceImpl implements IDeploymentModuleListService +{ + @Autowired + private DeploymentModuleListMapper deploymentModuleListMapper; + + /** + * 查询H5模块包 + * + * @param id H5模块包主键 + * @return H5模块包 + */ + @Override + public DeploymentModuleList selectDeploymentModuleListById(Long id) + { + return deploymentModuleListMapper.selectDeploymentModuleListById(id); + } + + /** + * 查询H5模块包列表 + * + * @param deploymentModuleList H5模块包 + * @return H5模块包 + */ + @Override + public List selectDeploymentModuleListList(DeploymentModuleList deploymentModuleList) + { + return deploymentModuleListMapper.selectDeploymentModuleListList(deploymentModuleList); + } + + /** + * 新增H5模块包 + * + * @param deploymentModuleList H5模块包 + * @return 结果 + */ + @Override + public int insertDeploymentModuleList(DeploymentModuleList deploymentModuleList) + { + deploymentModuleList.setCreateTime(DateUtils.getNowDate()); + return deploymentModuleListMapper.insertDeploymentModuleList(deploymentModuleList); + } + + /** + * 修改H5模块包 + * + * @param deploymentModuleList H5模块包 + * @return 结果 + */ + @Override + public int updateDeploymentModuleList(DeploymentModuleList deploymentModuleList) + { + deploymentModuleList.setUpdateTime(DateUtils.getNowDate()); + return deploymentModuleListMapper.updateDeploymentModuleList(deploymentModuleList); + } + + /** + * 批量删除H5模块包 + * + * @param ids 需要删除的H5模块包主键 + * @return 结果 + */ + @Override + public int deleteDeploymentModuleListByIds(Long[] ids) + { + return deploymentModuleListMapper.deleteDeploymentModuleListByIds(ids); + } + + /** + * 删除H5模块包信息 + * + * @param id H5模块包主键 + * @return 结果 + */ + @Override + public int deleteDeploymentModuleListById(Long id) + { + return deploymentModuleListMapper.deleteDeploymentModuleListById(id); + } +} diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml new file mode 100644 index 0000000..c5c777c --- /dev/null +++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentModuleListMapper.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, app_id, app_core, uploading_type, module_name, version, module_url, module_size, sys_type, module_type, uploading_status, uploading_log_id, order_num, is_delete, created, modified, create_time, update_time from DEPLOYMENT_MODULE_LIST + + + + + + + + insert into DEPLOYMENT_MODULE_LIST + + app_id, + app_core, + uploading_type, + module_name, + version, + module_url, + module_size, + sys_type, + module_type, + uploading_status, + uploading_log_id, + order_num, + is_delete, + created, + modified, + create_time, + update_time, + + + #{appId}, + #{appCore}, + #{uploadingType}, + #{moduleName}, + #{version}, + #{moduleUrl}, + #{moduleSize}, + #{sysType}, + #{moduleType}, + #{uploadingStatus}, + #{uploadingLogId}, + #{orderNum}, + #{isDelete}, + #{created}, + #{modified}, + #{createTime}, + #{updateTime}, + + + + + update DEPLOYMENT_MODULE_LIST + + app_id = #{appId}, + app_core = #{appCore}, + uploading_type = #{uploadingType}, + module_name = #{moduleName}, + version = #{version}, + module_url = #{moduleUrl}, + module_size = #{moduleSize}, + sys_type = #{sysType}, + module_type = #{moduleType}, + uploading_status = #{uploadingStatus}, + uploading_log_id = #{uploadingLogId}, + order_num = #{orderNum}, + is_delete = #{isDelete}, + created = #{created}, + modified = #{modified}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete + from DEPLOYMENT_MODULE_LIST + where id = #{id} + + + + delete from DEPLOYMENT_MODULE_LIST where id in + + #{id} + + + \ No newline at end of file diff --git a/sf-ui/src/api/deployment/module.js b/sf-ui/src/api/deployment/module.js new file mode 100644 index 0000000..d28af8e --- /dev/null +++ b/sf-ui/src/api/deployment/module.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询H5模块包列表 +export function listModule(query) { + return request({ + url: '/deployment/module/list', + method: 'get', + params: query + }) +} + +// 查询H5模块包详细 +export function getModule(id) { + return request({ + url: '/deployment/module/' + id, + method: 'get' + }) +} + +// 新增H5模块包 +export function addModule(data) { + return request({ + url: '/deployment/module', + method: 'post', + data: data + }) +} + +// 修改H5模块包 +export function updateModule(data) { + return request({ + url: '/deployment/module', + method: 'put', + data: data + }) +} + +// 删除H5模块包 +export function delModule(id) { + return request({ + url: '/deployment/module/' + id, + method: 'delete' + }) +} diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue new file mode 100644 index 0000000..b5969d1 --- /dev/null +++ b/sf-ui/src/views/deployment/module/index.vue @@ -0,0 +1,341 @@ + + + From e44be7db396e7abb017066e68b857cc235d39c42 Mon Sep 17 00:00:00 2001 From: akun <957746831@qq.com> Date: Mon, 22 Apr 2024 17:18:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java b/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java index 17f8189..17022b4 100644 --- a/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java +++ b/sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java @@ -216,7 +216,7 @@ public class HuaweiPaymentServiceImpl implements IHuaweiPaymentService { Long userId = SecurityUtils.getUserId(); OrderInfo orderInfo = new OrderInfo(); orderInfo.setOrderNo(snowflakeIdWorker.nextId()); - orderInfo.setOrderStatus(6L); + orderInfo.setOrderStatus(4L); orderInfo.setPayType(1L); orderInfo.setPayChannel(2L); orderInfo.setOrderAmt(appPurchaseOrderPayload.getPrice());