Browse Source

feat: [模板管理] 设置步骤库

master
memorylkf 2 months ago
parent
commit
b54a0a1a13
6 changed files with 62 additions and 2 deletions
  1. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
  2. +2
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StepGroupController.java
  3. +8
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/TemplateMapper.java
  4. +10
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ITemplateService.java
  5. +23
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java
  6. +8
    -0
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/TemplateMapper.xml

+ 11
- 0
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java View File

@ -227,4 +227,15 @@ public class PublicController extends BaseController {
List<Gsp> list = gspService.queryList(form); List<Gsp> list = gspService.queryList(form);
return getDataTable(list); return getDataTable(list);
} }
/**
* 获取模板的步骤库列表
* @param templateId
* @return
*/
@GetMapping("/templateStepList")
public AjaxResult templateStepList(Long templateId,String templateSn)
{
return AjaxResult.success(templateService.getStepListByTemplateId(templateId,templateSn));
}
} }

+ 2
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StepGroupController.java View File

@ -3,6 +3,7 @@ package com.hxhq.business.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import com.hxhq.common.security.annotation.Logical;
import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -30,7 +31,7 @@ public class StepGroupController extends BaseController
* 查询步骤库列表 * 查询步骤库列表
*/ */
@GetMapping("/list") @GetMapping("/list")
@RequiresPermissions("business:stepGroup:list")
@RequiresPermissions(value = {"business:stepGroup:list","business:template:list"},logical = Logical.OR)
public TableDataInfo list(StepGroup stepGroup) public TableDataInfo list(StepGroup stepGroup)
{ {
startPage(); startPage();

+ 8
- 0
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/TemplateMapper.java View File

@ -1,6 +1,7 @@
package com.hxhq.business.mapper; package com.hxhq.business.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.hxhq.business.domain.Step;
import com.hxhq.business.domain.Template; import com.hxhq.business.domain.Template;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -21,4 +22,11 @@ public interface TemplateMapper extends BaseMapper