diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java index 34bda0baa..bbfe503ea 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java @@ -8,6 +8,9 @@ public class IscConstants { /** 审核通过 */ public static final String AUDIT_PASS = "1"; + /** 审核驳回 */ + public static final String AUDIT_REJECT = "2"; + /** 待审核 */ public static final String ONLINE_STATUS_ON = "1"; diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java index 0fbb2d481..7da1fdbbb 100644 --- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java +++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo; +import com.ruoyi.isc.domain.bo.IscAuditBo; import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo; import com.ruoyi.isc.service.IIscAppServiceApplyService; import io.swagger.annotations.Api; @@ -79,8 +80,8 @@ public class IscAppServiceApplyController extends BaseController { @PreAuthorize("@ss.hasPermi('isc:serviceapply:audit')") @Log(title = "应用服务申请信息审核", businessType = BusinessType.AUDIT) @RepeatSubmit() - @PutMapping() - public AjaxResult audit(@Validated(EditGroup.class) @RequestBody IscAppServiceApplyBo bo) { - return toAjax(iIscAppServiceApplyService.updateByBo(bo) ? 1 : 0); + @PutMapping("/audit") + public AjaxResult audit(@Validated @RequestBody IscAuditBo bo) { + return toAjax(iIscAppServiceApplyService.audit(bo) ? 1 : 0); } } diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java index c0a055bd8..27d151064 100644 --- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java +++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java @@ -79,12 +79,6 @@ public class IscAppServiceApplyBo extends BaseEntity { @ApiModelProperty(value = "秒配额") private Long quotaSeconds; - /** - * 删除标志(0代表存在 2代表删除) - */ - @ApiModelProperty(value = "删除标志(0代表存在 2代表删除)") - private String delFlag; - /** * 分页大小 diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java new file mode 100644 index 000000000..fd52ce73b --- /dev/null +++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java @@ -0,0 +1,50 @@ +package com.ruoyi.isc.domain.bo; + +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * 服务管控审核 + * + * @author Wenchao Gong + * @date 2021-09-09 + */ + +@Data +@ApiModel("服务管控审核业务对象") +public class IscAuditBo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID集合 + */ + @ApiModelProperty(value = "ID集合") + @NotEmpty(message = "请选择记录") + private List ids; + + /** + * 审核状态(0待审核 1审核通过 2驳回) + */ + @ApiModelProperty(value = "审核状态(0待审核 1审核通过 2驳回)") + @NotBlank(message = "请填写审核结果") + private String status; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java index 994773a18..26cc0f3e6 100644 --- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java +++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java @@ -4,6 +4,7 @@ import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.isc.domain.IscAppServiceApply; import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo; +import com.ruoyi.isc.domain.bo.IscAuditBo; import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo; import java.util.Collection; @@ -53,4 +54,11 @@ public interface IIscAppServiceApplyService extends IServicePlus ids, Boolean isValid); + + /** + * 应用服务审核 + * @param bo 审核业务数据 + * @return 是否审核成功 + */ + Boolean audit(IscAuditBo bo); } diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java index 0dae5dcb7..c6c805832 100644 --- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java +++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java @@ -2,16 +2,20 @@ package com.ruoyi.isc.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.constant.IscConstants; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.PagePlus; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.isc.domain.IscAppService; import com.ruoyi.isc.domain.IscAppServiceApply; import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo; +import com.ruoyi.isc.domain.bo.IscAuditBo; import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo; import com.ruoyi.isc.mapper.IscAppServiceApplyMapper; import com.ruoyi.isc.service.IIscAppServiceApplyService; @@ -43,7 +47,9 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl new ServiceException("审核意见不能为空")); + break; + default: + throw new ServiceException("审核状态异常"); + } + boolean result = true; + for (Long id : bo.getIds()) + { + IscAppServiceApply apply = getOne(Wrappers.lambdaQuery() + .eq(IscAppServiceApply::getApplyId, id) + .eq(IscAppServiceApply::getStatus, IscConstants.AUDIT_WAIT), false); + if(Objects.isNull(apply)) { + continue; + } + result = updateById(new IscAppServiceApply().setApplyId(id).setStatus(bo.getStatus()) + .setAuditMind(bo.getRemark())); + } + return result; + } } diff --git a/ruoyi-ui/src/api/isc/serviceapply.js b/ruoyi-ui/src/api/isc/serviceapply.js index ea0291535..fdc6012a5 100644 --- a/ruoyi-ui/src/api/isc/serviceapply.js +++ b/ruoyi-ui/src/api/isc/serviceapply.js @@ -17,28 +17,11 @@ export function getServiceapply(applyId) { }) } -// 新增应用服务申请信息 -export function addServiceapply(data) { +// 应用服务申请信息审核 +export function auditServiceapply(data) { return request({ - url: '/isc/serviceapply', - method: 'post', - data: data - }) -} - -// 修改应用服务申请信息 -export function updateServiceapply(data) { - return request({ - url: '/isc/serviceapply', + url: '/isc/serviceapply/audit', method: 'put', data: data }) } - -// 删除应用服务申请信息 -export function delServiceapply(applyId) { - return request({ - url: '/isc/serviceapply/' + applyId, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue index 779b48da3..0f188cc32 100644 --- a/ruoyi-ui/src/views/isc/appservice/index.vue +++ b/ruoyi-ui/src/views/isc/appservice/index.vue @@ -186,8 +186,8 @@ - - + + diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue index a15183644..305161f47 100644 --- a/ruoyi-ui/src/views/isc/cate/index.vue +++ b/ruoyi-ui/src/views/isc/cate/index.vue @@ -48,7 +48,11 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > - + + + @@ -205,10 +209,6 @@ export default { this.cateOptions.push(data); }); }, - // 启用状态字典翻译 - enabledFormat(row, column) { - return this.selectDictLabel(this.enabledOptions, row.enabled); - }, // 取消按钮 cancel() { this.open = false; diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue index 4c1db3159..b2f5407fa 100644 --- a/ruoyi-ui/src/views/isc/service/index.vue +++ b/ruoyi-ui/src/views/isc/service/index.vue @@ -101,9 +101,21 @@ - - - + + + + + + + + + @@ -130,56 +112,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 应用名称 + {{this.form.applicationName}} + + + 服务名称 + {{this.form.serviceName}} + + + 申请类型 + + + + + + 审核状态 + + + + + + 续期时长(月) + {{this.form.renewalDuration}} + + + 每日配额 + {{this.form.quotaDays}} + + + 小时配额 + {{this.form.quotaHours}} + + + 分钟配额 + {{this.form.quotaMinutes}} + + + 每秒配额 + {{this.form.quotaSeconds}} + + + 提交人 + {{this.form.updateBy}} + + + 提交时间 + {{this.form.updateTime}} + + + 备注 + {{this.form.remark}} + + + + + @@ -187,7 +181,7 @@ + \ No newline at end of file