diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java new file mode 100644 index 0000000..3c1d0f6 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -0,0 +1,109 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author cz + */ +@RestController +@Slf4j +@RequiredArgsConstructor +@RequestMapping("/pipeline") +public class BusPipelineController extends ExportController { + + private final IBusPipelineService busPipelineService; + + @RequestMapping("/listPage") + public Object listPage(String keywords, String pipelineType, String deptid, String bfzt) { + + return null; + } + + @RequestMapping("/add") + public Object add(@RequestBody BusPipeline busPipeline) { + try { + busPipelineService.save(busPipeline); + } catch (RuntimeException rex) { + ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); + String errorMsg = "管线添加失败"; + if (rex instanceof DuplicateKeyException) { + errorMsg = "管线编号重复"; + } else if (rex instanceof ServiceException) { + ServiceException gunException = (ServiceException) rex; + errorMsg = gunException.getMessage(); + } + log.error("管线添加失败", rex); + gunsException.setErrorMessage(errorMsg); + throw gunsException; + } + return null; + } + + @RequestMapping("/delete") + @BussinessLog(value = "删除管线信息") + public Object delete(@RequestParam List ids) { + List notDelIds = busPipelineService.deleteBatchByIds(ids); + if(notDelIds.size() > 0){ + String message = ""; + for(Long notDelId : notDelIds){ + BusWellInfo busWellInfo = busWellInfoService.getById(notDelId); + message += busWellInfo.getWellCode() + ","; + } + return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！"); + } + return ResponseData.success(); + } + + @RequestMapping(value = "/detail/{pipelineId}") + public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { + + return null; + } + + @RequestMapping("/update") + public Object update() { + return null; + } + + /** + * 管线的批量导入 + * + * @return + */ + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) + public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { + + + return null; + } + + /** + * 管线的批量导出 + * + * @return + */ + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + + return; + } + + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java new file mode 100644 index 0000000..3c1d0f6 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -0,0 +1,109 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author cz + */ +@RestController +@Slf4j +@RequiredArgsConstructor +@RequestMapping("/pipeline") +public class BusPipelineController extends ExportController { + + private final IBusPipelineService busPipelineService; + + @RequestMapping("/listPage") + public Object listPage(String keywords, String pipelineType, String deptid, String bfzt) { + + return null; + } + + @RequestMapping("/add") + public Object add(@RequestBody BusPipeline busPipeline) { + try { + busPipelineService.save(busPipeline); + } catch (RuntimeException rex) { + ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); + String errorMsg = "管线添加失败"; + if (rex instanceof DuplicateKeyException) { + errorMsg = "管线编号重复"; + } else if (rex instanceof ServiceException) { + ServiceException gunException = (ServiceException) rex; + errorMsg = gunException.getMessage(); + } + log.error("管线添加失败", rex); + gunsException.setErrorMessage(errorMsg); + throw gunsException; + } + return null; + } + + @RequestMapping("/delete") + @BussinessLog(value = "删除管线信息") + public Object delete(@RequestParam List ids) { + List notDelIds = busPipelineService.deleteBatchByIds(ids); + if(notDelIds.size() > 0){ + String message = ""; + for(Long notDelId : notDelIds){ + BusWellInfo busWellInfo = busWellInfoService.getById(notDelId); + message += busWellInfo.getWellCode() + ","; + } + return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！"); + } + return ResponseData.success(); + } + + @RequestMapping(value = "/detail/{pipelineId}") + public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { + + return null; + } + + @RequestMapping("/update") + public Object update() { + return null; + } + + /** + * 管线的批量导入 + * + * @return + */ + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) + public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { + + + return null; + } + + /** + * 管线的批量导出 + * + * @return + */ + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + + return; + } + + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 592aa26..eca6b80 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -121,7 +121,6 @@ // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ // busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString()); // } - busWellInfoService.save(busWellInfo); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); @@ -264,9 +263,7 @@ try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusWellInfo.class,file,null,null); - List list = busWellInfoService.addWellBatch(results); - if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java new file mode 100644 index 0000000..3c1d0f6 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -0,0 +1,109 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author cz + */ +@RestController +@Slf4j +@RequiredArgsConstructor +@RequestMapping("/pipeline") +public class BusPipelineController extends ExportController { + + private final IBusPipelineService busPipelineService; + + @RequestMapping("/listPage") + public Object listPage(String keywords, String pipelineType, String deptid, String bfzt) { + + return null; + } + + @RequestMapping("/add") + public Object add(@RequestBody BusPipeline busPipeline) { + try { + busPipelineService.save(busPipeline); + } catch (RuntimeException rex) { + ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); + String errorMsg = "管线添加失败"; + if (rex instanceof DuplicateKeyException) { + errorMsg = "管线编号重复"; + } else if (rex instanceof ServiceException) { + ServiceException gunException = (ServiceException) rex; + errorMsg = gunException.getMessage(); + } + log.error("管线添加失败", rex); + gunsException.setErrorMessage(errorMsg); + throw gunsException; + } + return null; + } + + @RequestMapping("/delete") + @BussinessLog(value = "删除管线信息") + public Object delete(@RequestParam List ids) { + List notDelIds = busPipelineService.deleteBatchByIds(ids); + if(notDelIds.size() > 0){ + String message = ""; + for(Long notDelId : notDelIds){ + BusWellInfo busWellInfo = busWellInfoService.getById(notDelId); + message += busWellInfo.getWellCode() + ","; + } + return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！"); + } + return ResponseData.success(); + } + + @RequestMapping(value = "/detail/{pipelineId}") + public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { + + return null; + } + + @RequestMapping("/update") + public Object update() { + return null; + } + + /** + * 管线的批量导入 + * + * @return + */ + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) + public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { + + + return null; + } + + /** + * 管线的批量导出 + * + * @return + */ + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + + return; + } + + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 592aa26..eca6b80 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -121,7 +121,6 @@ // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ // busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString()); // } - busWellInfoService.save(busWellInfo); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); @@ -264,9 +263,7 @@ try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusWellInfo.class,file,null,null); - List list = busWellInfoService.addWellBatch(results); - if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java new file mode 100644 index 0000000..50ec951 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusPipeline; +import org.apache.ibatis.annotations.Param; + +/** + * @author cz + */ +public interface BusPipelineMapper extends BaseMapper { + + int deletePipelineLine(@Param("id") Long id); + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java new file mode 100644 index 0000000..3c1d0f6 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -0,0 +1,109 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author cz + */ +@RestController +@Slf4j +@RequiredArgsConstructor +@RequestMapping("/pipeline") +public class BusPipelineController extends ExportController { + + private final IBusPipelineService busPipelineService; + + @RequestMapping("/listPage") + public Object listPage(String keywords, String pipelineType, String deptid, String bfzt) { + + return null; + } + + @RequestMapping("/add") + public Object add(@RequestBody BusPipeline busPipeline) { + try { + busPipelineService.save(busPipeline); + } catch (RuntimeException rex) { + ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); + String errorMsg = "管线添加失败"; + if (rex instanceof DuplicateKeyException) { + errorMsg = "管线编号重复"; + } else if (rex instanceof ServiceException) { + ServiceException gunException = (ServiceException) rex; + errorMsg = gunException.getMessage(); + } + log.error("管线添加失败", rex); + gunsException.setErrorMessage(errorMsg); + throw gunsException; + } + return null; + } + + @RequestMapping("/delete") + @BussinessLog(value = "删除管线信息") + public Object delete(@RequestParam List ids) { + List notDelIds = busPipelineService.deleteBatchByIds(ids); + if(notDelIds.size() > 0){ + String message = ""; + for(Long notDelId : notDelIds){ + BusWellInfo busWellInfo = busWellInfoService.getById(notDelId); + message += busWellInfo.getWellCode() + ","; + } + return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！"); + } + return ResponseData.success(); + } + + @RequestMapping(value = "/detail/{pipelineId}") + public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { + + return null; + } + + @RequestMapping("/update") + public Object update() { + return null; + } + + /** + * 管线的批量导入 + * + * @return + */ + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) + public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { + + + return null; + } + + /** + * 管线的批量导出 + * + * @return + */ + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + + return; + } + + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 592aa26..eca6b80 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -121,7 +121,6 @@ // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ // busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString()); // } - busWellInfoService.save(busWellInfo); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); @@ -264,9 +263,7 @@ try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusWellInfo.class,file,null,null); - List list = busWellInfoService.addWellBatch(results); - if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java new file mode 100644 index 0000000..50ec951 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusPipeline; +import org.apache.ibatis.annotations.Param; + +/** + * @author cz + */ +public interface BusPipelineMapper extends BaseMapper { + + int deletePipelineLine(@Param("id") Long id); + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml new file mode 100644 index 0000000..a37fe05 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml @@ -0,0 +1,12 @@ + + + + + + update valid=0 + FROM bus_well_info + WHERE id=#{id} + + + + diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java new file mode 100644 index 0000000..3c1d0f6 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -0,0 +1,109 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author cz + */ +@RestController +@Slf4j +@RequiredArgsConstructor +@RequestMapping("/pipeline") +public class BusPipelineController extends ExportController { + + private final IBusPipelineService busPipelineService; + + @RequestMapping("/listPage") + public Object listPage(String keywords, String pipelineType, String deptid, String bfzt) { + + return null; + } + + @RequestMapping("/add") + public Object add(@RequestBody BusPipeline busPipeline) { + try { + busPipelineService.save(busPipeline); + } catch (RuntimeException rex) { + ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); + String errorMsg = "管线添加失败"; + if (rex instanceof DuplicateKeyException) { + errorMsg = "管线编号重复"; + } else if (rex instanceof ServiceException) { + ServiceException gunException = (ServiceException) rex; + errorMsg = gunException.getMessage(); + } + log.error("管线添加失败", rex); + gunsException.setErrorMessage(errorMsg); + throw gunsException; + } + return null; + } + + @RequestMapping("/delete") + @BussinessLog(value = "删除管线信息") + public Object delete(@RequestParam List ids) { + List notDelIds = busPipelineService.deleteBatchByIds(ids); + if(notDelIds.size() > 0){ + String message = ""; + for(Long notDelId : notDelIds){ + BusWellInfo busWellInfo = busWellInfoService.getById(notDelId); + message += busWellInfo.getWellCode() + ","; + } + return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！"); + } + return ResponseData.success(); + } + + @RequestMapping(value = "/detail/{pipelineId}") + public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { + + return null; + } + + @RequestMapping("/update") + public Object update() { + return null; + } + + /** + * 管线的批量导入 + * + * @return + */ + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) + public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { + + + return null; + } + + /** + * 管线的批量导出 + * + * @return + */ + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + + return; + } + + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 592aa26..eca6b80 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -121,7 +121,6 @@ // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ // busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString()); // } - busWellInfoService.save(busWellInfo); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); @@ -264,9 +263,7 @@ try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusWellInfo.class,file,null,null); - List list = busWellInfoService.addWellBatch(results); - if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java new file mode 100644 index 0000000..50ec951 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusPipeline; +import org.apache.ibatis.annotations.Param; + +/** + * @author cz + */ +public interface BusPipelineMapper extends BaseMapper { + + int deletePipelineLine(@Param("id") Long id); + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml new file mode 100644 index 0000000..a37fe05 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml @@ -0,0 +1,12 @@ + + + + + + update valid=0 + FROM bus_well_info + WHERE id=#{id} + + + + diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java new file mode 100644 index 0000000..164ebda --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.BusPipeline; + +import java.util.List; + +/** + * @author cz + */ +public interface IBusPipelineService extends IService { + + Boolean deleteBatchByIds(List ids); + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java new file mode 100644 index 0000000..617ea97 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -0,0 +1,135 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +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 java.util.Date; + +/** + * @author cz + */ +@Data +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@TableName("bus_pipeline") +public class BusPipeline{ + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 管线编号 + */ + @ExcelProperty("管线编号") + private String pipelineCode; + + /** + * 管线类型(下拉框） + */ + private String pipelineType; + + @ExcelProperty("管线类型") + @TableField(exist = false) + private String pipelineTypeName; + + /*** + * 管径(mm) + */ + @ExcelProperty("管径(mm)") + private String pipeDiameter; + /** + * 材质 + */ + @ExcelProperty("材质") + private String material; + + /** + * 埋设方式 + */ + @ExcelProperty("埋设方式") + private String buryMode; + /** + * 管线位置 + */ + @ExcelProperty("管线位置") + private String pipelinePosition; + /** + * 建设年代 + */ + @ExcelProperty("建设年代") + private String constructEra; + + /** + * 权属单位(下拉框) + */ + private Long deptid; + + /** + * 起始地面高(mm) + */ + @ExcelProperty("起始地面高(mm)") + private Float startGroundHeight; + + /** + * 起始埋深(m) + */ + @ExcelProperty("起始埋深(m)") + private Float startBuryDeep; + + /** + * 起始管顶高(mm) + */ + @ExcelProperty("起始管顶高(mm)") + private Float startPipecrownHeight; + /** + * 终止地面高(mm) + */ + @ExcelProperty("终止地面高(mm)") + private Float endGroundHeight; + + /** + * 终止埋深(m) + */ + @ExcelProperty("终止埋深(m)") + private Float endBuryDeep; + + /** + * 终止管顶高(mm) + */ + @ExcelProperty("终止管顶高(mm)") + private Float endPipecrownHeight; + + /** + * 设计压力(MPa) + */ + @ExcelProperty("设计压力(MPa)") + private String designPressure; + + /** + * 瞬时流量(m³) + */ + @ExcelProperty("瞬时流量(m³)") + private Float instantaneousFlow; + + /* + * 时间戳 + */ + @ExcelProperty("时间") + @TableField("TS") + private Date ts; + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java new file mode 100644 index 0000000..3c1d0f6 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -0,0 +1,109 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * @author cz + */ +@RestController +@Slf4j +@RequiredArgsConstructor +@RequestMapping("/pipeline") +public class BusPipelineController extends ExportController { + + private final IBusPipelineService busPipelineService; + + @RequestMapping("/listPage") + public Object listPage(String keywords, String pipelineType, String deptid, String bfzt) { + + return null; + } + + @RequestMapping("/add") + public Object add(@RequestBody BusPipeline busPipeline) { + try { + busPipelineService.save(busPipeline); + } catch (RuntimeException rex) { + ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); + String errorMsg = "管线添加失败"; + if (rex instanceof DuplicateKeyException) { + errorMsg = "管线编号重复"; + } else if (rex instanceof ServiceException) { + ServiceException gunException = (ServiceException) rex; + errorMsg = gunException.getMessage(); + } + log.error("管线添加失败", rex); + gunsException.setErrorMessage(errorMsg); + throw gunsException; + } + return null; + } + + @RequestMapping("/delete") + @BussinessLog(value = "删除管线信息") + public Object delete(@RequestParam List ids) { + List notDelIds = busPipelineService.deleteBatchByIds(ids); + if(notDelIds.size() > 0){ + String message = ""; + for(Long notDelId : notDelIds){ + BusWellInfo busWellInfo = busWellInfoService.getById(notDelId); + message += busWellInfo.getWellCode() + ","; + } + return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！"); + } + return ResponseData.success(); + } + + @RequestMapping(value = "/detail/{pipelineId}") + public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { + + return null; + } + + @RequestMapping("/update") + public Object update() { + return null; + } + + /** + * 管线的批量导入 + * + * @return + */ + @RequestMapping(value = "/batchImport", method = RequestMethod.POST) + public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { + + + return null; + } + + /** + * 管线的批量导出 + * + * @return + */ + @RequestMapping(value = "/batchExport", method = RequestMethod.GET) + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + + return; + } + + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 592aa26..eca6b80 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -121,7 +121,6 @@ // if(ToolUtil.isNotEmpty(deptTopRoleUsers)){ // busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString()); // } - busWellInfoService.save(busWellInfo); } catch (Exception e) { ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL); @@ -264,9 +263,7 @@ try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusWellInfo.class,file,null,null); - List list = busWellInfoService.addWellBatch(results); - if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java new file mode 100644 index 0000000..50ec951 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusPipeline; +import org.apache.ibatis.annotations.Param; + +/** + * @author cz + */ +public interface BusPipelineMapper extends BaseMapper { + + int deletePipelineLine(@Param("id") Long id); + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml new file mode 100644 index 0000000..a37fe05 --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml @@ -0,0 +1,12 @@ + + + + + + update valid=0 + FROM bus_well_info + WHERE id=#{id} + + + + diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java new file mode 100644 index 0000000..164ebda --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.BusPipeline; + +import java.util.List; + +/** + * @author cz + */ +public interface IBusPipelineService extends IService { + + Boolean deleteBatchByIds(List ids); + +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java new file mode 100644 index 0000000..2d9f46a --- /dev/null +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.BusPipelineMapper; +import com.casic.missiles.modular.system.model.BusPipeline; +import com.casic.missiles.modular.system.service.IBusPipelineService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author cz + */ +@Service +public class BusPipelineServiceImpl extends ServiceImpl implements IBusPipelineService { + + + @Override + public Boolean deleteBatchByIds(List ids) { + int deleteCount = this.baseMapper.deleteBatchIds(ids); + if () { + return + } + return lists; + } +}