aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -32,8 +32,7 @@ @Tag(name = "姘斾綋绠¤矾浜ц兘瑙勫垝", description = "姘斾綋绠¤矾浜ц兘瑙勫垝鎺ュ彛") @RestController @RequestMapping("/gasPipelineCapacityPlan") public class ApsGasPipelineCapacityPlanController extends BaseController { public class ApsGasPipelineCapacityPlanController extends BaseController { @Autowired private IApsGasPipelineCapacityPlanService apsGasPipelineCapacityPlanService; @@ -46,8 +45,7 @@ @Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "鍒嗛〉鏌ヨ") @RequiresPermissions("aps:gasPipelineCapacityPlan:list") @GetMapping("/list") public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { // startPage(); List<ApsGasPipelineCapacityPlan> list = apsGasPipelineCapacityPlanService.selectApsGasPipelineCapacityPlanList(apsGasPipelineCapacityPlan); ApsStandardProcess apsStandardProcess = new ApsStandardProcess(); @@ -93,11 +91,30 @@ @RequiresPermissions("aps:gasPipelineCapacityPlan:export") @Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { public void export(HttpServletResponse response, ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { List<ApsGasPipelineCapacityPlan> list = apsGasPipelineCapacityPlanService.selectApsGasPipelineCapacityPlanList(apsGasPipelineCapacityPlan); ExcelUtil<ApsGasPipelineCapacityPlan> util = new ExcelUtil<ApsGasPipelineCapacityPlan>(ApsGasPipelineCapacityPlan.class); util.exportExcel(response, list, "姘斾綋绠¤矾浜ц兘瑙勫垝鏁版嵁"); } /** * 澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝 */ @Operation(summary = "澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝", description = "澶嶅埗") // @RequiresPermissions("aps:gasPipelineCapacityPlan:copy") @Log(title = "澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.INSERT) @PutMapping("/copy") public AjaxResult copy( // 鏍煎紡锛歽yyy-MM @RequestParam String date, @RequestParam String factory, // 鏍煎紡锛歽yyy-MM @RequestParam String toStart, // 鏍煎紡锛歽yyy-MM @RequestParam String toEnd) { apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd); return success(); } /** @@ -106,8 +123,7 @@ @Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘瑙勫垝璇︾粏淇℃伅", description = "鏍规嵁id鑾峰彇") @RequiresPermissions("aps:gasPipelineCapacityPlan:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") Long id) { return success(apsGasPipelineCapacityPlanService.selectApsGasPipelineCapacityPlanById(id)); } @@ -118,8 +134,7 @@ @RequiresPermissions("aps:gasPipelineCapacityPlan:add") @Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody List<ApsGasPipelineCapacityPlan> apsGasPipelineCapacityPlan) { public AjaxResult add(@RequestBody List<ApsGasPipelineCapacityPlan> apsGasPipelineCapacityPlan) { apsGasPipelineCapacityPlan.forEach(apsGasPipelineCapacityPlanTemp -> { if(apsGasPipelineCapacityPlanTemp.getId()==null){ apsGasPipelineCapacityPlanTemp.setCreateBy(SecurityUtils.getUsername()); @@ -141,8 +156,7 @@ @RequiresPermissions("aps:gasPipelineCapacityPlan:edit") @Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { public AjaxResult edit(@RequestBody ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { return toAjax(apsGasPipelineCapacityPlanService.updateApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlan)); } @@ -153,8 +167,7 @@ @RequiresPermissions("aps:gasPipelineCapacityPlan:remove") @Log(title = "姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(apsGasPipelineCapacityPlanService.deleteApsGasPipelineCapacityPlanByIds(ids)); } } aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java
@@ -130,11 +130,11 @@ */ @SneakyThrows @Operation(summary = "涓嬭浇姘斾綋宸ュ崟鏁版嵁瀵煎叆妯℃澘", description = "涓嬭浇姘斾綋宸ュ崟鏁版嵁瀵煎叆妯℃澘") @RequiresPermissions("gasPipeline:mo:template") @Log(title = "涓嬭浇姘斾綋宸ュ崟鏁版嵁瀵煎叆妯℃澘", businessType = BusinessType.EXPORT) // @RequiresPermissions("gasPipeline:mo:template") // @Log(title = "涓嬭浇姘斾綋宸ュ崟鏁版嵁瀵煎叆妯℃澘", businessType = BusinessType.EXPORT) @GetMapping("/template") public ResponseEntity<ByteArrayResource> exportTemplate() { byte[] file = IOUtils.resourceToByteArray("/templates/涓婁紶姘斾綋宸ュ崟鏁版嵁妯℃澘.xlsx"); byte[] file = IOUtils.resourceToByteArray("/templates/姘斾綋宸ュ崟鏁版嵁妯℃澘v1.0.xlsx"); ByteArrayResource resource = new ByteArrayResource(file); return ResponseEntity.ok() .header(HttpHeaders.CONTENT_DISPOSITION, aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java
@@ -70,11 +70,11 @@ */ @SneakyThrows @Operation(summary = "涓嬭浇姘斾綋棰勬祴鏁版嵁瀵煎叆妯℃澘", description = "涓嬭浇姘斾綋棰勬祴鏁版嵁瀵煎叆妯℃澘") @RequiresPermissions("gasPipeline:prediction:template") @Log(title = "涓嬭浇姘斾綋棰勬祴鏁版嵁瀵煎叆妯℃澘", businessType = BusinessType.EXPORT) // @RequiresPermissions("gasPipeline:prediction:template") // @Log(title = "涓嬭浇姘斾綋棰勬祴鏁版嵁瀵煎叆妯℃澘", businessType = BusinessType.EXPORT) @GetMapping("/template") public ResponseEntity<ByteArrayResource> exportTemplate() { byte[] file = IOUtils.resourceToByteArray("/templates/涓婁紶姘斾綋棰勬祴鏁版嵁妯℃澘.xlsx"); byte[] file = IOUtils.resourceToByteArray("/templates/姘斾綋棰勬祴鏁版嵁妯℃澘v1.0.xlsx"); ByteArrayResource resource = new ByteArrayResource(file); return ResponseEntity.ok() .header(HttpHeaders.CONTENT_DISPOSITION, aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
@@ -2,6 +2,7 @@ import com.aps.common.core.annotation.Excel; import com.aps.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -20,6 +21,7 @@ private static final long serialVersionUID = 1L; /** 涓婚敭id */ @JsonFormat(shape = JsonFormat.Shape.STRING) @Schema(description = "涓婚敭id", type = "Long") private Long id;
@@ -61,4 +61,6 @@ * @return 缁撴灉 */ public int deleteApsGasPipelineCapacityPlanByIds(Long[] ids); void deleteByDateAndFactory(String year, String month, String factory); } aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java
@@ -59,4 +59,6 @@ * @return 缁撴灉 */ public int deleteApsGasPipelineCapacityPlanById(Long id); void copyPlan(String date, String factory, String toStart, String toEnd); } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
@@ -5,9 +5,16 @@ import com.aps.core.domain.ApsGasPipelineCapacityPlan; import com.aps.core.mapper.ApsGasPipelineCapacityPlanMapper; import com.aps.core.service.IApsGasPipelineCapacityPlanService; import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.Calendar; import java.util.Date; import java.util.List; /** @@ -17,8 +24,7 @@ * @date 2025-04-24 */ @Service public class ApsGasPipelineCapacityPlanServiceImpl implements IApsGasPipelineCapacityPlanService { public class ApsGasPipelineCapacityPlanServiceImpl implements IApsGasPipelineCapacityPlanService { @Autowired private ApsGasPipelineCapacityPlanMapper apsGasPipelineCapacityPlanMapper; @@ -29,8 +35,7 @@ * @return 姘斾綋绠¤矾浜ц兘瑙勫垝 */ @Override public ApsGasPipelineCapacityPlan selectApsGasPipelineCapacityPlanById(Long id) { public ApsGasPipelineCapacityPlan selectApsGasPipelineCapacityPlanById(Long id) { return apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanById(id); } @@ -41,8 +46,7 @@ * @return 姘斾綋绠¤矾浜ц兘瑙勫垝 */ @Override public List<ApsGasPipelineCapacityPlan> selectApsGasPipelineCapacityPlanList(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { public List<ApsGasPipelineCapacityPlan> selectApsGasPipelineCapacityPlanList(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { return apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(apsGasPipelineCapacityPlan); } @@ -53,8 +57,7 @@ * @return 缁撴灉 */ @Override public int insertApsGasPipelineCapacityPlan(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { public int insertApsGasPipelineCapacityPlan(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { apsGasPipelineCapacityPlan.setCreateTime(DateUtils.getNowDate()); apsGasPipelineCapacityPlan.setCreateBy(SecurityUtils.getUsername()); return apsGasPipelineCapacityPlanMapper.insertApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlan); @@ -67,8 +70,7 @@ * @return 缁撴灉 */ @Override public int updateApsGasPipelineCapacityPlan(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { public int updateApsGasPipelineCapacityPlan(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) { apsGasPipelineCapacityPlan.setUpdateTime(DateUtils.getNowDate()); apsGasPipelineCapacityPlan.setUpdateBy(SecurityUtils.getUsername()); return apsGasPipelineCapacityPlanMapper.updateApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlan); @@ -81,8 +83,7 @@ * @return 缁撴灉 */ @Override public int deleteApsGasPipelineCapacityPlanByIds(Long[] ids) { public int deleteApsGasPipelineCapacityPlanByIds(Long[] ids) { return apsGasPipelineCapacityPlanMapper.deleteApsGasPipelineCapacityPlanByIds(ids); } @@ -93,8 +94,49 @@ * @return 缁撴灉 */ @Override public int deleteApsGasPipelineCapacityPlanById(Long id) { public int deleteApsGasPipelineCapacityPlanById(Long id) { return apsGasPipelineCapacityPlanMapper.deleteApsGasPipelineCapacityPlanById(id); } @SneakyThrows @Override @Transactional(rollbackFor = Exception.class) public void copyPlan(String date, String factory, String toStart, String toEnd) { String[] dtSrc = date.split("-"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); Calendar dtStart = Calendar.getInstance(); dtStart.setTime(sdf.parse(toStart)); dtStart.set(Calendar.DAY_OF_MONTH, 1); Calendar dtEnd = Calendar.getInstance(); dtEnd.setTime(sdf.parse(toEnd)); dtEnd.set(Calendar.DAY_OF_MONTH, 2); ApsGasPipelineCapacityPlan plan = new ApsGasPipelineCapacityPlan(); plan.setYear(Integer.valueOf(dtSrc[0]).toString()); plan.setMonth(Integer.valueOf(dtSrc[1]).toString()); plan.setOrgCode(factory); List<ApsGasPipelineCapacityPlan> templatePlans = apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(plan); while (dtStart.before(dtEnd)) { String year = dtStart.get(Calendar.YEAR) + ""; String month = (dtStart.get(Calendar.MONTH) + 1) + ""; apsGasPipelineCapacityPlanMapper.deleteByDateAndFactory( year, month, factory ); templatePlans.forEach(p -> { p.setYear(year); p.setMonth(month); p.setCreateBy(SecurityUtils.getUsername()); p.setCreateTime(new Date()); p.setUpdateBy(null); p.setUpdateTime(null); apsGasPipelineCapacityPlanMapper.insertApsGasPipelineCapacityPlan(p); }); dtStart.add(Calendar.MONTH, 1); } } } aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
@@ -133,4 +133,11 @@ #{id} </foreach> </delete> <delete id="deleteByDateAndFactory" > delete from aps_gas_pipeline_capacity_plan where year = #{year} and month = #{month} and org_code = #{factory} </delete> </mapper> aps-modules/aps-core/src/main/resources/templates/上传气体工单数据模板.xlsxBinary files differ
aps-modules/aps-core/src/main/resources/templates/上传气体预测数据模板.xlsxBinary files differ
aps-modules/aps-core/src/main/resources/templates/气体工单数据模板v1.0.xlsxBinary files differ
aps-modules/aps-core/src/main/resources/templates/气体预测数据模板v1.0.xlsxBinary files differ
