diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/GreenConstructionSchemeController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/GreenConstructionSchemeController.java index 981485fb6..6685209d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/GreenConstructionSchemeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/GreenConstructionSchemeController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*; /** * @Title: Controller - * @Description: 绿色施工方案管理 + * @Description: 绿色施工方案管理修改为危大工程清单 * @author： pds * @date： 2024-08-24 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java index 01cacdbee..4ecb77640 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java @@ -1,37 +1,35 @@ package com.zhgd.xmgl.modules.baotou.controller; -import java.util.Date; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.baotou.entity.NondestructiveTestOrderTicket; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingRecord; +import com.zhgd.xmgl.modules.baotou.service.INondestructiveTestOrderTicketService; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingRecordService; import com.zhgd.xmgl.util.FlowUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; -import java.util.HashMap; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; -import java.util.Map; - -import com.zhgd.jeecg.common.api.vo.Result; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.baotou.entity.NondestructiveTestOrderTicket; -import com.zhgd.xmgl.modules.baotou.service.INondestructiveTestOrderTicketService; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import java.util.*; /** * @Title: Controller * @Description: 无损检测委托单 * @author： pds - * @date： 2024-08-26 + * @date： 2024-08-26 * @version： V1.0 */ @RestController @@ -39,163 +37,193 @@ import org.springframework.web.bind.annotation.*; @Slf4j @Api(tags = "无损检测委托单相关Api") public class NondestructiveTestOrderTicketController { - @Autowired - private INondestructiveTestOrderTicketService nondestructiveTestOrderTicketService; + @Autowired + @Lazy + IPipelineWeldingRecordService pipelineWeldingRecordService; + @Autowired + private INondestructiveTestOrderTicketService nondestructiveTestOrderTicketService; - /** - * 分页列表查询 - * @return - */ + /** + * 分页列表查询 + * + * @return + */ @OperLog(operModul = "无损检测委托单管理", operType = "分页查询", operDesc = "分页列表查询无损检测委托单信息") - @ApiOperation(value = "分页列表查询无损检测委托单信息", notes = "分页列表查询无损检测委托单信息", httpMethod="GET") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), - }) - @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(nondestructiveTestOrderTicketService.queryPageList(param)); - } + @ApiOperation(value = "分页列表查询无损检测委托单信息", notes = "分页列表查询无损检测委托单信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(nondestructiveTestOrderTicketService.queryPageList(param)); + } - /** - * 列表查询 - * @return - */ + /** + * 列表查询 + * + * @return + */ @OperLog(operModul = "无损检测委托单管理", operType = "列表查询", operDesc = "列表查询无损检测委托单信息") - @ApiOperation(value = "列表查询无损检测委托单信息", notes = "列表查询无损检测委托单信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(nondestructiveTestOrderTicketService.queryList(param)); - } + @ApiOperation(value = "列表查询无损检测委托单信息", notes = "列表查询无损检测委托单信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(nondestructiveTestOrderTicketService.queryList(param)); + } - /** - * 添加 - * @param nondestructiveTestOrderTicket - * @return - */ + /** + * 添加 + * + * @param nondestructiveTestOrderTicket + * @return + */ @OperLog(operModul = "无损检测委托单管理", operType = "添加", operDesc = "添加无损检测委托单信息") - @ApiOperation(value = "添加无损检测委托单信息", notes = "添加无损检测委托单信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody @Validate NondestructiveTestOrderTicket nondestructiveTestOrderTicket) { - nondestructiveTestOrderTicketService.add(nondestructiveTestOrderTicket); - return Result.ok(); - } - - @OperLog(operModul = "无损检测委托单管理", operType = "添加", operDesc = "工作流添加无损检测委托单信息") - @ApiOperation(value = "工作流添加无损检测委托单信息", notes = "工作流添加无损检测委托单信息" , httpMethod="POST") - @PostMapping(value = "/flow/add") - public Result addFromFlow(@RequestBody @Validate Map map) { - log.info("工作流添加无损检测委托单信息:{}", JSON.toJSONString(map)); - String num = FlowUtil.getString(map, "num"); - String projectName = FlowUtil.getString(map, "projectName"); - String testPieceName = FlowUtil.getString(map, "testPieceName"); - String pipelineNumber = FlowUtil.getString(map, "pipelineNumber"); - Long commissioningUnit = FlowUtil.getPullDownLong(map, "commissioningUnit"); - String weldingMethod = FlowUtil.getString(map, "weldingMethod"); - String medium = FlowUtil.getString(map, "medium"); - String grooveForm = FlowUtil.getString(map, "grooveForm"); - String testingRatio = FlowUtil.getString(map, "testingRatio"); - String temperature = FlowUtil.getString(map, "temperature"); - String weldNumber = FlowUtil.getString(map, "weldNumber"); - String testingStandard = FlowUtil.getString(map, "testingStandard"); - String pressure = FlowUtil.getString(map, "pressure"); - String testNumber = FlowUtil.getString(map, "testNumber"); - String mainDescriptionAttachedPicture = FlowUtil.getString(map, "mainDescriptionAttachedPicture"); - String testingReportAttachment = FlowUtil.getJSONString(map, "testingReportAttachment"); - String projectSn = FlowUtil.getString(map, "projectSn"); - String craterList = FlowUtil.getJSONString(map,"craterList"); - Long deviceUnitId = FlowUtil.getPullDownLong(map, "deviceUnitId"); - Long constructionUnit = FlowUtil.getPullDownLong(map, "constructionUnit"); - Long qualityChargePersonSignature = FlowUtil.getPullDownLong(map, "qualityChargePersonSignature"); - Long epcContractor = FlowUtil.getPullDownLong(map, "epcContractor"); - Long professionalEngineerSignature = FlowUtil.getPullDownLong(map, "professionalEngineerSignature"); - Long supervisingUnit = FlowUtil.getPullDownLong(map, "supervisingUnit"); - Long supervisingEngineerSignature = FlowUtil.getPullDownLong(map, "supervisingEngineerSignature"); - Long testingUnit = FlowUtil.getPullDownLong(map, "testingUnit"); - Long testingUnitChargePersonSignature = FlowUtil.getPullDownLong(map, "testingUnitChargePersonSignature"); - Integer testingMethod = FlowUtil.getPullDownInteger(map, "testingMethod"); - Integer qualifiedLevel = FlowUtil.getPullDownInteger(map, "qualifiedLevel"); - Date testingDate = FlowUtil.getDate(map, "testingDate"); - Date qualityChargePersonSignatureDate = FlowUtil.getDate(map, "qualityChargePersonSignatureDate"); - Date professionalEngineerSignatureDate = FlowUtil.getDate(map, "professionalEngineerSignatureDate"); - Date supervisingEngineerSignatureDate = FlowUtil.getDate(map, "supervisingEngineerSignatureDate"); - Date testingUnitChargePersonSignatureDate = FlowUtil.getDate(map, "testingUnitChargePersonSignatureDate"); - NondestructiveTestOrderTicket ticket = new NondestructiveTestOrderTicket(); - ticket.setNum(num); - ticket.setProjectName(projectName); - ticket.setDeviceUnitId(deviceUnitId); - ticket.setTestPieceName(testPieceName); - ticket.setPipelineNumber(pipelineNumber); - ticket.setCommissioningUnit(commissioningUnit); - ticket.setWeldingMethod(weldingMethod); - ticket.setMedium(medium); - ticket.setGrooveForm(grooveForm); - ticket.setTestingRatio(testingRatio); - ticket.setTestingMethod(testingMethod); - ticket.setTemperature(temperature); - ticket.setWeldNumber(weldNumber); - ticket.setQualifiedLevel(qualifiedLevel); - ticket.setTestingStandard(testingStandard); - ticket.setPressure(pressure); - ticket.setTestNumber(testNumber); - ticket.setTestingDate(testingDate); - ticket.setCraterList(craterList); - ticket.setMainDescriptionAttachedPicture(mainDescriptionAttachedPicture); - ticket.setTestingReportAttachment(testingReportAttachment); - ticket.setConstructionUnit(constructionUnit); - ticket.setQualityChargePersonSignature(qualityChargePersonSignature); - ticket.setQualityChargePersonSignatureDate(qualityChargePersonSignatureDate); - ticket.setEpcContractor(epcContractor); - ticket.setProfessionalEngineerSignature(professionalEngineerSignature); - ticket.setProfessionalEngineerSignatureDate(professionalEngineerSignatureDate); - ticket.setSupervisingUnit(supervisingUnit); - ticket.setSupervisingEngineerSignature(supervisingEngineerSignature); - ticket.setSupervisingEngineerSignatureDate(supervisingEngineerSignatureDate); - ticket.setTestingUnit(testingUnit); - ticket.setTestingUnitChargePersonSignature(testingUnitChargePersonSignature); - ticket.setTestingUnitChargePersonSignatureDate(testingUnitChargePersonSignatureDate); - ticket.setProjectSn(projectSn); - nondestructiveTestOrderTicketService.add(ticket); - return Result.ok(); - } - - /** - * 编辑 - * @param nondestructiveTestOrderTicket - * @return - */ - @OperLog(operModul = "无损检测委托单管理", operType = "编辑", operDesc = "编辑无损检测委托单信息") - @ApiOperation(value = "编辑无损检测委托单信息", notes = "编辑无损检测委托单信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody NondestructiveTestOrderTicket nondestructiveTestOrderTicket) { - nondestructiveTestOrderTicketService.edit(nondestructiveTestOrderTicket); - return Result.ok(); - } - - /** - * 通过id删除 - * @return - */ - @OperLog(operModul = "无损检测委托单管理", operType = "删除", operDesc = "删除无损检测委托单信息") - @ApiOperation(value = "删除无损检测委托单信息", notes = "删除无损检测委托单信息" , httpMethod="POST") - @ApiImplicitParam(name = "id", value = "无损检测委托单ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - nondestructiveTestOrderTicketService.delete(MapUtils.getString(map, "id")); + @ApiOperation(value = "添加无损检测委托单信息", notes = "添加无损检测委托单信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate NondestructiveTestOrderTicket nondestructiveTestOrderTicket) { + nondestructiveTestOrderTicketService.add(nondestructiveTestOrderTicket); return Result.ok(); - } + } - /** - * 通过id查询 - * @param id - * @return - */ + @OperLog(operModul = "无损检测委托单管理", operType = "添加", operDesc = "工作流添加无损检测委托单信息") + @ApiOperation(value = "工作流添加无损检测委托单信息", notes = "工作流添加无损检测委托单信息", httpMethod = "POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody @Validate Map map) { + log.info("工作流添加无损检测委托单信息:{}", JSON.toJSONString(map)); + String num = FlowUtil.getString(map, "num"); + String projectName = FlowUtil.getString(map, "projectName"); + String testPieceName = FlowUtil.getString(map, "testPieceName"); + Long pipelineInformationId = FlowUtil.getPullDownLong(map, "pipelineInformationId"); + Long commissioningUnit = FlowUtil.getPullDownLong(map, "commissioningUnit"); + String weldingMethod = FlowUtil.getString(map, "weldingMethod"); + String medium = FlowUtil.getString(map, "medium"); + String grooveForm = FlowUtil.getString(map, "grooveForm"); + String testingRatio = FlowUtil.getString(map, "testingRatio"); + String temperature = FlowUtil.getString(map, "temperature"); + String weldNumber = FlowUtil.getString(map, "weldNumber"); + String testingStandard = FlowUtil.getString(map, "testingStandard"); + String pressure = FlowUtil.getString(map, "pressure"); + String testNumber = FlowUtil.getString(map, "testNumber"); + String mainDescriptionAttachedPicture = FlowUtil.getString(map, "mainDescriptionAttachedPicture"); + String testingReportAttachment = FlowUtil.getJSONString(map, "testingReportAttachment"); + String projectSn = FlowUtil.getString(map, "projectSn"); + String craterList = FlowUtil.getJSONString(map, "craterList"); + Long deviceUnitId = FlowUtil.getPullDownLong(map, "deviceUnitId"); + Long constructionUnit = FlowUtil.getPullDownLong(map, "constructionUnit"); + Long qualityChargePersonSignature = FlowUtil.getPullDownLong(map, "qualityChargePersonSignature"); + Long epcContractor = FlowUtil.getPullDownLong(map, "epcContractor"); + Long professionalEngineerSignature = FlowUtil.getPullDownLong(map, "professionalEngineerSignature"); + Long supervisingUnit = FlowUtil.getPullDownLong(map, "supervisingUnit"); + Long supervisingEngineerSignature = FlowUtil.getPullDownLong(map, "supervisingEngineerSignature"); + Long testingUnit = FlowUtil.getPullDownLong(map, "testingUnit"); + Long testingUnitChargePersonSignature = FlowUtil.getPullDownLong(map, "testingUnitChargePersonSignature"); + Integer testingMethod = FlowUtil.getPullDownInteger(map, "testingMethod"); + Integer qualifiedLevel = FlowUtil.getPullDownInteger(map, "qualifiedLevel"); + Date testingDate = FlowUtil.getDate(map, "testingDate"); + Date qualityChargePersonSignatureDate = FlowUtil.getDate(map, "qualityChargePersonSignatureDate"); + Date professionalEngineerSignatureDate = FlowUtil.getDate(map, "professionalEngineerSignatureDate"); + Date supervisingEngineerSignatureDate = FlowUtil.getDate(map, "supervisingEngineerSignatureDate"); + Date testingUnitChargePersonSignatureDate = FlowUtil.getDate(map, "testingUnitChargePersonSignatureDate"); + List records = new ArrayList<>(); + Object craterList1 = map.get("craterList"); + if (craterList1 instanceof List) { + List cl = (List) craterList1; + if (CollUtil.isNotEmpty(cl)) { + for (Object o : cl) { + Map m = (Map) o; + Long id = FlowUtil.getPullDownLong(m, "field5496713710010"); + Integer qualified = FlowUtil.getPullDownInteger(m, "field8817951200764"); + PipelineWeldingRecord weldingRecord = new PipelineWeldingRecord(); + weldingRecord.setId(id); + weldingRecord.setTestingQualified(Objects.equals(qualified, 1) ? 1 : 0); + records.add(weldingRecord); + } + } + } + NondestructiveTestOrderTicket ticket = new NondestructiveTestOrderTicket(); + ticket.setNum(num); + ticket.setProjectName(projectName); + ticket.setDeviceUnitId(deviceUnitId); + ticket.setTestPieceName(testPieceName); + ticket.setPipelineInformationId(pipelineInformationId); + ticket.setCommissioningUnit(commissioningUnit); + ticket.setWeldingMethod(weldingMethod); + ticket.setMedium(medium); + ticket.setGrooveForm(grooveForm); + ticket.setTestingRatio(testingRatio); + ticket.setTestingMethod(testingMethod); + ticket.setTemperature(temperature); + ticket.setWeldNumber(weldNumber); + ticket.setQualifiedLevel(qualifiedLevel); + ticket.setTestingStandard(testingStandard); + ticket.setPressure(pressure); + ticket.setTestNumber(testNumber); + ticket.setTestingDate(testingDate); + ticket.setCraterList(craterList); + ticket.setMainDescriptionAttachedPicture(mainDescriptionAttachedPicture); + ticket.setTestingReportAttachment(testingReportAttachment); + ticket.setConstructionUnit(constructionUnit); + ticket.setQualityChargePersonSignature(qualityChargePersonSignature); + ticket.setQualityChargePersonSignatureDate(qualityChargePersonSignatureDate); + ticket.setEpcContractor(epcContractor); + ticket.setProfessionalEngineerSignature(professionalEngineerSignature); + ticket.setProfessionalEngineerSignatureDate(professionalEngineerSignatureDate); + ticket.setSupervisingUnit(supervisingUnit); + ticket.setSupervisingEngineerSignature(supervisingEngineerSignature); + ticket.setSupervisingEngineerSignatureDate(supervisingEngineerSignatureDate); + ticket.setTestingUnit(testingUnit); + ticket.setTestingUnitChargePersonSignature(testingUnitChargePersonSignature); + ticket.setTestingUnitChargePersonSignatureDate(testingUnitChargePersonSignatureDate); + ticket.setProjectSn(projectSn); + nondestructiveTestOrderTicketService.add(ticket); + if (CollUtil.isNotEmpty(records)) { + for (PipelineWeldingRecord record : records) { + pipelineWeldingRecordService.updateById(record); + } + } + return Result.ok(); + } + + /** + * 编辑 + * + * @param nondestructiveTestOrderTicket + * @return + */ + @OperLog(operModul = "无损检测委托单管理", operType = "编辑", operDesc = "编辑无损检测委托单信息") + @ApiOperation(value = "编辑无损检测委托单信息", notes = "编辑无损检测委托单信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody NondestructiveTestOrderTicket nondestructiveTestOrderTicket) { + nondestructiveTestOrderTicketService.edit(nondestructiveTestOrderTicket); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "无损检测委托单管理", operType = "删除", operDesc = "删除无损检测委托单信息") + @ApiOperation(value = "删除无损检测委托单信息", notes = "删除无损检测委托单信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "无损检测委托单ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + nondestructiveTestOrderTicketService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ @OperLog(operModul = "无损检测委托单管理", operType = "通过id查询", operDesc = "通过id查询无损检测委托单信息") - @ApiOperation(value = "通过id查询无损检测委托单信息", notes = "通过id查询无损检测委托单信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "无损检测委托单ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - return Result.success(nondestructiveTestOrderTicketService.queryById(id)); - } + @ApiOperation(value = "通过id查询无损检测委托单信息", notes = "通过id查询无损检测委托单信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "无损检测委托单ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + return Result.success(nondestructiveTestOrderTicketService.queryById(id)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineMaterialInspectionController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineMaterialInspectionController.java new file mode 100644 index 000000000..28aad0ae7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineMaterialInspectionController.java @@ -0,0 +1,153 @@ +package com.zhgd.xmgl.modules.baotou.controller; +import java.util.Date; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialInspection; +import com.zhgd.xmgl.modules.baotou.service.IPipelineMaterialInspectionService; +import com.zhgd.xmgl.util.FlowUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.intellij.lang.annotations.Flow; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * @Title: Controller + * @Description: 管道材料报验 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/pipelineMaterialInspection") +@Slf4j +@Api(tags = "管道材料报验相关Api") +public class PipelineMaterialInspectionController { + @Autowired + private IPipelineMaterialInspectionService pipelineMaterialInspectionService; + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "管道材料报验管理", operType = "分页查询", operDesc = "分页列表查询管道材料报验信息") + @ApiOperation(value = "分页列表查询管道材料报验信息", notes = "分页列表查询管道材料报验信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineMaterialInspectionService.queryPageList(param)); + } + + /** + * 列表查询 + * + * @return + */ + @OperLog(operModul = "管道材料报验管理", operType = "列表查询", operDesc = "列表查询管道材料报验信息") + @ApiOperation(value = "列表查询管道材料报验信息", notes = "列表查询管道材料报验信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineMaterialInspectionService.queryList(param)); + } + + /** + * 添加 + * + * @param pipelineMaterialInspection + * @return + */ + @OperLog(operModul = "管道材料报验管理", operType = "添加", operDesc = "添加管道材料报验信息") + @ApiOperation(value = "添加管道材料报验信息", notes = "添加管道材料报验信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate PipelineMaterialInspection pipelineMaterialInspection) { + pipelineMaterialInspectionService.add(pipelineMaterialInspection); + return Result.ok(); + } + + @OperLog(operModul = "管道材料报验管理", operType = "添加", operDesc = "工作流添加管道材料报验信息") + @ApiOperation(value = "工作流添加管道材料报验信息", notes = "工作流添加管道材料报验信息", httpMethod = "POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody @Validate Map param) { + log.info("工作流添加管道材料报验信息:{}", JSON.toJSONString(param)); + Long deviceUnitId = FlowUtil.getPullDownLong(param, "deviceUnitId"); + Long projectGroupId = FlowUtil.getPullDownLong(param, "projectGroupId"); + Long supervisingUnitId = FlowUtil.getPullDownLong(param, "supervisingUnitId"); + Long epcContractorId = FlowUtil.getPullDownLong(param, "epcContractorId"); + Long constructionUnitId = FlowUtil.getPullDownLong(param, "constructionUnitId"); + String attachment = FlowUtil.getJSONString(param, "attachment"); + String materialType = FlowUtil.getPullDownManyStr(param, "materialType"); + String projectSn = FlowUtil.getString(param, "projectSn"); + PipelineMaterialInspection inspection = new PipelineMaterialInspection(); + inspection.setDeviceUnitId(deviceUnitId); + inspection.setProjectGroupId(projectGroupId); + inspection.setSupervisingUnitId(supervisingUnitId); + inspection.setEpcContractorId(epcContractorId); + inspection.setConstructionUnitId(constructionUnitId); + inspection.setMaterialType(materialType); + inspection.setAttachment(attachment); + inspection.setProjectSn(projectSn); + pipelineMaterialInspectionService.add(inspection); + return Result.ok(); + } + + /** + * 编辑 + * + * @param pipelineMaterialInspection + * @return + */ + @OperLog(operModul = "管道材料报验管理", operType = "编辑", operDesc = "编辑管道材料报验信息") + @ApiOperation(value = "编辑管道材料报验信息", notes = "编辑管道材料报验信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PipelineMaterialInspection pipelineMaterialInspection) { + pipelineMaterialInspectionService.edit(pipelineMaterialInspection); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "管道材料报验管理", operType = "删除", operDesc = "删除管道材料报验信息") + @ApiOperation(value = "删除管道材料报验信息", notes = "删除管道材料报验信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "管道材料报验ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + pipelineMaterialInspectionService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @OperLog(operModul = "管道材料报验管理", operType = "通过id查询", operDesc = "通过id查询管道材料报验信息") + @ApiOperation(value = "通过id查询管道材料报验信息", notes = "通过id查询管道材料报验信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "管道材料报验ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + return Result.success(pipelineMaterialInspectionService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineMaterialManagementController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineMaterialManagementController.java deleted file mode 100644 index 456a69256..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineMaterialManagementController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.zhgd.xmgl.modules.baotou.controller; - -import com.alibaba.fastjson.JSONObject; -import com.zhgd.annotation.OperLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiImplicitParams; -import java.util.HashMap; -import springfox.documentation.annotations.ApiIgnore; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialManagement; -import com.zhgd.xmgl.modules.baotou.service.IPipelineMaterialManagementService; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; - - - /** - * @Title: Controller - * @Description: 管道的材料管理 - * @author： pds - * @date： 2024-09-03 - * @version： V1.0 - */ -@RestController -@RequestMapping("/xmgl/pipelineMaterialManagement") -@Slf4j -@Api(tags = "管道的材料管理相关Api") -public class PipelineMaterialManagementController { - @Autowired - private IPipelineMaterialManagementService pipelineMaterialManagementService; - - /** - * 分页列表查询 - * @return - */ - @OperLog(operModul = "管道的材料管理管理", operType = "分页查询", operDesc = "分页列表查询管道的材料管理信息") - @ApiOperation(value = "分页列表查询管道的材料管理信息", notes = "分页列表查询管道的材料管理信息", httpMethod="GET") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), - }) - @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(pipelineMaterialManagementService.queryPageList(param)); - } - - /** - * 列表查询 - * @return - */ - @OperLog(operModul = "管道的材料管理管理", operType = "列表查询", operDesc = "列表查询管道的材料管理信息") - @ApiOperation(value = "列表查询管道的材料管理信息", notes = "列表查询管道的材料管理信息", httpMethod="GET") - @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(pipelineMaterialManagementService.queryList(param)); - } - - /** - * 添加 - * @param pipelineMaterialManagement - * @return - */ - @OperLog(operModul = "管道的材料管理管理", operType = "添加", operDesc = "添加管道的材料管理信息") - @ApiOperation(value = "添加管道的材料管理信息", notes = "添加管道的材料管理信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody @Validate PipelineMaterialManagement pipelineMaterialManagement) { - pipelineMaterialManagementService.add(pipelineMaterialManagement); - return Result.ok(); - } - - /** - * 编辑 - * @param pipelineMaterialManagement - * @return - */ - @OperLog(operModul = "管道的材料管理管理", operType = "编辑", operDesc = "编辑管道的材料管理信息") - @ApiOperation(value = "编辑管道的材料管理信息", notes = "编辑管道的材料管理信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody PipelineMaterialManagement pipelineMaterialManagement) { - pipelineMaterialManagementService.edit(pipelineMaterialManagement); - return Result.ok(); - } - - /** - * 通过id删除 - * @return - */ - @OperLog(operModul = "管道的材料管理管理", operType = "删除", operDesc = "删除管道的材料管理信息") - @ApiOperation(value = "删除管道的材料管理信息", notes = "删除管道的材料管理信息" , httpMethod="POST") - @ApiImplicitParam(name = "id", value = "管道的材料管理ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - pipelineMaterialManagementService.delete(MapUtils.getString(map, "id")); - return Result.ok(); - } - - /** - * 通过id查询 - * @param id - * @return - */ - @OperLog(operModul = "管道的材料管理管理", operType = "通过id查询", operDesc = "通过id查询管道的材料管理信息") - @ApiOperation(value = "通过id查询管道的材料管理信息", notes = "通过id查询管道的材料管理信息" , httpMethod="GET") - @ApiImplicitParam(name = "id", value = "管道的材料管理ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - return Result.success(pipelineMaterialManagementService.queryById(id)); - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelinePressureTestBagController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelinePressureTestBagController.java new file mode 100644 index 000000000..561b4d287 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelinePressureTestBagController.java @@ -0,0 +1,168 @@ +package com.zhgd.xmgl.modules.baotou.controller; +import java.util.Date; + +import com.alibaba.fastjson.JSONObject; +import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.util.FlowUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; +import java.util.HashMap; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.baotou.entity.PipelinePressureTestBag; +import com.zhgd.xmgl.modules.baotou.service.IPipelinePressureTestBagService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; + + + /** + * @Title: Controller + * @Description: 管道试压包 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/pipelinePressureTestBag") +@Slf4j +@Api(tags = "管道试压包相关Api") +public class PipelinePressureTestBagController { + @Autowired + private IPipelinePressureTestBagService pipelinePressureTestBagService; + + /** + * 分页列表查询 + * @return + */ + @OperLog(operModul = "管道试压包管理", operType = "分页查询", operDesc = "分页列表查询管道试压包信息") + @ApiOperation(value = "分页列表查询管道试压包信息", notes = "分页列表查询管道试压包信息", httpMethod="GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelinePressureTestBagService.queryPageList(param)); + } + + /** + * 列表查询 + * @return + */ + @OperLog(operModul = "管道试压包管理", operType = "列表查询", operDesc = "列表查询管道试压包信息") + @ApiOperation(value = "列表查询管道试压包信息", notes = "列表查询管道试压包信息", httpMethod="GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelinePressureTestBagService.queryList(param)); + } + + /** + * 添加 + * @param pipelinePressureTestBag + * @return + */ + @OperLog(operModul = "管道试压包管理", operType = "添加", operDesc = "添加管道试压包信息") + @ApiOperation(value = "添加管道试压包信息", notes = "添加管道试压包信息" , httpMethod="POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate PipelinePressureTestBag pipelinePressureTestBag) { + pipelinePressureTestBagService.add(pipelinePressureTestBag); + return Result.ok(); + } + @OperLog(operModul = "管道试压包管理", operType = "添加", operDesc = "工作流添加管道试压包信息") + @ApiOperation(value = "工作流添加管道试压包信息", notes = "工作流添加管道试压包信息" , httpMethod="POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody @Validate Map param) { + log.info("工作流添加管道试压包信息:{}", JSON.toJSONString(param)); + Long deviceUnitId = FlowUtil.getPullDownLong(param, "deviceUnitId"); + String pipelineInformationIds = FlowUtil.getPullDownManyStr(param, "pipelineInformationIds"); + String testPressurePackageName = FlowUtil.getString(param, "testPressurePackageName"); + String testPressurePackageNumber = FlowUtil.getString(param, "testPressurePackageNumber"); + String testPressure = FlowUtil.getString(param, "testPressure"); + String designPressure = FlowUtil.getString(param, "designPressure"); + String attachment = FlowUtil.getJSONString(param, "attachment"); + String projectSn = FlowUtil.getString(param, "projectSn"); + Date pressureApplicationTime = FlowUtil.getDate(param, "pressureApplicationTime"); + PipelinePressureTestBag bag = new PipelinePressureTestBag(); + bag.setDeviceUnitId(deviceUnitId); + bag.setPipelineInformationIds(pipelineInformationIds); + bag.setTestPressurePackageName(testPressurePackageName); + bag.setTestPressurePackageNumber(testPressurePackageNumber); + bag.setTestPressure(testPressure); + bag.setDesignPressure(designPressure); + bag.setPressureApplicationTime(pressureApplicationTime); + bag.setAttachment(attachment); + bag.setProjectSn(projectSn); + pipelinePressureTestBagService.add(bag); + return Result.ok(); + } + + /** + * 编辑 + * @param pipelinePressureTestBag + * @return + */ + @OperLog(operModul = "管道试压包管理", operType = "编辑", operDesc = "编辑管道试压包信息") + @ApiOperation(value = "编辑管道试压包信息", notes = "编辑管道试压包信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PipelinePressureTestBag pipelinePressureTestBag) { + pipelinePressureTestBagService.edit(pipelinePressureTestBag); + return Result.ok(); + } + + /** + * 通过id删除 + * @return + */ + @OperLog(operModul = "管道试压包管理", operType = "删除", operDesc = "删除管道试压包信息") + @ApiOperation(value = "删除管道试压包信息", notes = "删除管道试压包信息" , httpMethod="POST") + @ApiImplicitParam(name = "id", value = "管道试压包ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + pipelinePressureTestBagService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * @param id + * @return + */ + @OperLog(operModul = "管道试压包管理", operType = "通过id查询", operDesc = "通过id查询管道试压包信息") + @ApiOperation(value = "通过id查询管道试压包信息", notes = "通过id查询管道试压包信息" , httpMethod="GET") + @ApiImplicitParam(name = "id", value = "管道试压包ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + return Result.success(pipelinePressureTestBagService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWelderController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWelderController.java new file mode 100644 index 000000000..d7a9f09cf --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWelderController.java @@ -0,0 +1,139 @@ +package com.zhgd.xmgl.modules.baotou.controller; + +import com.alibaba.fastjson.JSONObject; +import com.zhgd.annotation.OperLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; +import java.util.HashMap; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWelder; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWelderService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; + + + /** + * @Title: Controller + * @Description: 管道焊工 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/pipelineWelder") +@Slf4j +@Api(tags = "管道焊工相关Api") +public class PipelineWelderController { + @Autowired + private IPipelineWelderService pipelineWelderService; + + /** + * 分页列表查询 + * @return + */ + @OperLog(operModul = "管道焊工管理", operType = "分页查询", operDesc = "分页列表查询管道焊工信息") + @ApiOperation(value = "分页列表查询管道焊工信息", notes = "分页列表查询管道焊工信息", httpMethod="GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineWelderService.queryPageList(param)); + } + + /** + * 列表查询 + * @return + */ + @OperLog(operModul = "管道焊工管理", operType = "列表查询", operDesc = "列表查询管道焊工信息") + @ApiOperation(value = "列表查询管道焊工信息", notes = "列表查询管道焊工信息", httpMethod="GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineWelderService.queryList(param)); + } + + /** + * 添加 + * @param pipelineWelder + * @return + */ + @OperLog(operModul = "管道焊工管理", operType = "添加", operDesc = "添加管道焊工信息") + @ApiOperation(value = "添加管道焊工信息", notes = "添加管道焊工信息" , httpMethod="POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate PipelineWelder pipelineWelder) { + pipelineWelderService.add(pipelineWelder); + return Result.ok(); + } + + /** + * 编辑 + * @param pipelineWelder + * @return + */ + @OperLog(operModul = "管道焊工管理", operType = "编辑", operDesc = "编辑管道焊工信息") + @ApiOperation(value = "编辑管道焊工信息", notes = "编辑管道焊工信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PipelineWelder pipelineWelder) { + pipelineWelderService.edit(pipelineWelder); + return Result.ok(); + } + + /** + * 通过id删除 + * @return + */ + @OperLog(operModul = "管道焊工管理", operType = "删除", operDesc = "删除管道焊工信息") + @ApiOperation(value = "删除管道焊工信息", notes = "删除管道焊工信息" , httpMethod="POST") + @ApiImplicitParam(name = "id", value = "管道焊工ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + pipelineWelderService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * @param id + * @return + */ + @OperLog(operModul = "管道焊工管理", operType = "通过id查询", operDesc = "通过id查询管道焊工信息") + @ApiOperation(value = "通过id查询管道焊工信息", notes = "通过id查询管道焊工信息" , httpMethod="GET") + @ApiImplicitParam(name = "id", value = "管道焊工ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + return Result.success(pipelineWelderService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingProcedureQualificationController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingProcedureQualificationController.java new file mode 100644 index 000000000..fa5f58377 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingProcedureQualificationController.java @@ -0,0 +1,190 @@ +package com.zhgd.xmgl.modules.baotou.controller; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingProcedureQualification; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingProcedureQualificationService; +import com.zhgd.xmgl.util.FlowUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * @Title: Controller + * @Description: 管道焊接工艺评定 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/pipelineWeldingProcedureQualification") +@Slf4j +@Api(tags = "管道焊接工艺评定相关Api") +public class PipelineWeldingProcedureQualificationController { + @Autowired + private IPipelineWeldingProcedureQualificationService pipelineWeldingProcedureQualificationService; + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "管道焊接工艺评定管理", operType = "分页查询", operDesc = "分页列表查询管道焊接工艺评定信息") + @ApiOperation(value = "分页列表查询管道焊接工艺评定信息", notes = "分页列表查询管道焊接工艺评定信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineWeldingProcedureQualificationService.queryPageList(param)); + } + + /** + * 列表查询 + * + * @return + */ + @OperLog(operModul = "管道焊接工艺评定管理", operType = "列表查询", operDesc = "列表查询管道焊接工艺评定信息") + @ApiOperation(value = "列表查询管道焊接工艺评定信息", notes = "列表查询管道焊接工艺评定信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineWeldingProcedureQualificationService.queryList(param)); + } + + /** + * 添加 + * + * @param pipelineWeldingProcedureQualification + * @return + */ + @OperLog(operModul = "管道焊接工艺评定管理", operType = "添加", operDesc = "添加管道焊接工艺评定信息") + @ApiOperation(value = "添加管道焊接工艺评定信息", notes = "添加管道焊接工艺评定信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification) { + pipelineWeldingProcedureQualificationService.add(pipelineWeldingProcedureQualification); + return Result.ok(); + } + + @OperLog(operModul = "管道焊接工艺评定管理", operType = "添加", operDesc = "工作流添加管道焊接工艺评定信息") + @ApiOperation(value = "工作流添加管道焊接工艺评定信息", notes = "工作流添加管道焊接工艺评定信息", httpMethod = "POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody @Validate Map param) { + log.info("工作流添加管道焊接工艺评定信息:{}", JSON.toJSONString(param)); + Long deviceUnitId = FlowUtil.getPullDownLong(param, "deviceUnitId"); + Long projectGroupId = FlowUtil.getPullDownLong(param, "projectGroupId"); + Long supervisingUnitId = FlowUtil.getPullDownLong(param, "supervisingUnitId"); + Long epcContractorId = FlowUtil.getPullDownLong(param, "epcContractorId"); + Long constructionUnitId = FlowUtil.getPullDownLong(param, "constructionUnitId"); + String projectSn = FlowUtil.getString(param, "projectSn"); + List qualifications = new ArrayList<>(); + Object detail = param.get("detail"); + if (detail instanceof List) { + List details = (List) detail; + if (CollUtil.isNotEmpty(details)) { + for (Object o : details) { + PipelineWeldingProcedureQualification qualification = new PipelineWeldingProcedureQualification(); + qualification.setDeviceUnitId(deviceUnitId); + qualification.setProjectGroupId(projectGroupId); + qualification.setSupervisingUnitId(supervisingUnitId); + qualification.setEpcContractorId(epcContractorId); + qualification.setConstructionUnitId(constructionUnitId); + qualification.setProjectSn(projectSn); + Map m = (Map) o; + String parentMaterial = FlowUtil.getString(m, "field6589810489310"); + String maximumWallThickness = FlowUtil.getString(m, "field9141010496709"); + String minimumWallThickness = FlowUtil.getString(m, "field4443810502760"); + String weldingMethod = FlowUtil.getString(m, "field8897910507043"); + String weldingMaterialRod = FlowUtil.getString(m, "field6409110512543"); + String weldingMaterialWireFlux = FlowUtil.getString(m, "field4740410517143"); + String weldingPosition = FlowUtil.getString(m, "field5473210520844"); + String impactRequirement = FlowUtil.getString(m, "field3204110524193"); + String heatTreatment = FlowUtil.getString(m, "field5723110527444"); + String assessmentAttachment = FlowUtil.getJSONString(m, "field9594410775709"); + String technologyProcessCardAttachment = FlowUtil.getJSONString(m, "field4024010784496"); +// String assessmentAttachmentQrCode = FlowUtil.getString(m, "assessmentAttachmentQrCode"); +// String technologyProcessCardAttachmentQrCode = FlowUtil.getString(m, "technologyProcessCardAttachmentQrCode"); + String remark = FlowUtil.getString(m, "field6910010546472"); + qualification.setParentMaterial(parentMaterial); + qualification.setMaximumWallThickness(maximumWallThickness); + qualification.setMinimumWallThickness(minimumWallThickness); + qualification.setWeldingMethod(weldingMethod); + qualification.setWeldingMaterialRod(weldingMaterialRod); + qualification.setWeldingMaterialWireFlux(weldingMaterialWireFlux); + qualification.setWeldingPosition(weldingPosition); + qualification.setImpactRequirement(impactRequirement); + qualification.setHeatTreatment(heatTreatment); + qualification.setAssessmentAttachment(assessmentAttachment); + qualification.setTechnologyProcessCardAttachment(technologyProcessCardAttachment); +// qualification.setAssessmentAttachmentQrCode(assessmentAttachmentQrCode); +// qualification.setTechnologyProcessCardAttachmentQrCode(technologyProcessCardAttachmentQrCode); + qualification.setRemark(remark); + qualifications.add(qualification); + } + } + } + for (PipelineWeldingProcedureQualification qualification : qualifications) { + pipelineWeldingProcedureQualificationService.add(qualification); + } + return Result.ok(); + } + + /** + * 编辑 + * + * @param pipelineWeldingProcedureQualification + * @return + */ + @OperLog(operModul = "管道焊接工艺评定管理", operType = "编辑", operDesc = "编辑管道焊接工艺评定信息") + @ApiOperation(value = "编辑管道焊接工艺评定信息", notes = "编辑管道焊接工艺评定信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification) { + pipelineWeldingProcedureQualificationService.edit(pipelineWeldingProcedureQualification); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "管道焊接工艺评定管理", operType = "删除", operDesc = "删除管道焊接工艺评定信息") + @ApiOperation(value = "删除管道焊接工艺评定信息", notes = "删除管道焊接工艺评定信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "管道焊接工艺评定ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + pipelineWeldingProcedureQualificationService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @OperLog(operModul = "管道焊接工艺评定管理", operType = "通过id查询", operDesc = "通过id查询管道焊接工艺评定信息") + @ApiOperation(value = "通过id查询管道焊接工艺评定信息", notes = "通过id查询管道焊接工艺评定信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "管道焊接工艺评定ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + return Result.success(pipelineWeldingProcedureQualificationService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java new file mode 100644 index 000000000..d7397046d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java @@ -0,0 +1,187 @@ +package com.zhgd.xmgl.modules.baotou.controller; +import java.util.Date; + +import com.alibaba.fastjson.JSONObject; +import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.util.FlowUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; +import java.util.HashMap; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingRecord; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingRecordService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; + + + /** + * @Title: Controller + * @Description: 管道焊接记录 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/pipelineWeldingRecord") +@Slf4j +@Api(tags = "管道焊接记录相关Api") +public class PipelineWeldingRecordController { + @Autowired + private IPipelineWeldingRecordService pipelineWeldingRecordService; + + /** + * 分页列表查询 + * @return + */ + @OperLog(operModul = "管道焊接记录管理", operType = "分页查询", operDesc = "分页列表查询管道焊接记录信息") + @ApiOperation(value = "分页列表查询管道焊接记录信息", notes = "分页列表查询管道焊接记录信息", httpMethod="GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineWeldingRecordService.queryPageList(param)); + } + + /** + * 列表查询 + * @return + */ + @OperLog(operModul = "管道焊接记录管理", operType = "列表查询", operDesc = "列表查询管道焊接记录信息") + @ApiOperation(value = "列表查询管道焊接记录信息", notes = "列表查询管道焊接记录信息", httpMethod="GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(pipelineWeldingRecordService.queryList(param)); + } + + /** + * 添加 + * @param pipelineWeldingRecord + * @return + */ + @OperLog(operModul = "管道焊接记录管理", operType = "添加", operDesc = "添加管道焊接记录信息") + @ApiOperation(value = "添加管道焊接记录信息", notes = "添加管道焊接记录信息" , httpMethod="POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate PipelineWeldingRecord pipelineWeldingRecord) { + pipelineWeldingRecordService.add(pipelineWeldingRecord); + return Result.ok(); + } + @OperLog(operModul = "管道焊接记录管理", operType = "添加", operDesc = "工作流添加管道焊接记录信息") + @ApiOperation(value = "工作流添加管道焊接记录信息", notes = "工作流添加管道焊接记录信息" , httpMethod="POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody @Validate Map param) { + log.info("添加管道焊接记录信息:{}", JSON.toJSONString(param)); + Long deviceUnitId = FlowUtil.getPullDownLong(param, "deviceUnitId"); + Long pipelineInformationId = FlowUtil.getPullDownLong(param, "pipelineInformationId"); + Long projectGroupId = FlowUtil.getPullDownLong(param, "projectGroupId"); + Long supervisingUnitId = FlowUtil.getPullDownLong(param, "supervisingUnitId"); + Long epcContractorId = FlowUtil.getPullDownLong(param, "epcContractorId"); + Long constructionUnitId = FlowUtil.getPullDownLong(param, "constructionUnitId"); + Long pipelineWeldingJointManagementId = FlowUtil.getPullDownLong(param, "pipelineWeldingJointManagementId"); + Long pipelineWelderId = FlowUtil.getPullDownLong(param, "pipelineWelderId"); + String specification = FlowUtil.getString(param, "specification"); + String material = FlowUtil.getString(param, "material"); + String weldingPosition = FlowUtil.getString(param, "weldingPosition"); + String weldingMethod = FlowUtil.getString(param, "weldingMethod"); + String weldingMaterialBrand = FlowUtil.getString(param, "weldingMaterialBrand"); + String actualPreheatingTemperature = FlowUtil.getString(param, "actualPreheatingTemperature"); + String weldingSurfaceQuality = FlowUtil.getString(param, "weldingSurfaceQuality"); + String pipelineInternalConnectionInspection = FlowUtil.getString(param, "pipelineInternalConnectionInspection"); + String projectSn = FlowUtil.getString(param, "projectSn"); + Date weldingDate = FlowUtil.getDate(param, "weldingDate"); + PipelineWeldingRecord record = new PipelineWeldingRecord(); + record.setDeviceUnitId(deviceUnitId); + record.setPipelineInformationId(pipelineInformationId); + record.setProjectGroupId(projectGroupId); + record.setSupervisingUnitId(supervisingUnitId); + record.setEpcContractorId(epcContractorId); + record.setConstructionUnitId(constructionUnitId); + record.setPipelineWeldingJointManagementId(pipelineWeldingJointManagementId); + record.setPipelineWelderId(pipelineWelderId); + record.setSpecification(specification); + record.setMaterial(material); + record.setWeldingPosition(weldingPosition); + record.setWeldingMethod(weldingMethod); + record.setWeldingMaterialBrand(weldingMaterialBrand); + record.setActualPreheatingTemperature(actualPreheatingTemperature); + record.setWeldingDate(weldingDate); + record.setWeldingSurfaceQuality(weldingSurfaceQuality); + record.setPipelineInternalConnectionInspection(pipelineInternalConnectionInspection); +// record.setTestingQualified(0); + record.setProjectSn(projectSn); + pipelineWeldingRecordService.add(record); + return Result.ok(); + } + + /** + * 编辑 + * @param pipelineWeldingRecord + * @return + */ + @OperLog(operModul = "管道焊接记录管理", operType = "编辑", operDesc = "编辑管道焊接记录信息") + @ApiOperation(value = "编辑管道焊接记录信息", notes = "编辑管道焊接记录信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PipelineWeldingRecord pipelineWeldingRecord) { + pipelineWeldingRecordService.edit(pipelineWeldingRecord); + return Result.ok(); + } + + /** + * 通过id删除 + * @return + */ + @OperLog(operModul = "管道焊接记录管理", operType = "删除", operDesc = "删除管道焊接记录信息") + @ApiOperation(value = "删除管道焊接记录信息", notes = "删除管道焊接记录信息" , httpMethod="POST") + @ApiImplicitParam(name = "id", value = "管道焊接记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + pipelineWeldingRecordService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * @param id + * @return + */ + @OperLog(operModul = "管道焊接记录管理", operType = "通过id查询", operDesc = "通过id查询管道焊接记录信息") + @ApiOperation(value = "通过id查询管道焊接记录信息", notes = "通过id查询管道焊接记录信息" , httpMethod="GET") + @ApiImplicitParam(name = "id", value = "管道焊接记录ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + return Result.success(pipelineWeldingRecordService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/DeviceUnit.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/DeviceUnit.java index e6e85e921..e724cd505 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/DeviceUnit.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/DeviceUnit.java @@ -57,6 +57,9 @@ public class DeviceUnit implements Serializable { @ApiModelProperty(value="EPC承包商ids") private java.lang.String epcContractorIds; + @TableField(exist = false) + @ApiModelProperty(value="监理单位ids") + private java.lang.String supervisingUnitIds; /**监理单位名称*/ @TableField(exist = false) @ApiModelProperty(value="监理单位名称") diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/NondestructiveTestOrderTicket.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/NondestructiveTestOrderTicket.java index 7c3552ac8..70e975708 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/NondestructiveTestOrderTicket.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/NondestructiveTestOrderTicket.java @@ -44,10 +44,8 @@ public class NondestructiveTestOrderTicket implements Serializable { @Excel(name = "检件名称", width = 15) @ApiModelProperty(value="检件名称") private java.lang.String testPieceName ; - /**管线号*/ - @Excel(name = "管线号", width = 15) - @ApiModelProperty(value="管线号") - private java.lang.String pipelineNumber ; + @ApiModelProperty(value="管道基本信息id") + private java.lang.Long pipelineInformationId ; /**委托单位*/ @Excel(name = "委托单位", width = 15) @ApiModelProperty(value="委托单位") @@ -215,4 +213,8 @@ public class NondestructiveTestOrderTicket implements Serializable { @TableField(exist = false) @ApiModelProperty(value="检测单位负责人签字名称") private java.lang.String testingUnitChargePersonSignatureName ; + /**管线号*/ + @TableField(exist = false) + @ApiModelProperty(value="管线号") + private java.lang.String pipelineNumber ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineInformation.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineInformation.java index 0c81a6089..fbcf85be6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineInformation.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineInformation.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -31,55 +30,16 @@ public class PipelineInformation implements Serializable { /** * 管线编号 */ - @Excel(name = "管线编号", width = 15) @ApiModelProperty(value = "管线编号") private java.lang.String pipelineNumber; - /** - * 管线壁厚 - */ - @Excel(name = "管线壁厚", width = 15) - @ApiModelProperty(value = "管线壁厚") - private java.lang.String pipelineWallThickness; - /** - * 压力等级 - */ - @Excel(name = "压力等级", width = 15) - @ApiModelProperty(value = "压力等级") - private java.lang.String pressureLevel; - /** - * 介质类型 - */ - @Excel(name = "介质类型", width = 15) - @ApiModelProperty(value = "介质类型") - private java.lang.String mediaType; - /** - * 管道分级 - */ - @Excel(name = "管道分级", width = 15) - @ApiModelProperty(value = "管道分级") - private java.lang.String pipelineClassification; - /** - * 材质类型 - */ - @Excel(name = "材质类型", width = 15) - @ApiModelProperty(value = "材质类型") - private java.lang.String materialType; - /** - * 产品标准号 - */ - @Excel(name = "产品标准号", width = 15) - @ApiModelProperty(value = "产品标准号") - private java.lang.String productStandardNumber; /** * 单线图 */ - @Excel(name = "单线图", width = 15) @ApiModelProperty(value = "单线图") private java.lang.String singleLineDiagram; /** * 所属项目SN */ - @Excel(name = "所属项目SN", width = 15) @ApiModelProperty(value = "所属项目SN") private java.lang.String projectSn; /** @@ -95,7 +55,29 @@ public class PipelineInformation implements Serializable { /** * 焊口点位 */ - @Excel(name = "焊口点位", width = 15) @ApiModelProperty(value = "焊口点位") private java.lang.String weldingPointPosition; + @ApiModelProperty(value = "装置管理id") + private java.lang.Long deviceUnitId; + /** + * 管线名称 + */ + @ApiModelProperty(value = "管线名称") + private java.lang.String pipelineName; + /** + * 规格(mm) + */ + @ApiModelProperty(value = "规格(mm)") + private java.lang.String specification; + /** + * 材质 + */ + @ApiModelProperty(value = "材质") + private java.lang.String material; + /** + * 检测比例 + */ + @ApiModelProperty(value = "检测比例") + private java.lang.String detectionRatio; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineMaterialInspection.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineMaterialInspection.java new file mode 100644 index 000000000..6d0d02b85 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineMaterialInspection.java @@ -0,0 +1,80 @@ +package com.zhgd.xmgl.modules.baotou.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 管道材料报验 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Data +@TableName("pipeline_material_inspection") +@ApiModel(value="PipelineMaterialInspection实体类",description="PipelineMaterialInspection") +public class PipelineMaterialInspection implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**装置管理id*/ + @ApiModelProperty(value="装置管理id") + private java.lang.Long deviceUnitId ; + /**项目组id*/ + @ApiModelProperty(value="项目组id") + private java.lang.Long projectGroupId ; + /**监理单位id*/ + @ApiModelProperty(value="监理单位id") + private java.lang.Long supervisingUnitId ; + /**EPC承包商id*/ + @ApiModelProperty(value="EPC承包商id") + private java.lang.Long epcContractorId ; + /**施工单位id*/ + @ApiModelProperty(value="施工单位id") + private java.lang.Long constructionUnitId ; + /**材料类型（多个,分割）（1:管子;2:管件;3:阀门;4:法兰、法兰盖及翻边短节;5:紧固件;6:垫片;7:金属波纹管膨胀节;8:爆破片安全装置;9:阻火器;10:管道支承件;）*/ + @ApiModelProperty(value="材料类型（多个,分割）（1:管子;2:管件;3:阀门;4:法兰、法兰盖及翻边短节;5:紧固件;6:垫片;7:金属波纹管膨胀节;8:爆破片安全装置;9:阻火器;10:管道支承件;）") + private java.lang.String materialType ; + /**附件*/ + @ApiModelProperty(value="附件") + private java.lang.String attachment ; + /**所属项目SN*/ + @ApiModelProperty(value="所属项目SN") + private java.lang.String projectSn ; + /**创建时间*/ + @ApiModelProperty(value="创建时间") + private java.util.Date createDate ; + /**更新时间*/ + @ApiModelProperty(value="更新时间") + private java.util.Date updateDate ; + + @TableField(exist = false) + @ApiModelProperty(value="装置管理名称") + private java.lang.String deviceUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="项目组名称") + private java.lang.String projectGroupName ; + @TableField(exist = false) + @ApiModelProperty(value="监理单位名称") + private java.lang.String supervisingUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="EPC承包商名称") + private java.lang.String epcContractorName ; + @TableField(exist = false) + @ApiModelProperty(value="施工单位名称") + private java.lang.String constructionUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="材料类型名称（多个,分割）（1:管子;2:管件;3:阀门;4:法兰、法兰盖及翻边短节;5:紧固件;6:垫片;7:金属波纹管膨胀节;8:爆破片安全装置;9:阻火器;10:管道支承件;）") + private java.lang.String materialTypeName ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineMaterialManagement.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineMaterialManagement.java deleted file mode 100644 index 56a99ca6a..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineMaterialManagement.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zhgd.xmgl.modules.baotou.entity; - -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -/** - * @Description: 管道的材料管理 - * @author： pds - * @date： 2024-09-03 - * @version： V1.0 - */ -@Data -@TableName("pipeline_material_management") -@ApiModel(value="PipelineMaterialManagement实体类",description="PipelineMaterialManagement") -public class PipelineMaterialManagement implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value="id") - private java.lang.Long id ; - /**管道基本信息id*/ - @Excel(name = "管道基本信息id", width = 15) - @ApiModelProperty(value="管道基本信息id") - private java.lang.Long pipelineInformationId ; - /**材料类型：1:法兰;2:垫片;3:阀门;*/ - @Excel(name = "材料类型：1:法兰;2:垫片;3:阀门;", width = 15) - @ApiModelProperty(value="材料类型：1:法兰;2:垫片;3:阀门;") - private java.lang.Integer materialType ; - /**钢的排号*/ - @Excel(name = "钢的排号", width = 15) - @ApiModelProperty(value="钢的排号") - private java.lang.String steelNumber ; - /**材料管理*/ - @Excel(name = "材料管理", width = 15) - @ApiModelProperty(value="材料管理") - private java.lang.String materialManagement ; - /**上传附件*/ - @Excel(name = "上传附件", width = 15) - @ApiModelProperty(value="上传附件") - private java.lang.String uploadAttachment ; - /**阀内试验记录附件*/ - @Excel(name = "阀内试验记录附件", width = 15) - @ApiModelProperty(value="阀内试验记录附件") - private java.lang.String internalTestRecordAttachment ; - /**所属项目SN*/ - @Excel(name = "所属项目SN", width = 15) - @ApiModelProperty(value="所属项目SN") - private java.lang.String projectSn ; - /**创建时间*/ - @ApiModelProperty(value="创建时间") - private java.util.Date createDate ; - /**更新时间*/ - @ApiModelProperty(value="更新时间") - private java.util.Date updateDate ; -} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelinePressureTestBag.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelinePressureTestBag.java new file mode 100644 index 000000000..519d5d6b7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelinePressureTestBag.java @@ -0,0 +1,75 @@ +package com.zhgd.xmgl.modules.baotou.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 管道试压包 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Data +@TableName("pipeline_pressure_test_bag") +@ApiModel(value="PipelinePressureTestBag实体类",description="PipelinePressureTestBag") +public class PipelinePressureTestBag implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**装置管理id*/ + @ApiModelProperty(value="装置管理id") + private java.lang.Long deviceUnitId ; + /**管道基本信息ids*/ + @ApiModelProperty(value="管道基本信息ids") + private java.lang.String pipelineInformationIds ; + /**试压包名称*/ + @ApiModelProperty(value="试压包名称") + private java.lang.String testPressurePackageName ; + /**试压包编号*/ + @ApiModelProperty(value="试压包编号") + private java.lang.String testPressurePackageNumber ; + /**试验压力*/ + @ApiModelProperty(value="试验压力") + private java.lang.String testPressure ; + /**设计压力*/ + @ApiModelProperty(value="设计压力") + private java.lang.String designPressure ; + /**试压时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="试压时间") + private java.util.Date pressureApplicationTime ; + /**附件*/ + @ApiModelProperty(value="附件") + private java.lang.String attachment ; + /**所属项目SN*/ + @ApiModelProperty(value="所属项目SN") + private java.lang.String projectSn ; + /**创建时间*/ + @ApiModelProperty(value="创建时间") + private java.util.Date createDate ; + /**更新时间*/ + @ApiModelProperty(value="更新时间") + private java.util.Date updateDate ; + @TableField(exist = false) + @ApiModelProperty(value="装置管理名称") + private java.lang.String deviceUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="管道名称s") + private java.lang.String pipelineNames ; + @TableField(exist = false) + @ApiModelProperty(value="管道编号/单线号s") + private java.lang.String pipelineNumbers ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWelder.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWelder.java new file mode 100644 index 000000000..7a20b4c5e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWelder.java @@ -0,0 +1,73 @@ +package com.zhgd.xmgl.modules.baotou.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 管道焊工 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Data +@TableName("pipeline_welder") +@ApiModel(value="PipelineWelder实体类",description="PipelineWelder") +public class PipelineWelder implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**装置管理id*/ + @ApiModelProperty(value="装置管理id") + private java.lang.Long deviceUnitId ; + /**劳务人员id*/ + @ApiModelProperty(value="劳务人员id") + private java.lang.Long workerId ; + /**焊工代号*/ + @ApiModelProperty(value="焊工代号") + private java.lang.String welderCode ; + /**合格项目代号*/ + @ApiModelProperty(value="合格项目代号") + private java.lang.String qualifiedProjectCode ; + /**有效期限*/ + @ApiModelProperty(value="有效期限") + private java.lang.String validityPeriod ; + /**所属项目SN*/ + @ApiModelProperty(value="所属项目SN") + private java.lang.String projectSn ; + /**创建时间*/ + @ApiModelProperty(value="创建时间") + private java.util.Date createDate ; + /**更新时间*/ + @ApiModelProperty(value="更新时间") + private java.util.Date updateDate ; + @ApiModelProperty(value="长期焊接合格率低告警（0正常1告警）") + private java.lang.Integer longTermLowWeldingPassRateAlarm ; + @TableField(exist = false) + @ApiModelProperty(value="装置管理名称") + private java.lang.String deviceUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="焊工姓名") + private java.lang.String welderName ; + @TableField(exist = false) + @ApiModelProperty(value="性别，1男，2女") + private java.lang.Integer sex ; + @TableField(exist = false) + @ApiModelProperty(value="焊工证号") + private java.lang.String welderCertificateNumber ; + @TableField(exist = false) + @ApiModelProperty(value="焊接合格率") + private java.lang.String weldingPassRate ; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingJointManagement.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingJointManagement.java index 75471d77a..899bb9a7f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingJointManagement.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingJointManagement.java @@ -32,44 +32,10 @@ public class PipelineWeldingJointManagement implements Serializable { @Excel(name = "管道基本信息id", width = 15) @ApiModelProperty(value="管道基本信息id") private java.lang.Long pipelineInformationId ; - /**焊口名称*/ - @Excel(name = "焊口名称", width = 15) - @ApiModelProperty(value="焊口名称") - private java.lang.String weldName ; - /**直径*/ - @Excel(name = "直径", width = 15) - @ApiModelProperty(value="直径") - private java.lang.String diameter ; - /**壁厚*/ - @Excel(name = "壁厚", width = 15) - @ApiModelProperty(value="壁厚") - private java.lang.String wallThickness ; - /**焊工*/ - @Excel(name = "焊工", width = 15) - @ApiModelProperty(value="焊工") - private java.lang.String welder ; - /**检查人*/ - @Excel(name = "检查人", width = 15) - @ApiModelProperty(value="检查人") - private java.lang.String inspector ; - /**日期*/ - @Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="日期") - private java.util.Date date ; - /**目测验收结果*/ - @Excel(name = "目测验收结果", width = 15) - @ApiModelProperty(value="目测验收结果") - private java.lang.String visualInspectionAcceptanceResult ; - /**无损验收结果*/ - @Excel(name = "无损验收结果", width = 15) - @ApiModelProperty(value="无损验收结果") - private java.lang.String nonDestructiveInspectionResult ; - /**无损检测结果附件*/ - @Excel(name = "无损检测结果附件", width = 15) - @ApiModelProperty(value="无损检测结果附件") - private java.lang.String nonDestructiveInspectionResultAttachment ; + /**焊口编号*/ + @Excel(name = "焊口编号", width = 15) + @ApiModelProperty(value="焊口编号") + private java.lang.String weldNumber ; /**所属项目SN*/ @Excel(name = "所属项目SN", width = 15) @ApiModelProperty(value="所属项目SN") diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingProcedureQualification.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingProcedureQualification.java new file mode 100644 index 000000000..fa0fc25b1 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingProcedureQualification.java @@ -0,0 +1,112 @@ +package com.zhgd.xmgl.modules.baotou.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 管道焊接工艺评定 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Data +@TableName("pipeline_welding_procedure_qualification") +@ApiModel(value="PipelineWeldingProcedureQualification实体类",description="PipelineWeldingProcedureQualification") +public class PipelineWeldingProcedureQualification implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**装置管理id*/ + @ApiModelProperty(value="装置管理id") + private java.lang.Long deviceUnitId ; + /**项目组id*/ + @ApiModelProperty(value="项目组id") + private java.lang.Long projectGroupId ; + /**监理单位id*/ + @ApiModelProperty(value="监理单位id") + private java.lang.Long supervisingUnitId ; + /**EPC承包商id*/ + @ApiModelProperty(value="EPC承包商id") + private java.lang.Long epcContractorId ; + /**施工单位id*/ + @ApiModelProperty(value="施工单位id") + private java.lang.Long constructionUnitId ; + /**母材*/ + @ApiModelProperty(value="母材") + private java.lang.String parentMaterial ; + /**最大壁厚(mm)*/ + @ApiModelProperty(value="最大壁厚(mm)") + private java.lang.String maximumWallThickness ; + /**最小壁厚(mm)*/ + @ApiModelProperty(value="最小壁厚(mm)") + private java.lang.String minimumWallThickness ; + /**焊接方法*/ + @ApiModelProperty(value="焊接方法") + private java.lang.String weldingMethod ; + /**焊接材料(焊条)*/ + @ApiModelProperty(value="焊接材料(焊条)") + private java.lang.String weldingMaterialRod ; + /**焊接材料(焊丝/焊剂)*/ + @ApiModelProperty(value="焊接材料(焊丝/焊剂)") + private java.lang.String weldingMaterialWireFlux ; + /**焊接位置*/ + @ApiModelProperty(value="焊接位置") + private java.lang.String weldingPosition ; + /**冲击要求*/ + @ApiModelProperty(value="冲击要求") + private java.lang.String impactRequirement ; + /**热处理*/ + @ApiModelProperty(value="热处理") + private java.lang.String heatTreatment ; + /**焊接工艺评定附件*/ + @ApiModelProperty(value="焊接工艺评定附件") + private java.lang.String assessmentAttachment ; + /**焊接技术交底工艺卡附件*/ + @ApiModelProperty(value="焊接技术交底工艺卡附件") + private java.lang.String technologyProcessCardAttachment ; + /**焊接工艺评定附件二维码*/ + @ApiModelProperty(value="焊接工艺评定附件二维码") + private java.lang.String assessmentAttachmentQrCode ; + /**焊接技术交底工艺卡附件二维码*/ + @ApiModelProperty(value="焊接技术交底工艺卡附件二维码") + private java.lang.String technologyProcessCardAttachmentQrCode ; + /**备注*/ + @ApiModelProperty(value="备注") + private java.lang.String remark ; + /**所属项目SN*/ + @ApiModelProperty(value="所属项目SN") + private java.lang.String projectSn ; + /**创建时间*/ + @ApiModelProperty(value="创建时间") + private java.util.Date createDate ; + /**更新时间*/ + @ApiModelProperty(value="更新时间") + private java.util.Date updateDate ; + @TableField(exist = false) + @ApiModelProperty(value="装置管理名称") + private java.lang.String deviceUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="项目组名称") + private java.lang.String projectGroupName ; + @TableField(exist = false) + @ApiModelProperty(value="监理单位名称") + private java.lang.String supervisingUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="EPC承包商名称") + private java.lang.String epcContractorName ; + @TableField(exist = false) + @ApiModelProperty(value="施工单位名称") + private java.lang.String constructionUnitName ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingRecord.java new file mode 100644 index 000000000..577114d11 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/PipelineWeldingRecord.java @@ -0,0 +1,126 @@ +package com.zhgd.xmgl.modules.baotou.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 管道焊接记录 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Data +@TableName("pipeline_welding_record") +@ApiModel(value="PipelineWeldingRecord实体类",description="PipelineWeldingRecord") +public class PipelineWeldingRecord implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**装置管理id*/ + @ApiModelProperty(value="装置管理id") + private java.lang.Long deviceUnitId ; + /**管道基本信息id*/ + @ApiModelProperty(value="管道基本信息id") + private java.lang.Long pipelineInformationId ; + /**项目组id*/ + @ApiModelProperty(value="项目组id") + private java.lang.Long projectGroupId ; + /**监理单位id*/ + @ApiModelProperty(value="监理单位id") + private java.lang.Long supervisingUnitId ; + /**EPC承包商id*/ + @ApiModelProperty(value="EPC承包商id") + private java.lang.Long epcContractorId ; + /**施工单位id*/ + @ApiModelProperty(value="施工单位id") + private java.lang.Long constructionUnitId ; + /**管道的焊口管理id*/ + @ApiModelProperty(value="管道的焊口管理id") + private java.lang.Long pipelineWeldingJointManagementId ; + /**管道焊工id*/ + @ApiModelProperty(value="管道焊工id") + private java.lang.Long pipelineWelderId ; + /**规格*/ + @ApiModelProperty(value="规格") + private java.lang.String specification ; + /**材质*/ + @ApiModelProperty(value="材质") + private java.lang.String material ; + /**焊接位置*/ + @ApiModelProperty(value="焊接位置") + private java.lang.String weldingPosition ; + /**焊接方法*/ + @ApiModelProperty(value="焊接方法") + private java.lang.String weldingMethod ; + /**焊材牌号*/ + @ApiModelProperty(value="焊材牌号") + private java.lang.String weldingMaterialBrand ; + /**实际预热温度*/ + @ApiModelProperty(value="实际预热温度") + private java.lang.String actualPreheatingTemperature ; + /**焊接日期*/ + @ApiModelProperty(value="焊接日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date weldingDate ; + /**焊接表面质量*/ + @ApiModelProperty(value="焊接表面质量") + private java.lang.String weldingSurfaceQuality ; + /**管道内接检查*/ + @ApiModelProperty(value="管道内接检查") + private java.lang.String pipelineInternalConnectionInspection ; + /**无损检测是否合格(-1未知0不合格1合格)*/ + @ApiModelProperty(value="无损检测是否合格(-1未知0不合格1合格)") + private java.lang.Integer testingQualified ; + /**所属项目SN*/ + @ApiModelProperty(value="所属项目SN") + private java.lang.String projectSn ; + /**创建时间*/ + @ApiModelProperty(value="创建时间") + private java.util.Date createDate ; + /**更新时间*/ + @ApiModelProperty(value="更新时间") + private java.util.Date updateDate ; + @TableField(exist = false) + @ApiModelProperty(value="装置管理名称") + private java.lang.String deviceUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="项目组名称") + private java.lang.String projectGroupName ; + @TableField(exist = false) + @ApiModelProperty(value="监理单位名称") + private java.lang.String supervisingUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="EPC承包商名称") + private java.lang.String epcContractorName ; + @TableField(exist = false) + @ApiModelProperty(value="施工单位名称") + private java.lang.String constructionUnitName ; + @TableField(exist = false) + @ApiModelProperty(value="管道名称") + private java.lang.String pipelineName ; + @TableField(exist = false) + @ApiModelProperty(value="管道焊工名称") + private java.lang.String welderName ; + @TableField(exist = false) + @ApiModelProperty(value="焊工代号") + private java.lang.String welderCode ; + @TableField(exist = false) + @ApiModelProperty(value="管道编号/单线号") + private java.lang.String pipelineNumberLineNumber ; + @TableField(exist = false) + @ApiModelProperty(value="焊口编号") + private java.lang.String weldingNumber ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineMaterialInspectionMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineMaterialInspectionMapper.java new file mode 100644 index 000000000..77745b290 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineMaterialInspectionMapper.java @@ -0,0 +1,50 @@ +package com.zhgd.xmgl.modules.baotou.mapper; + +import java.util.List; +import java.util.HashMap; +import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialInspection; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 管道材料报验 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Mapper +public interface PipelineMaterialInspectionMapper extends BaseMapper { + + /** + * 分页列表查询管道材料报验信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询管道材料报验信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + + /** + * 通过id查询管道材料报验信息 + * + * @param id + * @return + */ + PipelineMaterialInspection queryById(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineMaterialManagementMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineMaterialManagementMapper.java deleted file mode 100644 index eb7f002b0..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineMaterialManagementMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zhgd.xmgl.modules.baotou.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialManagement; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 管道的材料管理 - * @author： pds - * @date： 2024-09-03 - * @version： V1.0 - */ -@Mapper -public interface PipelineMaterialManagementMapper extends BaseMapper { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelinePressureTestBagMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelinePressureTestBagMapper.java new file mode 100644 index 000000000..589b9b26c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelinePressureTestBagMapper.java @@ -0,0 +1,50 @@ +package com.zhgd.xmgl.modules.baotou.mapper; + +import java.util.List; +import java.util.HashMap; +import com.zhgd.xmgl.modules.baotou.entity.PipelinePressureTestBag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 管道试压包 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Mapper +public interface PipelinePressureTestBagMapper extends BaseMapper { + + /** + * 分页列表查询管道试压包信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询管道试压包信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + + /** + * 通过id查询管道试压包信息 + * + * @param id + * @return + */ + PipelinePressureTestBag queryById(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWelderMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWelderMapper.java new file mode 100644 index 000000000..835baffd8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWelderMapper.java @@ -0,0 +1,50 @@ +package com.zhgd.xmgl.modules.baotou.mapper; + +import java.util.List; +import java.util.HashMap; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWelder; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 管道焊工 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Mapper +public interface PipelineWelderMapper extends BaseMapper { + + /** + * 分页列表查询管道焊工信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询管道焊工信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + + /** + * 通过id查询管道焊工信息 + * + * @param id + * @return + */ + PipelineWelder queryById(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWeldingProcedureQualificationMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWeldingProcedureQualificationMapper.java new file mode 100644 index 000000000..1125990e4 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWeldingProcedureQualificationMapper.java @@ -0,0 +1,50 @@ +package com.zhgd.xmgl.modules.baotou.mapper; + +import java.util.List; +import java.util.HashMap; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingProcedureQualification; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 管道焊接工艺评定 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Mapper +public interface PipelineWeldingProcedureQualificationMapper extends BaseMapper { + + /** + * 分页列表查询管道焊接工艺评定信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询管道焊接工艺评定信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + + /** + * 通过id查询管道焊接工艺评定信息 + * + * @param id + * @return + */ + PipelineWeldingProcedureQualification queryById(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWeldingRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWeldingRecordMapper.java new file mode 100644 index 000000000..b495b3340 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PipelineWeldingRecordMapper.java @@ -0,0 +1,49 @@ +package com.zhgd.xmgl.modules.baotou.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingRecord; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 管道焊接记录 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Mapper +public interface PipelineWeldingRecordMapper extends BaseMapper { + /** + * 分页列表查询管道焊接记录信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询管道焊接记录信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 通过id查询管道焊接记录信息 + * + * @param id + * @return + */ + PipelineWeldingRecord queryById(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml index 191347fb7..7cd4468ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml @@ -6,10 +6,12 @@ select t.*, group_concat(distinct pg.project_group_name) as project_group_name, group_concat(distinct ei.enterprise_name) as epc_contractor_name, - group_concat(distinct ei3.enterprise_name) as construction_unit_name + group_concat(distinct ei3.enterprise_name) as construction_unit_name, + group_concat(distinct pgu.supervising_unit_id) as supervising_unit_ids from device_unit t join project_group pg on find_in_set(pg.id,t.project_group_ids) + left join project_group_unit pgu on pg.id = pgu.project_group_id left join enterprise_info ei on find_in_set(ei.id,t.epc_contractor_ids) left join enterprise_info ei3 on find_in_set(ei3.id,t.construction_unit_ids) ${ew.customSqlSegment} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineMaterialInspectionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineMaterialInspectionMapper.xml new file mode 100644 index 000000000..bfebc5e54 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineMaterialInspectionMapper.xml @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelinePressureTestBagMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelinePressureTestBagMapper.xml new file mode 100644 index 000000000..252007db0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelinePressureTestBagMapper.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWelderMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWelderMapper.xml new file mode 100644 index 000000000..783523c3a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWelderMapper.xml @@ -0,0 +1,43 @@ + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWeldingProcedureQualificationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWeldingProcedureQualificationMapper.xml new file mode 100644 index 000000000..19e75817b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWeldingProcedureQualificationMapper.xml @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWeldingRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWeldingRecordMapper.xml new file mode 100644 index 000000000..4b074fb35 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PipelineWeldingRecordMapper.xml @@ -0,0 +1,57 @@ + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineMaterialInspectionService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineMaterialInspectionService.java new file mode 100644 index 000000000..67464772e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineMaterialInspectionService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.baotou.service; + +import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialInspection; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 管道材料报验 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +public interface IPipelineMaterialInspectionService extends IService { + /** + * 分页列表查询管道材料报验信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询管道材料报验信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加管道材料报验信息 + * @param pipelineMaterialInspection 管道材料报验 + * @return + */ + void add(PipelineMaterialInspection pipelineMaterialInspection); + /** + * 编辑管道材料报验信息 + * @param pipelineMaterialInspection 管道材料报验 + * @return + */ + void edit(PipelineMaterialInspection pipelineMaterialInspection); + /** + * 根据id删除管道材料报验信息 + * @param id 管道材料报验的id + * @return + */ + void delete(String id); + /** + * 根据id查询管道材料报验信息 + * @param id 管道材料报验的id + * @return + */ + PipelineMaterialInspection queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineMaterialManagementService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineMaterialManagementService.java deleted file mode 100644 index 57bf0c25e..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineMaterialManagementService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.zhgd.xmgl.modules.baotou.service; - -import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialManagement; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.HashMap; -import java.util.List; - -/** - * @Description: 管道的材料管理 - * @author： pds - * @date： 2024-09-03 - * @version： V1.0 - */ -public interface IPipelineMaterialManagementService extends IService { - /** - * 分页列表查询管道的材料管理信息 - * @param param 参数map - * @return - */ - IPage queryPageList(HashMap param); - /** - * 列表查询管道的材料管理信息 - * @param param 参数map - * @return - */ - List queryList(HashMap param); - /** - * 添加管道的材料管理信息 - * @param pipelineMaterialManagement 管道的材料管理 - * @return - */ - void add(PipelineMaterialManagement pipelineMaterialManagement); - /** - * 编辑管道的材料管理信息 - * @param pipelineMaterialManagement 管道的材料管理 - * @return - */ - void edit(PipelineMaterialManagement pipelineMaterialManagement); - /** - * 根据id删除管道的材料管理信息 - * @param id 管道的材料管理的id - * @return - */ - void delete(String id); - /** - * 根据id查询管道的材料管理信息 - * @param id 管道的材料管理的id - * @return - */ - PipelineMaterialManagement queryById(String id); - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelinePressureTestBagService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelinePressureTestBagService.java new file mode 100644 index 000000000..c5e021f0e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelinePressureTestBagService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.baotou.service; + +import com.zhgd.xmgl.modules.baotou.entity.PipelinePressureTestBag; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 管道试压包 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +public interface IPipelinePressureTestBagService extends IService { + /** + * 分页列表查询管道试压包信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询管道试压包信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加管道试压包信息 + * @param pipelinePressureTestBag 管道试压包 + * @return + */ + void add(PipelinePressureTestBag pipelinePressureTestBag); + /** + * 编辑管道试压包信息 + * @param pipelinePressureTestBag 管道试压包 + * @return + */ + void edit(PipelinePressureTestBag pipelinePressureTestBag); + /** + * 根据id删除管道试压包信息 + * @param id 管道试压包的id + * @return + */ + void delete(String id); + /** + * 根据id查询管道试压包信息 + * @param id 管道试压包的id + * @return + */ + PipelinePressureTestBag queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWelderService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWelderService.java new file mode 100644 index 000000000..8dc175455 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWelderService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.baotou.service; + +import com.zhgd.xmgl.modules.baotou.entity.PipelineWelder; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 管道焊工 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +public interface IPipelineWelderService extends IService { + /** + * 分页列表查询管道焊工信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询管道焊工信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加管道焊工信息 + * @param pipelineWelder 管道焊工 + * @return + */ + void add(PipelineWelder pipelineWelder); + /** + * 编辑管道焊工信息 + * @param pipelineWelder 管道焊工 + * @return + */ + void edit(PipelineWelder pipelineWelder); + /** + * 根据id删除管道焊工信息 + * @param id 管道焊工的id + * @return + */ + void delete(String id); + /** + * 根据id查询管道焊工信息 + * @param id 管道焊工的id + * @return + */ + PipelineWelder queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWeldingProcedureQualificationService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWeldingProcedureQualificationService.java new file mode 100644 index 000000000..3c9484e5e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWeldingProcedureQualificationService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.baotou.service; + +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingProcedureQualification; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 管道焊接工艺评定 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +public interface IPipelineWeldingProcedureQualificationService extends IService { + /** + * 分页列表查询管道焊接工艺评定信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询管道焊接工艺评定信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加管道焊接工艺评定信息 + * @param pipelineWeldingProcedureQualification 管道焊接工艺评定 + * @return + */ + void add(PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification); + /** + * 编辑管道焊接工艺评定信息 + * @param pipelineWeldingProcedureQualification 管道焊接工艺评定 + * @return + */ + void edit(PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification); + /** + * 根据id删除管道焊接工艺评定信息 + * @param id 管道焊接工艺评定的id + * @return + */ + void delete(String id); + /** + * 根据id查询管道焊接工艺评定信息 + * @param id 管道焊接工艺评定的id + * @return + */ + PipelineWeldingProcedureQualification queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWeldingRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWeldingRecordService.java new file mode 100644 index 000000000..134ab0364 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPipelineWeldingRecordService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.baotou.service; + +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingRecord; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 管道焊接记录 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +public interface IPipelineWeldingRecordService extends IService { + /** + * 分页列表查询管道焊接记录信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询管道焊接记录信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加管道焊接记录信息 + * @param pipelineWeldingRecord 管道焊接记录 + * @return + */ + void add(PipelineWeldingRecord pipelineWeldingRecord); + /** + * 编辑管道焊接记录信息 + * @param pipelineWeldingRecord 管道焊接记录 + * @return + */ + void edit(PipelineWeldingRecord pipelineWeldingRecord); + /** + * 根据id删除管道焊接记录信息 + * @param id 管道焊接记录的id + * @return + */ + void delete(String id); + /** + * 根据id查询管道焊接记录信息 + * @param id 管道焊接记录的id + * @return + */ + PipelineWeldingRecord queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineInformationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineInformationServiceImpl.java index 5562aa28e..569c83cc3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineInformationServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineInformationServiceImpl.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.baotou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.baotou.entity.PipelineInformation; -import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialManagement; import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingJointManagement; import com.zhgd.xmgl.modules.baotou.mapper.PipelineInformationMapper; import com.zhgd.xmgl.modules.baotou.service.IPipelineInformationService; @@ -18,7 +17,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.HashMap; import java.util.List; import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; import org.springframework.beans.factory.annotation.Autowired; /** @@ -33,9 +31,6 @@ public class PipelineInformationServiceImpl extends ServiceImpl queryPageList(HashMap param) { @@ -85,7 +80,6 @@ public class PipelineInformationServiceImpl extends ServiceImpl().eq(PipelineMaterialManagement::getPipelineInformationId, id)); pipelineWeldingJointManagementService.remove(new LambdaQueryWrapper().eq(PipelineWeldingJointManagement::getPipelineInformationId, id)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineMaterialInspectionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineMaterialInspectionServiceImpl.java new file mode 100644 index 000000000..3c20fd2d5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineMaterialInspectionServiceImpl.java @@ -0,0 +1,88 @@ +package com.zhgd.xmgl.modules.baotou.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialInspection; +import com.zhgd.xmgl.modules.baotou.mapper.PipelineMaterialInspectionMapper; +import com.zhgd.xmgl.modules.baotou.service.IPipelineMaterialInspectionService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 管道材料报验 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Service +public class PipelineMaterialInspectionServiceImpl extends ServiceImpl implements IPipelineMaterialInspectionService { + @Autowired + private PipelineMaterialInspectionMapper pipelineMaterialInspectionMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineMaterialInspection.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineMaterialInspection::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(PipelineMaterialInspection pipelineMaterialInspection) { + pipelineMaterialInspection.setId(null); + baseMapper.insert(pipelineMaterialInspection); + } + + @Override + public void edit(PipelineMaterialInspection pipelineMaterialInspection) { + PipelineMaterialInspection oldPipelineMaterialInspection = baseMapper.selectById(pipelineMaterialInspection.getId()); + if(oldPipelineMaterialInspection==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(pipelineMaterialInspection); + } + + @Override + public void delete(String id) { + PipelineMaterialInspection pipelineMaterialInspection = baseMapper.selectById(id); + if(pipelineMaterialInspection==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public PipelineMaterialInspection queryById(String id) { + PipelineMaterialInspection entity = baseMapper.queryById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineMaterialManagementServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineMaterialManagementServiceImpl.java deleted file mode 100644 index d381ed0f3..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineMaterialManagementServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.zhgd.xmgl.modules.baotou.service.impl; - -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialManagement; -import com.zhgd.xmgl.modules.baotou.mapper.PipelineMaterialManagementMapper; -import com.zhgd.xmgl.modules.baotou.service.IPipelineMaterialManagementService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.util.HashMap; -import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 管道的材料管理 - * @author： pds - * @date： 2024-09-03 - * @version： V1.0 - */ -@Service -public class PipelineMaterialManagementServiceImpl extends ServiceImpl implements IPipelineMaterialManagementService { - @Autowired - private PipelineMaterialManagementMapper pipelineMaterialManagementMapper; - @Override - public IPage queryPageList(HashMap param) { - QueryWrapper queryWrapper = this.getQueryWrapper(param); - Page page = PageUtil.getPage(param); - IPage pageList = this.page(page, queryWrapper); - pageList.setRecords(this.dealList(pageList.getRecords())); - return pageList; - } - - @Override - public List queryList(HashMap param) { - QueryWrapper queryWrapper = getQueryWrapper(param); - return dealList(this.list(queryWrapper)); - } - - private QueryWrapper getQueryWrapper(HashMap param) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineMaterialManagement.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineMaterialManagement::getId)); - return queryWrapper; - } - - private List dealList(List list) { - return list; - } - - @Override - public void add(PipelineMaterialManagement pipelineMaterialManagement) { - pipelineMaterialManagement.setId(null); - baseMapper.insert(pipelineMaterialManagement); - } - - @Override - public void edit(PipelineMaterialManagement pipelineMaterialManagement) { - PipelineMaterialManagement oldPipelineMaterialManagement = baseMapper.selectById(pipelineMaterialManagement.getId()); - if(oldPipelineMaterialManagement==null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.updateById(pipelineMaterialManagement); - } - - @Override - public void delete(String id) { - PipelineMaterialManagement pipelineMaterialManagement = baseMapper.selectById(id); - if(pipelineMaterialManagement==null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.deleteById(id); - } - - @Override - public PipelineMaterialManagement queryById(String id) { - PipelineMaterialManagement entity = getById(id); - if (entity == null) { - throw new OpenAlertException("未找到对应实体"); - } - return entity; - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelinePressureTestBagServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelinePressureTestBagServiceImpl.java new file mode 100644 index 000000000..cef6c0339 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelinePressureTestBagServiceImpl.java @@ -0,0 +1,88 @@ +package com.zhgd.xmgl.modules.baotou.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.baotou.entity.PipelinePressureTestBag; +import com.zhgd.xmgl.modules.baotou.mapper.PipelinePressureTestBagMapper; +import com.zhgd.xmgl.modules.baotou.service.IPipelinePressureTestBagService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 管道试压包 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Service +public class PipelinePressureTestBagServiceImpl extends ServiceImpl implements IPipelinePressureTestBagService { + @Autowired + private PipelinePressureTestBagMapper pipelinePressureTestBagMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelinePressureTestBag.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelinePressureTestBag::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(PipelinePressureTestBag pipelinePressureTestBag) { + pipelinePressureTestBag.setId(null); + baseMapper.insert(pipelinePressureTestBag); + } + + @Override + public void edit(PipelinePressureTestBag pipelinePressureTestBag) { + PipelinePressureTestBag oldPipelinePressureTestBag = baseMapper.selectById(pipelinePressureTestBag.getId()); + if(oldPipelinePressureTestBag==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(pipelinePressureTestBag); + } + + @Override + public void delete(String id) { + PipelinePressureTestBag pipelinePressureTestBag = baseMapper.selectById(id); + if(pipelinePressureTestBag==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public PipelinePressureTestBag queryById(String id) { + PipelinePressureTestBag entity = baseMapper.queryById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWelderServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWelderServiceImpl.java new file mode 100644 index 000000000..d16f7bcbf --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWelderServiceImpl.java @@ -0,0 +1,88 @@ +package com.zhgd.xmgl.modules.baotou.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWelder; +import com.zhgd.xmgl.modules.baotou.mapper.PipelineWelderMapper; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWelderService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 管道焊工 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Service +public class PipelineWelderServiceImpl extends ServiceImpl implements IPipelineWelderService { + @Autowired + private PipelineWelderMapper pipelineWelderMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineWelder.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineWelder::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(PipelineWelder pipelineWelder) { + pipelineWelder.setId(null); + baseMapper.insert(pipelineWelder); + } + + @Override + public void edit(PipelineWelder pipelineWelder) { + PipelineWelder oldPipelineWelder = baseMapper.selectById(pipelineWelder.getId()); + if(oldPipelineWelder==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(pipelineWelder); + } + + @Override + public void delete(String id) { + PipelineWelder pipelineWelder = baseMapper.selectById(id); + if(pipelineWelder==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public PipelineWelder queryById(String id) { + PipelineWelder entity = baseMapper.queryById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingProcedureQualificationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingProcedureQualificationServiceImpl.java new file mode 100644 index 000000000..c90832b1d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingProcedureQualificationServiceImpl.java @@ -0,0 +1,88 @@ +package com.zhgd.xmgl.modules.baotou.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingProcedureQualification; +import com.zhgd.xmgl.modules.baotou.mapper.PipelineWeldingProcedureQualificationMapper; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingProcedureQualificationService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 管道焊接工艺评定 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Service +public class PipelineWeldingProcedureQualificationServiceImpl extends ServiceImpl implements IPipelineWeldingProcedureQualificationService { + @Autowired + private PipelineWeldingProcedureQualificationMapper pipelineWeldingProcedureQualificationMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineWeldingProcedureQualification.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineWeldingProcedureQualification::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification) { + pipelineWeldingProcedureQualification.setId(null); + baseMapper.insert(pipelineWeldingProcedureQualification); + } + + @Override + public void edit(PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification) { + PipelineWeldingProcedureQualification oldPipelineWeldingProcedureQualification = baseMapper.selectById(pipelineWeldingProcedureQualification.getId()); + if(oldPipelineWeldingProcedureQualification==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(pipelineWeldingProcedureQualification); + } + + @Override + public void delete(String id) { + PipelineWeldingProcedureQualification pipelineWeldingProcedureQualification = baseMapper.selectById(id); + if(pipelineWeldingProcedureQualification==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public PipelineWeldingProcedureQualification queryById(String id) { + PipelineWeldingProcedureQualification entity = baseMapper.queryById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java new file mode 100644 index 000000000..e5c6dec71 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java @@ -0,0 +1,88 @@ +package com.zhgd.xmgl.modules.baotou.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingRecord; +import com.zhgd.xmgl.modules.baotou.mapper.PipelineWeldingRecordMapper; +import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingRecordService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 管道焊接记录 + * @author： pds + * @date： 2024-09-20 + * @version： V1.0 + */ +@Service +public class PipelineWeldingRecordServiceImpl extends ServiceImpl implements IPipelineWeldingRecordService { + @Autowired + private PipelineWeldingRecordMapper pipelineWeldingRecordMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineWeldingRecord.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineWeldingRecord::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(PipelineWeldingRecord pipelineWeldingRecord) { + pipelineWeldingRecord.setId(null); + baseMapper.insert(pipelineWeldingRecord); + } + + @Override + public void edit(PipelineWeldingRecord pipelineWeldingRecord) { + PipelineWeldingRecord oldPipelineWeldingRecord = baseMapper.selectById(pipelineWeldingRecord.getId()); + if(oldPipelineWeldingRecord==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(pipelineWeldingRecord); + } + + @Override + public void delete(String id) { + PipelineWeldingRecord pipelineWeldingRecord = baseMapper.selectById(id); + if(pipelineWeldingRecord==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public PipelineWeldingRecord queryById(String id) { + PipelineWeldingRecord entity = baseMapper.queryById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java index 564b53eb6..8bda2e5ea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java @@ -108,25 +108,25 @@ public class DangerousEngineeringRecord implements Serializable { @Excel(name = "技术交底文件", width = 15) @ApiModelProperty(value="技术交底文件") private java.lang.String technicalDisclosureFile ; - /**是否完成安全专项施工方案交底，1未完成，2完成*/ - @Excel(name = "是否完成安全专项施工方案交底，1未完成，2完成", width = 15) - @ApiModelProperty(value="是否完成安全专项施工方案交底，1未完成，2完成") + /**是否完成方案，1未完成，2完成*/ + @Excel(name = "是否完成方案，1未完成，2完成", width = 15) + @ApiModelProperty(value="是否完成方案，1未完成，2完成") private java.lang.Integer securityConstructionSchemeType ; - /**安全专项施工方案附件*/ - @Excel(name = "安全专项施工方案附件", width = 15) - @ApiModelProperty(value = "安全专项施工方案附件") + /**方案附件*/ + @Excel(name = "方案附件", width = 15) + @ApiModelProperty(value = "方案附件") private java.lang.String securityConstructionSchemeFile; /** - * 是否完成专项施工方案交底，1未完成，2完成 + * 是否完成方案交底，1未完成，2完成 */ - @Excel(name = "是否完成专项施工方案交底，1未完成，2完成", width = 15) - @ApiModelProperty(value = "是否完成专项施工方案交底，1未完成，2完成") + @Excel(name = "是否完成方案交底，1未完成，2完成", width = 15) + @ApiModelProperty(value = "是否完成方案交底，1未完成，2完成") private java.lang.Integer specialConstructionSchemeType; /** - * 专项施工方案附件 + * 方案交底附件 */ - @Excel(name = "专项施工方案附件", width = 15) - @ApiModelProperty(value = "专项施工方案附件") + @Excel(name = "方案交底附件", width = 15) + @ApiModelProperty(value = "方案交底附件") private java.lang.String specialConstructionSchemeFile; @ApiModelProperty(value = "责任人id") private java.lang.Long personLiableId; @@ -134,9 +134,12 @@ public class DangerousEngineeringRecord implements Serializable { private java.lang.Integer isEnd; @ApiModelProperty(value = "分包单位id") private java.lang.Long responsibilityCompanyId; - + @ApiModelProperty(value = "施工状态：1未开始、2进行中、3已完成") + private java.lang.Integer constructionState; @ApiModelProperty(value = "最终验收状态1进行中2已闭合") private Integer finalAcceptanceStatus; + @ApiModelProperty(value = "监控点编号（多个,分割）") + private String videoItemIds; @TableField(exist = false) @ApiModelProperty(value = "类别描述列表") diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java index f3449bd58..497e8dbc0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java @@ -19,7 +19,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper -@DataScope(includeTable = "dangerous_engineering_record") +//@DataScope(includeTable = "dangerous_engineering_record") public interface DangerousEngineeringRecordMapper extends BaseMapper { /** * 分页列表查询现场危大工程信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java index 6c7793f52..20bac5721 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java @@ -140,6 +140,7 @@ public class VideoItemController { @ApiOperation(value = "根据项目sn查询启用的的视频列表", notes = "根据项目sn查询启用的的视频列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "itemIds", value = "视频ids(多个,分割)", paramType = "body", required = true, dataType = "String"), }) @PostMapping("/selectEnableVideoItemList") public Result> selectEnableVideoItemList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml index f1edc2970..15e8adae4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml @@ -32,6 +32,9 @@ #{item} + + and find_in_set(vi.item_id,#{itemIds}) + group by vi.item_id order by vi.sort_num diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 563a27cc6..4143438fd 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -80,6 +80,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() //请求路径允许访问 + .antMatchers("/xmgl/pipelineMaterialInspection/flow/add").permitAll() + .antMatchers("/xmgl/pipelinePressureTestBag/flow/add").permitAll() + .antMatchers("/xmgl/pipelineWeldingProcedureQualification/flow/add").permitAll() + .antMatchers("/xmgl/pipelineWeldingRecord/flow/add").permitAll() .antMatchers("/exam/paper/queryById").permitAll() .antMatchers("/xmgl/workerAdmission/flow/add").permitAll() .antMatchers("/xmgl/videoItem/camera/search").permitAll() diff --git a/src/main/java/com/zhgd/xmgl/util/FlowUtil.java b/src/main/java/com/zhgd/xmgl/util/FlowUtil.java index 6267f077c..319220a30 100644 --- a/src/main/java/com/zhgd/xmgl/util/FlowUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/FlowUtil.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -58,6 +59,10 @@ public class FlowUtil { return Optional.ofNullable(map.get(key)).map(o -> "".equals(o) ? null : Convert.toLong(((List) o).get(0))).orElse(null); } + public static String getPullDownManyStr(Map map, String key) { + return Optional.ofNullable(map.get(key)).map(o -> "".equals(o) ? null : StrUtil.join(",", o)).orElse(null); + } + public static Date getDate(Map map, String key) { return Optional.ofNullable(map.get(key)).map(o -> "".equals(o) ? null : DateUtil.parse(o.toString())).orElse(null); } diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index d98736e3d..dd39a4948 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="${entityName}实体类",description="${entityName}") public class ${entityName} implements Serializable { private static final long serialVersionUID = 1L; - + <#list originalColumns as po> /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> @@ -30,16 +30,13 @@ public class ${entityName} implements Serializable { <#else> <#if po.fieldType =='java.util.Date'> <#if po.fieldDbType =='date'> - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") <#else> - @Excel(name = "${po.filedComment}", width = 15) @ApiModelProperty(value="${po.filedComment}") diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai index a61f9fc39..4de654f8c 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai @@ -1,10 +1,14 @@ package ${bussiPackage}.${entityPackage}.mapper; import java.util.List; - +import java.util.HashMap; +import ${bussiPackage}.${entityPackage}.entity.${entityName}; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${bussiPackage}.${entityPackage}.entity.${entityName}; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -16,4 +20,31 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface ${entityName}Mapper extends BaseMapper<${entityName}> { + /** + * 分页列表查询${tableVo.ftlDescription}信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage<${entityName}> queryList(Page<${entityName}> page, @Param(Constants.WRAPPER) QueryWrapper<${entityName}> queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询${tableVo.ftlDescription}信息 + * + * @param queryWrapper + * @param param + * @return + */ + List<${entityName}> queryList(@Param(Constants.WRAPPER) QueryWrapper<${entityName}> queryWrapper, @Param("param") HashMap param); + + + /** + * 通过id查询${tableVo.ftlDescription}信息 + * + * @param id + * @return + */ + ${entityName} queryById(String id); } diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml index 16f3d653a..7749b64f5 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml @@ -2,4 +2,18 @@ - \ No newline at end of file + + + diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 64f0ec45f..dfe065e0a 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -31,7 +31,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ public IPage<${entityName}> queryPageList(HashMap param) { QueryWrapper<${entityName}> queryWrapper = this.getQueryWrapper(param); Page<${entityName}> page = PageUtil.getPage(param); - IPage<${entityName}> pageList = this.page(page, queryWrapper); + IPage<${entityName}> pageList = baseMapper.queryList(page, queryWrapper,param); pageList.setRecords(this.dealList(pageList.getRecords())); return pageList; } @@ -39,7 +39,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Override public List<${entityName}> queryList(HashMap param) { QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(param); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper,param)); } private QueryWrapper<${entityName}> getQueryWrapper(HashMap param) { @@ -78,7 +78,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Override public ${entityName} queryById(String id) { - ${entityName} entity = getById(id); + ${entityName} entity = baseMapper.queryById(id); if (entity == null) { throw new OpenAlertException("未找到对应实体"); }