壁厚测定

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemAddReportVO.java

@@ -1,9 +1,11 @@
 package cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo;
 
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.WallThicknessReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class PipeOrderItemAddReportVO {
@@ -45,4 +47,7 @@ public class PipeOrderItemAddReportVO {
 
     @Schema(description = "费用类型", example = "1")
     private String type;
+
+    @Schema(description = "壁厚测定点位列表")
+    private List<WallThicknessReqVO> wallThicknessList;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/usertemplatelibrary/UserTemplateLibraryController.java

@@ -40,14 +40,12 @@ public class UserTemplateLibraryController {
 
     @PostMapping("/create")
     @Operation(summary = "创建用户操作指导书模板库")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-template-library:create')")
     public CommonResult<String> createUserTemplateLibrary(@Valid @RequestBody UserTemplateLibrarySaveReqVO createReqVO) {
         return success(userTemplateLibraryService.createUserTemplateLibrary(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新用户操作指导书模板库")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-template-library:update')")
     public CommonResult<Boolean> updateUserTemplateLibrary(@Valid @RequestBody UserTemplateLibrarySaveReqVO updateReqVO) {
         userTemplateLibraryService.updateUserTemplateLibrary(updateReqVO);
         return success(true);
@@ -56,7 +54,6 @@ public class UserTemplateLibraryController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除用户操作指导书模板库")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('pressure2:user-template-library:delete')")
     public CommonResult<Boolean> deleteUserTemplateLibrary(@RequestParam("id") String id) {
         userTemplateLibraryService.deleteUserTemplateLibrary(id);
         return success(true);
@@ -65,7 +62,6 @@ public class UserTemplateLibraryController {
     @GetMapping("/get")
     @Operation(summary = "获得用户操作指导书模板库")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-template-library:query')")
     public CommonResult<UserTemplateLibraryRespVO> getUserTemplateLibrary(@RequestParam("id") String id) {
         UserTemplateLibraryDO userTemplateLibrary = userTemplateLibraryService.getUserTemplateLibrary(id);
         return success(BeanUtils.toBean(userTemplateLibrary, UserTemplateLibraryRespVO.class));
@@ -73,7 +69,6 @@ public class UserTemplateLibraryController {
 
     @GetMapping("/page")
     @Operation(summary = "获得用户操作指导书模板库分页")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-template-library:query')")
     public CommonResult<PageResult<UserTemplateLibraryRespVO>> getUserTemplateLibraryPage(@Valid UserTemplateLibraryPageReqVO pageReqVO) {
         PageResult<UserTemplateLibraryDO> pageResult = userTemplateLibraryService.getUserTemplateLibraryPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, UserTemplateLibraryRespVO.class));
@@ -81,7 +76,6 @@ public class UserTemplateLibraryController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出用户操作指导书模板库 Excel")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-template-library:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportUserTemplateLibraryExcel(@Valid UserTemplateLibraryPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/userwallthicknesstemplate/UserWallThicknessTemplateController.java

@@ -40,14 +40,12 @@ public class UserWallThicknessTemplateController {
 
     @PostMapping("/create")
     @Operation(summary = "创建用户壁厚测定点数模版")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-wall-thickness-template:create')")
     public CommonResult<String> createUserWallThicknessTemplate(@Valid @RequestBody UserWallThicknessTemplateSaveReqVO createReqVO) {
         return success(userWallThicknessTemplateService.createUserWallThicknessTemplate(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新用户壁厚测定点数模版")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-wall-thickness-template:update')")
     public CommonResult<Boolean> updateUserWallThicknessTemplate(@Valid @RequestBody UserWallThicknessTemplateSaveReqVO updateReqVO) {
         userWallThicknessTemplateService.updateUserWallThicknessTemplate(updateReqVO);
         return success(true);
@@ -56,7 +54,6 @@ public class UserWallThicknessTemplateController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除用户壁厚测定点数模版")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('pressure2:user-wall-thickness-template:delete')")
     public CommonResult<Boolean> deleteUserWallThicknessTemplate(@RequestParam("id") String id) {
         userWallThicknessTemplateService.deleteUserWallThicknessTemplate(id);
         return success(true);
@@ -65,7 +62,6 @@ public class UserWallThicknessTemplateController {
     @GetMapping("/get")
     @Operation(summary = "获得用户壁厚测定点数模版")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-wall-thickness-template:query')")
     public CommonResult<UserWallThicknessTemplateRespVO> getUserWallThicknessTemplate(@RequestParam("id") String id) {
         UserWallThicknessTemplateDO userWallThicknessTemplate = userWallThicknessTemplateService.getUserWallThicknessTemplate(id);
         return success(BeanUtils.toBean(userWallThicknessTemplate, UserWallThicknessTemplateRespVO.class));
@@ -73,7 +69,6 @@ public class UserWallThicknessTemplateController {
 
     @GetMapping("/page")
     @Operation(summary = "获得用户壁厚测定点数模版分页")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-wall-thickness-template:query')")
     public CommonResult<PageResult<UserWallThicknessTemplateRespVO>> getUserWallThicknessTemplatePage(@Valid UserWallThicknessTemplatePageReqVO pageReqVO) {
         PageResult<UserWallThicknessTemplateDO> pageResult = userWallThicknessTemplateService.getUserWallThicknessTemplatePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, UserWallThicknessTemplateRespVO.class));
@@ -81,7 +76,6 @@ public class UserWallThicknessTemplateController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出用户壁厚测定点数模版 Excel")
-    @PreAuthorize("@ss.hasPermission('pressure2:user-wall-thickness-template:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportUserWallThicknessTemplateExcel(@Valid UserWallThicknessTemplatePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -136,6 +136,7 @@ import cn.start.tz.module.pressure2.service.pipetaskorderinput.PipeTaskOrderInpu
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportversion.PipeTaskOrderItemReportVersionService;
 import cn.start.tz.module.pressure2.service.pipetaskorderoperation.PipeTaskOrderOperationService;
 import cn.start.tz.module.pressure2.service.pipetaskordersecuritycheck.PipeTaskOrderSecurityCheckService;
+import cn.start.tz.module.pressure2.service.userwallthicknesstemplate.UserWallThicknessTemplateService;
 import cn.start.tz.module.pressure2.util.ConversionUtil;
 import cn.start.tz.module.pressure2.util.DeptDataPermissionUtil;
 import cn.start.tz.module.pressure2.util.JsonDiffTool;
@@ -1312,6 +1313,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         this.updateOrderFee(orderItemEnterVO.getOrderId());
 
     }
+    @Resource
+    private UserWallThicknessTemplateService userWallThicknessTemplateService;
 
     public void addReportVo(PipeOrderItemAddReportV2VO orderItemEnterVO,String orderId){
 
@@ -1470,6 +1473,10 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     syncReportVO.setReportType("record");
                 }
                 com.alibaba.fastjson2.JSONObject params = new com.alibaba.fastjson2.JSONObject();
+                // 判断是否壁厚测定
+                if (!vo.getWallThicknessList().isEmpty()){
+                    params.putAll(userWallThicknessTemplateService.generateWallThicknessParams(vo.getWallThicknessList()));
+                }
                 if (taskOrderDO != null && StringUtils.isBlank(orderItemEnterVO.getCheckId())) {
                     params.put("checkUserId",taskOrderDO.getManagerId());
                 }else{

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/usertemplatelibrary/UserTemplateLibraryServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.service.usertemplatelibrary;
 
+import cn.start.tz.framework.security.core.util.SecurityFrameworkUtils;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -69,6 +70,9 @@ public class UserTemplateLibraryServiceImpl extends ServiceImpl<UserTemplateLibr
 
     @Override
     public PageResult<UserTemplateLibraryDO> getUserTemplateLibraryPage(UserTemplateLibraryPageReqVO pageReqVO) {
+        // 获取当前登录用户ID
+        String currentUserId = SecurityFrameworkUtils.getLoginUserId();
+        pageReqVO.setUserId(currentUserId);
         return userTemplateLibraryMapper.selectPage(pageReqVO);
     }