app，增加更新安全管理员接口

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/equipboiler/AppApiEquipBoilerController.java

@@ -10,6 +10,7 @@ import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerP
 import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerPageRespVO;
 import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerRespVO;
 import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerSaveReqVO;
+import cn.start.tz.module.pressure2.controller.appapi.equipboiler.dto.EquipBoilerSafetyManagerReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.service.equipboiler.EquipBoilerService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -58,6 +59,14 @@ public class AppApiEquipBoilerController {
         return success(true);
     }
 
+    @PutMapping("/updateSafetyManager")
+    @Operation(summary = "更新锅炉设备")
+    //@PreAuthorize("@ss.hasPermission('pressure2:equip-boiler:update')")
+    public CommonResult<Boolean> updateSafetyManager(@Valid @RequestBody EquipBoilerSafetyManagerReqVO updateReqVO) {
+        equipBoilerService.updateSafetyManager(updateReqVO);
+        return success(true);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除锅炉设备")
     @Parameter(name = "id", description = "编号", required = true)

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/equipboiler/dto/EquipBoilerSafetyManagerReqVO.java

@@ -0,0 +1,22 @@
+package cn.start.tz.module.pressure2.controller.appapi.equipboiler.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 锅炉设备新增/修改 Request VO")
+@Data
+public class EquipBoilerSafetyManagerReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25953")
+    private String id;
+
+    /**
+     * SAFERY - 使用单位安全管理员
+     */
+    private String safery;
+    /**
+     * SAFERYDH - 安全人员电话
+     */
+    private String saferydh;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/equippipe/AppApiEquipPipeController.java

@@ -11,6 +11,7 @@ import cn.start.tz.framework.ip.core.utils.AreaUtils;
 import cn.start.tz.module.pressure2.controller.admin.equippipe.vo.EquipPipePageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.equippipe.vo.EquipPipeRespVO;
 import cn.start.tz.module.pressure2.controller.admin.equippipe.vo.EquipPipeSaveReqVO;
+import cn.start.tz.module.pressure2.controller.appapi.equippipe.dto.EquipPipeSafetyManagerReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.service.equippipe.EquipPipeService;
 import com.alibaba.fastjson2.JSONObject;
@@ -71,6 +72,14 @@ public class AppApiEquipPipeController {
         return success(true);
     }
 
+    @PutMapping("/updateSafetyManager")
+    @Operation(summary = "更新管道设备")
+    public CommonResult<Boolean> updateSafetyManager(@Valid @RequestBody EquipPipeSafetyManagerReqVO updateReqVO) throws IOException {
+        equipPipeService.updateSafetyManager(updateReqVO);
+        return success(true);
+    }
+
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除管道设备")
     @Parameter(name = "id", description = "编号", required = true)

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/equippipe/dto/EquipPipeSafetyManagerReqVO.java

@@ -0,0 +1,18 @@
+package cn.start.tz.module.pressure2.controller.appapi.equippipe.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 管道设备新增/修改 Request VO")
+@Data
+public class EquipPipeSafetyManagerReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1753")
+    private String id;
+
+    @Schema(description = "安全管理人员")
+    private String securityMan;
+
+    @Schema(description = "安全管理人电话")
+    private String securityManPhone;
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboiler/EquipBoilerService.java

@@ -1,6 +1,8 @@
 package cn.start.tz.module.pressure2.service.equipboiler;
 
 import java.util.*;
+
+import cn.start.tz.module.pressure2.controller.appapi.equipboiler.dto.EquipBoilerSafetyManagerReqVO;
 import jakarta.validation.*;
 import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
@@ -103,4 +105,6 @@ public interface EquipBoilerService extends IService<EquipBoilerDO>  {
      * @return 受压元件列表
      */
     List<EquipBoilerPressurePartDO> getPressureParts(String boilerId);
+
+    void updateSafetyManager(@Valid EquipBoilerSafetyManagerReqVO updateReqVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboiler/EquipBoilerServiceImpl.java

@@ -6,6 +6,7 @@ import cn.start.tz.framework.common.exception.ServerException;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.ip.core.utils.AreaUtils;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.start.tz.module.pressure2.controller.appapi.equipboiler.dto.EquipBoilerSafetyManagerReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerequipoperationrecord.BoilerEquipOperationRecordDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerequipoperationrecord.BoilerEquipOperationRecordMapper;
 import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
@@ -451,4 +452,13 @@ public class EquipBoilerServiceImpl extends ServiceImpl<EquipBoilerMapper, Equip
         return equipBoilerPressurePartMapper.selectByBoilerId(boilerId);
     }
 
+    @Override
+    public void updateSafetyManager(EquipBoilerSafetyManagerReqVO updateReqVO) {
+        EquipBoilerDO equipBoilerDO = new EquipBoilerDO();
+        equipBoilerDO.setId(updateReqVO.getId());
+        equipBoilerDO.setSafery(updateReqVO.getSafery());
+        equipBoilerDO.setSaferydh(updateReqVO.getSaferydh());
+        equipBoilerMapper.updateById(equipBoilerDO);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipe/EquipPipeService.java

@@ -2,6 +2,7 @@ package cn.start.tz.module.pressure2.service.equippipe;
 
 import java.util.*;
 
+import cn.start.tz.module.pressure2.controller.appapi.equippipe.dto.EquipPipeSafetyManagerReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import jakarta.validation.*;
@@ -85,4 +86,6 @@ public interface EquipPipeService extends IService<EquipPipeDO>  {
      * @return 管道设备
      */
     Map<String, EquipPipeSaveReqVO> getEquipPipeByNo(List<String> projectNos);
+
+    void updateSafetyManager(@Valid EquipPipeSafetyManagerReqVO updateReqVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipe/EquipPipeServiceImpl.java

@@ -13,6 +13,7 @@ import cn.start.tz.module.pressure2.controller.admin.equippipedetail.vo.EquipPip
 import cn.start.tz.module.pressure2.controller.admin.equippipedetail.vo.EquipPipeDetailSaveReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipeequipmentoperationrecord.vo.PipeEquipmentOperationRecordPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipeequipmentoperationrecord.vo.PipeEquipmentOperationRecordRespVO;
+import cn.start.tz.module.pressure2.controller.appapi.equippipe.dto.EquipPipeSafetyManagerReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipeequipmentoperationrecord.PipeEquipmentOperationRecordDO;
@@ -279,4 +280,13 @@ public class EquipPipeServiceImpl extends ServiceImpl<EquipPipeMapper, EquipPipe
         return map;
     }
 
+    @Override
+    public void updateSafetyManager(EquipPipeSafetyManagerReqVO updateReqVO) {
+        EquipPipeDO equipPipeDO = new EquipPipeDO();
+        equipPipeDO.setId(updateReqVO.getId());
+        equipPipeDO.setSecurityMan(updateReqVO.getSecurityMan());
+        equipPipeDO.setSecurityManPhone(updateReqVO.getSecurityManPhone());
+        equipPipeMapper.updateById(equipPipeDO);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorder/BoilerTaskOrderMapper.xml

@@ -211,6 +211,7 @@
         select DISTINCT tt.ID
         ,bto.ID as ORDER_ID
         ,bto.ORDER_NO
+        ,eb.ID AS EQUIP_ID
         ,eb.EQUIP_CODE
         ,eb.EQUIP_NAME
         ,eb.BOILER_MODEL

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorder/PipeTaskOrderMapper.xml

@@ -168,6 +168,7 @@
             ,tt.MAIN_CHECKER
             ,tt.END_CHECK_DATE
             ,bto.CREATE_TIME
+            ,epp.ID AS EQUIP_ID
             -- 去重后聚合
             ,WM_CONCAT(epp.PROJECT_NO) as PROJECT_NO
             -- 设备任务