Merge remote-tracking branch 'origin/dev' into test

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/DepartmentInstanceRelativityController.java

@@ -39,9 +39,9 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 部门与实例关联")
 @RestController
-@RequestMapping("/bse/department-instance-relativity")
+@RequestMapping("/base/department-instance-relativity")
 @Validated
-@FileUploadController(source = "bse.departmentinstancerelativity")
+@FileUploadController(source = "base.departmentinstancerelativity")
 public class DepartmentInstanceRelativityController extends AbstractFileUploadController implements BusinessControllerMarker{
 
     static {
@@ -56,14 +56,14 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @PostMapping("/create")
     @Operation(summary = "创建部门与实例关联")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:create')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:create')")
     public CommonResult<DepartmentInstanceRelativityRespVO> createDepartmentInstanceRelativity(@Valid @RequestBody DepartmentInstanceRelativitySaveReqVO createReqVO) {
         return success(departmentInstanceRelativityService.createDepartmentInstanceRelativity(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新部门与实例关联")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:update')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:update')")
     public CommonResult<Boolean> updateDepartmentInstanceRelativity(@Valid @RequestBody DepartmentInstanceRelativitySaveReqVO updateReqVO) {
         departmentInstanceRelativityService.updateDepartmentInstanceRelativity(updateReqVO);
         return success(true);
@@ -72,7 +72,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @DeleteMapping("/delete")
     @Operation(summary = "删除部门与实例关联")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:delete')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
     public CommonResult<Boolean> deleteDepartmentInstanceRelativity(@RequestParam("id") String id) {
         departmentInstanceRelativityService.deleteDepartmentInstanceRelativity(id);
         return success(true);
@@ -81,7 +81,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除部门与实例关联")
-                @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:delete')")
+                @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
     public CommonResult<Boolean> deleteDepartmentInstanceRelativityList(@RequestBody BatchDeleteReqVO req) {
         departmentInstanceRelativityService.deleteDepartmentInstanceRelativityListByIds(req.getIds());
         return success(true);
@@ -90,7 +90,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @GetMapping("/get")
     @Operation(summary = "获得部门与实例关联")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:query')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:query')")
     public CommonResult<DepartmentInstanceRelativityRespVO> getDepartmentInstanceRelativity(@RequestParam("id") String id) {
         DepartmentInstanceRelativityDO departmentInstanceRelativity = departmentInstanceRelativityService.getDepartmentInstanceRelativity(id);
         return success(BeanUtils.toBean(departmentInstanceRelativity, DepartmentInstanceRelativityRespVO.class));
@@ -98,7 +98,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @GetMapping("/page")
     @Operation(summary = "获得部门与实例关联分页")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:query')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:query')")
     public CommonResult<PageResult<DepartmentInstanceRelativityRespVO>> getDepartmentInstanceRelativityPage(@Valid DepartmentInstanceRelativityPageReqVO pageReqVO) {
         PageResult<DepartmentInstanceRelativityDO> pageResult = departmentInstanceRelativityService.getDepartmentInstanceRelativityPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DepartmentInstanceRelativityRespVO.class));
@@ -106,7 +106,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出部门与实例关联 Excel")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:export')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportDepartmentInstanceRelativityExcel(@Valid DepartmentInstanceRelativityPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java

@@ -48,7 +48,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/base/template-instance")
 @Validated
-@FileUploadController(source = "bse.templateinstance")
+@FileUploadController(source = "base.templateinstance")
 public class TemplateInstanceController extends AbstractFileUploadController {
 
     static {
@@ -70,14 +70,14 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @PostMapping("/create")
     @Operation(summary = "创建模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:create')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:create')")
     public CommonResult<TemplateInstanceRespVO> createTemplateInstance(@Valid @RequestBody TemplateInstanceSaveReqVO createReqVO) {
         return success(templateInstanceService.createTemplateInstance(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:update')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> updateTemplateInstance(@Valid @RequestBody TemplateInstanceSaveReqVO updateReqVO) {
         templateInstanceService.updateTemplateInstance(updateReqVO);
         return success(true);
@@ -86,7 +86,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板实例")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:delete')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
     public CommonResult<Boolean> deleteTemplateInstance(@RequestParam("id") Long id) {
         templateInstanceService.deleteTemplateInstance(id);
         return success(true);
@@ -95,7 +95,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:delete')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceList(@RequestBody BatchDeleteReqVO req) {
         templateInstanceService.deleteTemplateInstanceListByIds(req.getIds());
         return success(true);
@@ -104,7 +104,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @GetMapping("/get")
     @Operation(summary = "获得模板实例")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:query')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<TemplateInstanceRespVO> getTemplateInstance(@Valid @NotEmpty(message = "编号不能为空") @RequestParam("id") String id) {
         TemplateInstanceDO templateInstance = templateInstanceService.getTemplateInstance(Long.valueOf(id));
         TemplateInstanceRespVO templateInstanceRespVO = BeanUtils.toBean(templateInstance, TemplateInstanceRespVO.class);
@@ -119,7 +119,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @GetMapping("/page")
     @Operation(summary = "获得模板实例分页")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:query')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<PageResult<TemplateInstanceRespVO>> getTemplateInstancePage(@Valid TemplateInstancePageReqVO pageReqVO) {
         PageResult<TemplateInstanceDO> pageResult = templateInstanceService.getTemplateInstancePage(pageReqVO);
         PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(pageResult, TemplateInstanceRespVO.class);
@@ -133,7 +133,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出模板实例 Excel")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:export')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTemplateInstanceExcel(@Valid TemplateInstancePageReqVO pageReqVO,
                                             HttpServletResponse response) throws IOException {
@@ -147,7 +147,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //模版实例发布
     @PostMapping("/publish-batch")
     @Operation(summary = "模版实例发布")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:publish')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:publish')")
     public CommonResult<Boolean> publishTemplateInstance(@Valid @RequestBody List<PublishTemplateInstanceReqVO> publishReqVOS) {
         templateInstanceService.publishTemplateInstance(publishReqVOS);
         return success(true);
@@ -156,7 +156,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //不显示停用状态的查询接口
     @GetMapping("/list-excluding-disabled")
     @Operation(summary = "获得模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:query')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<PageResult<TemplateInstanceRespVO>> listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO) {
         PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(templateInstanceService.listExcludingDisabled(pageReqVO), TemplateInstanceRespVO.class);
         templateInstanceRespVOPageResult.getList().forEach(
@@ -172,7 +172,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //停用和启用接口
     @PostMapping("/disable-enable")
     @Operation(summary = "实例停用和启用接口", description = "实例停用和启用接口")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:disable-enable')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:disable-enable')")
     public CommonResult<Boolean> setDisableOrEnable(@Valid @RequestBody DisableEnableReqVO reqVO) {
         templateInstanceService.setDisableOrEnable(reqVO);
         return success(true);
@@ -188,7 +188,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //创建版本
     @PostMapping("/create-version")
     @Operation(summary = "创建版本")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:create-version')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:create-version')")
     public CommonResult<TemplateInstanceRespVO> createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id) {
         return success(templateInstanceService.createVersion(id));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplItmController.java

@@ -10,6 +10,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmpItmPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmDO;
 import com.zt.plat.module.base.service.tmpltp.TmplItmService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,6 +19,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -88,4 +90,13 @@ public class TmplItmController {
         PageResult<TmplItmDO> pageResult = tmplItmService.pageTmplItm(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplItmRespVO.class));
     }
+
+
+    @PutMapping("/update-sts")
+    @Operation(summary = "更新模板条款状态")
+    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:update')")
+    public CommonResult<Boolean> updateTmplTpSts(@RequestBody UpdateStsVO updateStsVO) {
+        tmplItmService.updateTmplTpSts(updateStsVO);
+        return success(true);
+    }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpFldController.java

@@ -8,6 +8,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplTpFldSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO;
 import com.zt.plat.module.base.service.tmpltp.TmplTpFldService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,42 +28,49 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/base/tmpl-fld")
 @Validated
-@FileUploadController(source = "bse.tmplfld")
+@FileUploadController(source = "base.tmplfld")
 @RequiredArgsConstructor
 public class TmplTpFldController {
     private final TmplTpFldService tmplTpFldService;
     @PostMapping("/create")
     @Operation(summary = "创建模板字段")
-//    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:create')")
+//    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')")
     public CommonResult<TmplFldRespVO> createTmplFld(@Valid @RequestBody TmplTpFldSaveReqVO tmplTpFldSaveReqVO) {
         return success(tmplTpFldService.createTmplFld(tmplTpFldSaveReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板字段")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:update')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
     public CommonResult<Boolean> updateTmplTp(@Valid @RequestBody TmplTpFldSaveReqVO updateReqVO) {
         tmplTpFldService.updateTmplFld(updateReqVO);
         return success(true);
     }
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板字段")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:delete')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:delete')")
     public CommonResult<Boolean> deleteTmplTp(@RequestBody BatchDeleteReqVO req) {
         tmplTpFldService.deleteTmplTpByIds(req.getIds());
         return success(true);
     }
     @GetMapping("/page")
     @Operation(summary = "获得模板字段列表")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:list')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')")
     public CommonResult<PageResult<TmplFldRespVO>> getTmplTpList( @Valid TmplFldPageReqVO pageReqVO) {
         PageResult<TmplTpFldDO> pageResult = tmplTpFldService.tmplTpFldPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplFldRespVO.class));
     }
     @GetMapping("/class-fld")
     @Operation(summary = "获得类固定模板字段列表", description = "clazz为VO类类名")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:list')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')")
     public CommonResult<List<Map<String, Object>>> getTmplTpListByClass(String clazz) {
         return success(tmplTpFldService.getTmplTpListByClass(clazz));
     }
+    @PutMapping("/update-sts")
+    @Operation(summary = "更新模板字段状态")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
+    public CommonResult<Boolean> updateTmplTpSts(@RequestBody UpdateStsVO updateStsVO) {
+        tmplTpFldService.updateTmplTpSts(updateStsVO);
+        return success(true);
+    }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplFldRespVO.java

@@ -40,4 +40,7 @@ public class TmplFldRespVO {
     @ExcelProperty("是否必填")
     private String isMust;
 
+    @Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字段状态")
+    private String sts;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplItmRespVO.java

@@ -44,4 +44,9 @@ public class TmplItmRespVO {
     @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建人")
     private String creator;
+
+    @Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字段状态")
+    private String sts;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplItmSaveReqVO.java

@@ -23,4 +23,7 @@ public class TmplItmSaveReqVO {
 
     @Schema(description = "条款值", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
     private String itmVal;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
+    private String sts;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplTpFldSaveReqVO.java

@@ -22,4 +22,7 @@ public class TmplTpFldSaveReqVO {
     @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "Y or N")
     private String isMust;
 
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
+    private String sts;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/UpdateStsVO.java

@@ -0,0 +1,20 @@
+package com.zt.plat.module.base.controller.admin.templtp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+@Data
+@Schema(description = "管理后台 - 更新状态 Request VO")
+@Validated
+public class UpdateStsVO {
+    @Schema(description = "ids", requiredMode = Schema.RequiredMode.REQUIRED, example = "['id1','id2']")
+    @NotEmpty(message = "ids为空")
+    private List<String> ids;
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用和禁用或者其他")
+    @NotEmpty(message = "状态为空")
+    private String sts;
+}