From b36787f01f6262b7d917ab33456787734c33c781 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 8 Jan 2026 14:33:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(PdiSetup):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=BC=A0=E5=8A=9B=E5=8F=82=E6=95=B0=E6=9C=8D=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=92=8C=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除旧的生产计划参数详情相关服务接口 - 添加全线张力、退火炉张力、平整机张力、矫直机张力等新服务接口 - 更新PdiSetupService接口方法签名和文档注释 - 移除Spring Security权限注解依赖 - 优化Mapper XML映射文件字段映射和查询逻辑 - 更新控制器方法名称和日志标题以匹配新功能 --- .../comm/OPC/MessageReceiveSchedule.java | 87 ++++++ .../controller/PdiSetupController.java | 16 +- .../SetupTensionAllLineController.java | 83 ++++++ ...etupTensionAnnealingFurnaceController.java | 69 +++++ .../controller/SetupTensionController.java | 95 ------ .../SetupTensionLevelerController.java | 69 +++++ .../SetupTensionStraightenerController.java | 69 +++++ .../controller/SetupTlController.java | 96 ------- .../SetupTmBendforceController.java | 96 ------- .../controller/SetupTmMeshController.java | 98 ------- .../SetupTmRollforceController.java | 100 ------- .../com/fizz/business/domain/PdiSetups.java | 167 ++++------- .../business/domain/SetupTensionAllLine.java | 150 ++++++++++ .../domain/SetupTensionAnnealingFurnace.java | 61 ++++ .../business/domain/SetupTensionLeveler.java | 61 ++++ .../domain/SetupTensionStraightener.java | 55 ++++ .../fizz/business/mapper/PdiSetupMapper.java | 53 +--- .../mapper/SetupTensionAllLineMapper.java | 26 ++ .../SetupTensionAnnealingFurnaceMapper.java | 26 ++ .../mapper/SetupTensionLevelerMapper.java | 26 ++ .../business/mapper/SetupTensionMapper.java | 62 ---- .../SetupTensionStraightenerMapper.java | 26 ++ .../fizz/business/mapper/SetupTlMapper.java | 62 ---- .../mapper/SetupTmBendforceMapper.java | 62 ---- .../business/mapper/SetupTmMeshMapper.java | 64 ----- .../mapper/SetupTmRollforceMapper.java | 65 ----- .../business/service/IPdiSetupService.java | 49 +--- .../service/ISetupTensionAllLineService.java | 21 ++ .../ISetupTensionAnnealingFurnaceService.java | 21 ++ .../service/ISetupTensionLevelerService.java | 21 ++ .../service/ISetupTensionService.java | 61 ---- .../ISetupTensionStraightenerService.java | 21 ++ .../business/service/ISetupTlService.java | 61 ---- .../service/ISetupTmBendforceService.java | 61 ---- .../business/service/ISetupTmMeshService.java | 61 ---- .../service/ISetupTmRollforceService.java | 61 ---- .../service/impl/PdiSetupServiceImpl.java | 94 ++---- .../impl/SetupTensionAllLineServiceImpl.java | 59 ++++ ...tupTensionAnnealingFurnaceServiceImpl.java | 58 ++++ .../impl/SetupTensionLevelerServiceImpl.java | 58 ++++ .../service/impl/SetupTensionServiceImpl.java | 100 ------- .../SetupTensionStraightenerServiceImpl.java | 58 ++++ .../service/impl/SetupTlServiceImpl.java | 100 ------- .../impl/SetupTmBendforceServiceImpl.java | 100 ------- .../service/impl/SetupTmMeshServiceImpl.java | 100 ------- .../impl/SetupTmRollforceServiceImpl.java | 100 ------- .../main/resources/mapper/PdiSetupMapper.xml | 271 +++++++++--------- .../mapper/SetupTensionAllLineMapper.xml | 86 ++++++ .../SetupTensionAnnealingFurnaceMapper.xml | 70 +++++ .../mapper/SetupTensionLevelerMapper.xml | 70 +++++ .../resources/mapper/SetupTensionMapper.xml | 146 ---------- .../mapper/SetupTensionStraightenerMapper.xml | 66 +++++ .../main/resources/mapper/SetupTlMapper.xml | 128 --------- .../mapper/SetupTmBendforceMapper.xml | 90 ------ .../resources/mapper/SetupTmMeshMapper.xml | 125 -------- .../mapper/SetupTmRollforceMapper.xml | 129 --------- 56 files changed, 1649 insertions(+), 2641 deletions(-) create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTensionAllLineController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTensionAnnealingFurnaceController.java delete mode 100644 business/src/main/java/com/fizz/business/controller/SetupTensionController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTensionLevelerController.java create mode 100644 business/src/main/java/com/fizz/business/controller/SetupTensionStraightenerController.java delete mode 100644 business/src/main/java/com/fizz/business/controller/SetupTlController.java delete mode 100644 business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java delete mode 100644 business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java delete mode 100644 business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTensionAllLine.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTensionAnnealingFurnace.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTensionLeveler.java create mode 100644 business/src/main/java/com/fizz/business/domain/SetupTensionStraightener.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTensionAllLineMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTensionAnnealingFurnaceMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTensionLevelerMapper.java delete mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java create mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTensionStraightenerMapper.java delete mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java delete mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java delete mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java delete mode 100644 business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTensionAllLineService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTensionAnnealingFurnaceService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTensionLevelerService.java delete mode 100644 business/src/main/java/com/fizz/business/service/ISetupTensionService.java create mode 100644 business/src/main/java/com/fizz/business/service/ISetupTensionStraightenerService.java delete mode 100644 business/src/main/java/com/fizz/business/service/ISetupTlService.java delete mode 100644 business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java delete mode 100644 business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java delete mode 100644 business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTensionAllLineServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTensionAnnealingFurnaceServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTensionLevelerServiceImpl.java delete mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTensionStraightenerServiceImpl.java delete mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java delete mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java delete mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java delete mode 100644 business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java create mode 100644 business/src/main/resources/mapper/SetupTensionAllLineMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTensionAnnealingFurnaceMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTensionLevelerMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTensionMapper.xml create mode 100644 business/src/main/resources/mapper/SetupTensionStraightenerMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTlMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTmBendforceMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTmMeshMapper.xml delete mode 100644 business/src/main/resources/mapper/SetupTmRollforceMapper.xml diff --git a/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java b/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java index 0fddfe1..fd23f2f 100644 --- a/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java @@ -5,6 +5,8 @@ import com.fizz.business.constants.enums.OpcMessageType; import com.fizz.business.domain.msg.*; import com.fizz.business.scheduled.BaseSchedule; import com.fizz.business.service.hanle.OpcReceiverHandler; +import com.fizz.business.service.ProStoppageService; +import com.fizz.business.domain.ProStoppage; import com.kangaroohy.milo.model.ReadWriteEntity; import com.kangaroohy.milo.service.MiloService; import lombok.AllArgsConstructor; @@ -17,6 +19,9 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.lang.reflect.Field; +import java.time.Duration; +import java.time.LocalDateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -34,6 +39,22 @@ public class MessageReceiveSchedule extends BaseSchedule { @Resource private OpcReceiverHandler opcReceiverHandler; + + @Resource + private ProStoppageService proStoppageService; + + /** + * 低速监控状态 + */ + private LocalDateTime lowSpeedStartTime; + private boolean stopRecorded = false; + private Long currentStopId; + + /** + * 恢复监控状态 + */ + private LocalDateTime highSpeedStartTime; + @Scheduled(fixedDelay = 1000) public void L1L2LineMeasure() { try { @@ -55,6 +76,9 @@ public class MessageReceiveSchedule extends BaseSchedule { msg.setAppMeasureCoatMessage(coat); msg.setAppMeasureFurnaceMessage(fur); msg.setAppMeasureExitMessage(exit); + + monitorStripSpeed(entry); + opcReceiverHandler.onMessageReceived(OpcMessageType.APP_MEASURE,msg); } catch (Exception e) { @@ -86,4 +110,67 @@ public class MessageReceiveSchedule extends BaseSchedule { } }); } + + /** + * stripSpeed<5 持续5分钟判定停机，>5 持续1分钟结束停机并更新维持时间 + */ + private void monitorStripSpeed(AppMeasureEntryMessage entry) { + if (entry == null || entry.getStripSpeed() == null) { + resetSpeedFlags(); + return; + } + + boolean lowSpeed = entry.getStripSpeed().compareTo(BigDecimal.valueOf(5)) < 0; + LocalDateTime now = LocalDateTime.now(); + + if (lowSpeed) { + highSpeedStartTime = null; // 重置恢复计时 + if (lowSpeedStartTime == null) { + lowSpeedStartTime = now; + } + // 低速已持续超过5分钟且尚未入库，则新增停机记录 + if (!stopRecorded && Duration.between(lowSpeedStartTime, now).toMinutes() >= 5) { + ProStoppage stoppage = new ProStoppage(); + stoppage.setStartDate(lowSpeedStartTime); + stoppage.setDuration(BigDecimal.ZERO); // 初始为0，恢复后再更新 + stoppage.setStopType("AUTO_LOW_SPEED"); + stoppage.setRemark("stripSpeed<5 自动停机"); + if (proStoppageService.save(stoppage)) { + currentStopId = stoppage.getStopid(); + stopRecorded = true; + log.info("自动新增低速停机记录，stopId={} start={}", currentStopId, lowSpeedStartTime); + } else { + log.warn("自动新增低速停机记录失败"); + } + } + } else { + lowSpeedStartTime = null; + if (stopRecorded) { + if (highSpeedStartTime == null) { + highSpeedStartTime = now; + } + if (Duration.between(highSpeedStartTime, now).toMinutes() >= 1 && currentStopId != null) { + ProStoppage update = new ProStoppage(); + update.setStopid(currentStopId); + update.setEndDate(now); + // duration 以秒存储 + ProStoppage existing = proStoppageService.getById(currentStopId); + LocalDateTime start = existing != null && existing.getStartDate() != null ? existing.getStartDate() : highSpeedStartTime; + long seconds = Duration.between(start, now).getSeconds(); + update.setDuration(BigDecimal.valueOf(seconds)); + proStoppageService.updateById(update); + log.info("低速停机结束更新，stopId={} duration={}s", currentStopId, seconds); + resetSpeedFlags(); + } + } else { + highSpeedStartTime = null; + } + } + } + + private void resetSpeedFlags() { + lowSpeedStartTime = null; + highSpeedStartTime = null; + // 不重置 stopRecorded/currentStopId，避免短暂无值时丢失状态 + } } diff --git a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java index cf1a008..73d37ba 100644 --- a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java @@ -4,7 +4,6 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.fizz.business.service.IPdiSetupService; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; @@ -12,13 +11,12 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.fizz.business.domain.PdiSetups; -import com.fizz.business.service.IPdiSetupService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 生产计划的参数详情Controller - * + * * @author Joshi * @date 2025-09-25 */ @@ -53,12 +51,12 @@ public class PdiSetupController extends BaseController } /** - * 获取生产计划的参数详情详细信息 + * 获取张力参数详细信息 */ @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(pdiSetupService.selectPdiSetupByid(id)); + return success(pdiSetupService.selectPdiSetupById(id)); } /** @@ -82,12 +80,12 @@ public class PdiSetupController extends BaseController } /** - * 删除生产计划的参数详情 + * 删除张力参数 */ - @Log(title = "生产计划的参数详情", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @Log(title = "张力参数", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(pdiSetupService.deletePdiSetupByids(ids)); + return toAjax(pdiSetupService.deletePdiSetupByIds(ids)); } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionAllLineController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionAllLineController.java new file mode 100644 index 0000000..22d5d20 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionAllLineController.java @@ -0,0 +1,83 @@ +package com.fizz.business.controller; + +import java.util.List; + +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.fizz.business.domain.SetupTensionAllLine; +import com.fizz.business.service.ISetupTensionAllLineService; + +/** + * 全线张力Controller（无权限控制） + * + * 三主键：steelGrade + thick + yieldStren + */ +@RestController +@RequestMapping("/business/tension/all-line") +@Anonymous +public class SetupTensionAllLineController extends BaseController +{ + @Autowired + private ISetupTensionAllLineService service; + + /** + * 查询全线张力列表 + */ + @GetMapping("/list") + public TableDataInfo list(SetupTensionAllLine query) + { + startPage(); + List list = service.selectList(query); + return getDataTable(list); + } + + /** + * 获取全线张力详细信息（按三主键） + */ + @GetMapping + public AjaxResult getInfo(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return success(service.selectByKey(steelGrade, thick, yieldStren)); + } + + /** + * 新增全线张力 + */ + @Log(title = "全线张力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTensionAllLine entity) + { + return toAjax(service.insert(entity)); + } + + /** + * 修改全线张力（按三主键定位） + */ + @Log(title = "全线张力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTensionAllLine entity) + { + return toAjax(service.updateByKey(entity)); + } + + /** + * 删除全线张力（按三主键） + */ + @Log(title = "全线张力", businessType = BusinessType.DELETE) + @DeleteMapping + public AjaxResult remove(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return toAjax(service.deleteByKey(steelGrade, thick, yieldStren)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionAnnealingFurnaceController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionAnnealingFurnaceController.java new file mode 100644 index 0000000..040220d --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionAnnealingFurnaceController.java @@ -0,0 +1,69 @@ +package com.fizz.business.controller; + +import java.util.List; + +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.fizz.business.domain.SetupTensionAnnealingFurnace; +import com.fizz.business.service.ISetupTensionAnnealingFurnaceService; + +/** + * 退火炉张力Controller（无权限控制） + * + * 三主键：steelGrade + thick + yieldStren + */ +@RestController +@RequestMapping("/business/tension/annealing-furnace") +@Anonymous +public class SetupTensionAnnealingFurnaceController extends BaseController +{ + @Autowired + private ISetupTensionAnnealingFurnaceService service; + + @GetMapping("/list") + public TableDataInfo list(SetupTensionAnnealingFurnace query) + { + startPage(); + List list = service.selectList(query); + return getDataTable(list); + } + + @GetMapping + public AjaxResult getInfo(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return success(service.selectByKey(steelGrade, thick, yieldStren)); + } + + @Log(title = "退火炉张力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTensionAnnealingFurnace entity) + { + return toAjax(service.insert(entity)); + } + + @Log(title = "退火炉张力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTensionAnnealingFurnace entity) + { + return toAjax(service.updateByKey(entity)); + } + + @Log(title = "退火炉张力", businessType = BusinessType.DELETE) + @DeleteMapping + public AjaxResult remove(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return toAjax(service.deleteByKey(steelGrade, thick, yieldStren)); + } +} + diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java deleted file mode 100644 index f7f1f6a..0000000 --- a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.fizz.business.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fizz.business.form.TensionDeleteForm; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.fizz.business.domain.SetupTension; -import com.fizz.business.service.ISetupTensionService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 全线张力Controller - * - * @author ruoyi - * @date 2025-09-26 - */ -@RestController -@RequestMapping("/business/tension") -public class SetupTensionController extends BaseController -{ - @Autowired - private ISetupTensionService setupTensionService; - - /** - * 查询全线张力列表 - */ - @GetMapping("/list") - public TableDataInfo list(SetupTension setupTension) - { - startPage(); - List list = setupTensionService.selectSetupTensionList(setupTension); - return getDataTable(list); - } - - /** - * 导出全线张力列表 - */ - @Log(title = "全线张力", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SetupTension setupTension) - { - List list = setupTensionService.selectSetupTensionList(setupTension); - ExcelUtil util = new ExcelUtil(SetupTension.class); - util.exportExcel(response, list, "全线张力数据"); - } - - /** - * 获取全线张力详细信息 - */ - @GetMapping() - public AjaxResult getInfo(@RequestParam(required = false) Long thick ,@RequestParam(required = false) Long yieldStren) - { - return success(setupTensionService.selectSetupTensionByThick(thick, yieldStren)); - } - - /** - * 新增全线张力 - */ - @Log(title = "全线张力", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SetupTension setupTension) - { - return toAjax(setupTensionService.insertSetupTension(setupTension)); - } - - /** - * 修改全线张力 - */ - @Log(title = "全线张力", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SetupTension setupTension) - { - return toAjax(setupTensionService.updateSetupTension(setupTension)); - } - - /** - * 删除全线张力 - */ - @Log(title = "全线张力", businessType = BusinessType.DELETE) - @DeleteMapping("/tension") // 建议添加路径区分不同删除接口 - public AjaxResult removeTension(@RequestBody TensionDeleteForm form) { - return toAjax(setupTensionService.deleteSetupTensionByThicks( - form.getThicks(), - form.getYieldStrens() - )); - } -} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionLevelerController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionLevelerController.java new file mode 100644 index 0000000..87d3f17 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionLevelerController.java @@ -0,0 +1,69 @@ +package com.fizz.business.controller; + +import java.util.List; + +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.fizz.business.domain.SetupTensionLeveler; +import com.fizz.business.service.ISetupTensionLevelerService; + +/** + * 平整机张力Controller（无权限控制） + * + * 三主键：steelGrade + thick + yieldStren + */ +@RestController +@RequestMapping("/business/tension/leveler") +@Anonymous +public class SetupTensionLevelerController extends BaseController +{ + @Autowired + private ISetupTensionLevelerService service; + + @GetMapping("/list") + public TableDataInfo list(SetupTensionLeveler query) + { + startPage(); + List list = service.selectList(query); + return getDataTable(list); + } + + @GetMapping + public AjaxResult getInfo(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return success(service.selectByKey(steelGrade, thick, yieldStren)); + } + + @Log(title = "平整机张力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTensionLeveler entity) + { + return toAjax(service.insert(entity)); + } + + @Log(title = "平整机张力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTensionLeveler entity) + { + return toAjax(service.updateByKey(entity)); + } + + @Log(title = "平整机张力", businessType = BusinessType.DELETE) + @DeleteMapping + public AjaxResult remove(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return toAjax(service.deleteByKey(steelGrade, thick, yieldStren)); + } +} + diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionStraightenerController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionStraightenerController.java new file mode 100644 index 0000000..06b1a29 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionStraightenerController.java @@ -0,0 +1,69 @@ +package com.fizz.business.controller; + +import java.util.List; + +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.fizz.business.domain.SetupTensionStraightener; +import com.fizz.business.service.ISetupTensionStraightenerService; + +/** + * 矫直机张力Controller（无权限控制） + * + * 三主键：steelGrade + thick + yieldStren + */ +@RestController +@RequestMapping("/business/tension/straightener") +@Anonymous +public class SetupTensionStraightenerController extends BaseController +{ + @Autowired + private ISetupTensionStraightenerService service; + + @GetMapping("/list") + public TableDataInfo list(SetupTensionStraightener query) + { + startPage(); + List list = service.selectList(query); + return getDataTable(list); + } + + @GetMapping + public AjaxResult getInfo(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return success(service.selectByKey(steelGrade, thick, yieldStren)); + } + + @Log(title = "矫直机张力", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupTensionStraightener entity) + { + return toAjax(service.insert(entity)); + } + + @Log(title = "矫直机张力", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupTensionStraightener entity) + { + return toAjax(service.updateByKey(entity)); + } + + @Log(title = "矫直机张力", businessType = BusinessType.DELETE) + @DeleteMapping + public AjaxResult remove(@RequestParam("steelGrade") String steelGrade, + @RequestParam("thick") Float thick, + @RequestParam("yieldStren") Float yieldStren) + { + return toAjax(service.deleteByKey(steelGrade, thick, yieldStren)); + } +} + diff --git a/business/src/main/java/com/fizz/business/controller/SetupTlController.java b/business/src/main/java/com/fizz/business/controller/SetupTlController.java deleted file mode 100644 index 711ea5f..0000000 --- a/business/src/main/java/com/fizz/business/controller/SetupTlController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.fizz.business.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fizz.business.form.TlDeleteForm; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.fizz.business.domain.SetupTl; -import com.fizz.business.service.ISetupTlService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 拉矫机参数Controller - * - * @author ruoyi - * @date 2025-09-26 - */ -@RestController -@RequestMapping("/business/tl") -public class SetupTlController extends BaseController -{ - @Autowired - private ISetupTlService setupTlService; - - /** - * 查询拉矫机参数列表 - */ - @GetMapping("/list") - public TableDataInfo list(SetupTl setupTl) - { - startPage(); - List list = setupTlService.selectSetupTlList(setupTl); - return getDataTable(list); - } - - /** - * 导出拉矫机参数列表 - */ - @Log(title = "拉矫机参数", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SetupTl setupTl) - { - List list = setupTlService.selectSetupTlList(setupTl); - ExcelUtil util = new ExcelUtil(SetupTl.class); - util.exportExcel(response, list, "拉矫机参数数据"); - } - - /** - * 获取拉矫机参数详细信息 - */ - @GetMapping() - public AjaxResult getInfo(@RequestParam String steelGrade, - @RequestParam Long yieldStren, - @RequestParam Long thick) - { - return success(setupTlService.selectSetupTlBySteelGrade(steelGrade, yieldStren, thick)); - } - - /** - * 新增拉矫机参数 - */ - @Log(title = "拉矫机参数", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SetupTl setupTl) - { - return toAjax(setupTlService.insertSetupTl(setupTl)); - } - - /** - * 修改拉矫机参数 - */ - @Log(title = "拉矫机参数", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SetupTl setupTl) - { - return toAjax(setupTlService.updateSetupTl(setupTl)); - } - - // 拉矫机参数删除接口 - @Log(title = "拉矫机参数", businessType = BusinessType.DELETE) - @DeleteMapping("/tl") // 不同路径区分 - public AjaxResult removeTl(@RequestBody TlDeleteForm form) { - return toAjax(setupTlService.deleteSetupTlBySteelGrades( - form.getSteelGrades(), - form.getYieldStrens(), - form.getThicks() - )); - } -} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java deleted file mode 100644 index d3b4905..0000000 --- a/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.fizz.business.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fizz.business.form.TmBendforceDeleteForm; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.fizz.business.domain.SetupTmBendforce; -import com.fizz.business.service.ISetupTmBendforceService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 光整机弯辊力Controller - * - * @author Joshi - * @date 2025-09-26 - */ -@RestController -@RequestMapping("/business/bendforce") -public class SetupTmBendforceController extends BaseController -{ - @Autowired - private ISetupTmBendforceService setupTmBendforceService; - - /** - * 查询光整机弯辊力列表 - */ - @GetMapping("/list") - public TableDataInfo list(SetupTmBendforce setupTmBendforce) - { - startPage(); - List list = setupTmBendforceService.selectSetupTmBendforceList(setupTmBendforce); - return getDataTable(list); - } - - /** - * 导出光整机弯辊力列表 - */ - @Log(title = "光整机弯辊力", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SetupTmBendforce setupTmBendforce) - { - List list = setupTmBendforceService.selectSetupTmBendforceList(setupTmBendforce); - ExcelUtil util = new ExcelUtil(SetupTmBendforce.class); - util.exportExcel(response, list, "光整机弯辊力数据"); - } - - /** - * 获取光整机弯辊力详细信息 - */ - @GetMapping() - public AjaxResult getInfo(@RequestParam Long width, - @RequestParam Long rollForce) - { - return success(setupTmBendforceService.selectSetupTmBendforceByWidth(width,rollForce)); - } - - /** - * 新增光整机弯辊力 - */ - @Log(title = "光整机弯辊力", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SetupTmBendforce setupTmBendforce) - { - return toAjax(setupTmBendforceService.insertSetupTmBendforce(setupTmBendforce)); - } - - /** - * 修改光整机弯辊力 - */ - @Log(title = "光整机弯辊力", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SetupTmBendforce setupTmBendforce) - { - return toAjax(setupTmBendforceService.updateSetupTmBendforce(setupTmBendforce)); - } - - /** - * 删除光整机弯辊力 - */ - @Log(title = "光整机弯辊力", businessType = BusinessType.DELETE) - @DeleteMapping("/tm/bendforce") - public AjaxResult removeTmBendforce(@RequestBody TmBendforceDeleteForm form) { - return toAjax(setupTmBendforceService.deleteSetupTmBendforceByWidths( - form.getWidths(), - form.getRollForces() - )); - } -} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java deleted file mode 100644 index c9c942e..0000000 --- a/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.fizz.business.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fizz.business.form.TmMeshDeleteForm; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.fizz.business.domain.SetupTmMesh; -import com.fizz.business.service.ISetupTmMeshService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 光整机插入量Controller - * - * @author Joshi - * @date 2025-09-26 - */ -@RestController -@RequestMapping("/business/mesh") -public class SetupTmMeshController extends BaseController -{ - @Autowired - private ISetupTmMeshService setupTmMeshService; - - /** - * 查询光整机插入量列表 - */ - @GetMapping("/list") - public TableDataInfo list(SetupTmMesh setupTmMesh) - { - startPage(); - List list = setupTmMeshService.selectSetupTmMeshList(setupTmMesh); - return getDataTable(list); - } - - /** - * 导出光整机插入量列表 - */ - @Log(title = "光整机插入量", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SetupTmMesh setupTmMesh) - { - List list = setupTmMeshService.selectSetupTmMeshList(setupTmMesh); - ExcelUtil util = new ExcelUtil(SetupTmMesh.class); - util.exportExcel(response, list, "光整机插入量数据"); - } - - /** - * 获取光整机插入量详细信息 - */ - @GetMapping() - public AjaxResult getInfo(@RequestParam String steelGrade, - @RequestParam Long yieldStren, - @RequestParam Long thick) - { - return success(setupTmMeshService.selectSetupTmMeshBySteelGrade(steelGrade, yieldStren, thick)); - } - - /** - * 新增光整机插入量 - */ - @Log(title = "光整机插入量", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SetupTmMesh setupTmMesh) - { - return toAjax(setupTmMeshService.insertSetupTmMesh(setupTmMesh)); - } - - /** - * 修改光整机插入量 - */ - @Log(title = "光整机插入量", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SetupTmMesh setupTmMesh) - { - return toAjax(setupTmMeshService.updateSetupTmMesh(setupTmMesh)); - } - - /** - * 删除光整机插入量 - */ - @Log(title = "光整机插入量", businessType = BusinessType.DELETE) - @DeleteMapping("/tm/mesh") - public AjaxResult removeTmMesh(@RequestBody TmMeshDeleteForm form) { - return toAjax(setupTmMeshService.deleteSetupTmMeshBySteelGrades( - form.getSteelGrades(), - form.getYieldStrens(), - form.getThicks() - )); - } -} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java deleted file mode 100644 index 5ea5c48..0000000 --- a/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fizz.business.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.fizz.business.form.TmRollforceDeleteForm; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.fizz.business.domain.SetupTmRollforce; -import com.fizz.business.service.ISetupTmRollforceService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 光整机轧制力Controller - * - * @author Joshi - * @date 2025-09-26 - */ -@RestController -@RequestMapping("/business/rollforce") -public class SetupTmRollforceController extends BaseController -{ - @Autowired - private ISetupTmRollforceService setupTmRollforceService; - - /** - * 查询光整机轧制力列表 - */ - @GetMapping("/list") - public TableDataInfo list(SetupTmRollforce setupTmRollforce) - { - startPage(); - List list = setupTmRollforceService.selectSetupTmRollforceList(setupTmRollforce); - return getDataTable(list); - } - - /** - * 导出光整机轧制力列表 - */ - @Log(title = "光整机轧制力", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SetupTmRollforce setupTmRollforce) - { - List list = setupTmRollforceService.selectSetupTmRollforceList(setupTmRollforce); - ExcelUtil util = new ExcelUtil(SetupTmRollforce.class); - util.exportExcel(response, list, "光整机轧制力数据"); - } - - /** - * 获取光整机轧制力详细信息 - */ - @GetMapping() - public AjaxResult getInfo(@RequestParam String steelGrade, - @RequestParam Long yieldStren, - @RequestParam Long thick, - @RequestParam Long elong) - { - return success(setupTmRollforceService.selectSetupTmRollforceBySteelGrade(steelGrade, yieldStren, thick, elong)); - } - - /** - * 新增光整机轧制力 - */ - @Log(title = "光整机轧制力", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SetupTmRollforce setupTmRollforce) - { - return toAjax(setupTmRollforceService.insertSetupTmRollforce(setupTmRollforce)); - } - - /** - * 修改光整机轧制力 - */ - @Log(title = "光整机轧制力", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SetupTmRollforce setupTmRollforce) - { - return toAjax(setupTmRollforceService.updateSetupTmRollforce(setupTmRollforce)); - } - - /** - * 删除光整机轧制力 - */ - @Log(title = "光整机轧制力", businessType = BusinessType.DELETE) - @DeleteMapping("/tm/rollforce") - public AjaxResult removeTmRollforce(@RequestBody TmRollforceDeleteForm form) { - return toAjax(setupTmRollforceService.deleteSetupTmRollforceBySteelGrades( - form.getSteelGrades(), - form.getThicks(), - form.getYieldStrens(), - form.getElongs() - )); - } -} diff --git a/business/src/main/java/com/fizz/business/domain/PdiSetups.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java index 7a28873..db9c5ec 100644 --- a/business/src/main/java/com/fizz/business/domain/PdiSetups.java +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -5,162 +5,95 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** - * 生产计划的参数详情对象 pdi_setup + * 张力参数表对象 pdi_setup * - * @author Joshi - * @date 2025-09-25 + * 表主键为自增 id。 */ @Data @TableName("pdi_setup") -public class PdiSetups implements Serializable -{ +public class PdiSetups implements Serializable { private static final long serialVersionUID = 1L; - /** 主键ID */ - @TableId(value = "ID", type = IdType.AUTO) + /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 钢卷号 */ @Excel(name = "钢卷号") - @TableField("COILID") private String coilid; /** 计划号 */ @Excel(name = "计划号") - @TableField("PLANID") private String planid; + /** 钢种 */ + @Excel(name = "钢种") + private String steelGrade; + + /** 厚度 */ + @Excel(name = "厚度") + private BigDecimal thick; + + /** 屈服强度 */ + @Excel(name = "屈服强度") + private BigDecimal yieldStren; + /** 开卷机张力 */ @Excel(name = "开卷机张力") - @TableField("POR_TENSION") - private Long porTension; + private BigDecimal porTension; /** 入口活套张力 */ @Excel(name = "入口活套张力") - @TableField("CEL_TENSION") - private Long celTension; + private BigDecimal celTension; /** 清洗段张力 */ @Excel(name = "清洗段张力") - @TableField("CLEAN_TENSION") - private Long cleanTension; + private BigDecimal cleanTension; - /** 炉区张力 */ - @Excel(name = "炉区张力") - @TableField("FUR_TENSION") - private Long furTension; - - /** 冷却塔张力 */ - @Excel(name = "冷却塔张力") - @TableField("TOWER_TENSION") - private Long towerTension; - - /** 光整机不投张力 */ - @Excel(name = "光整机不投张力") - @TableField("TM_NONE_TENSION") - private Long tmNoneTension; - - /** 光整机入口张力 */ - @Excel(name = "光整机入口张力") - @TableField("TM_ENTRY_TENSION") - private Long tmEntryTension; - - /** 光整机出口张力 */ - @Excel(name = "光整机出口张力") - @TableField("TM_EXIT_TENSION") - private Long tmExitTension; - - /** 光整机轧制力 */ - @Excel(name = "光整机轧制力") - @TableField("TM_ROLLFORCE") - private Long tmRollforce; - - /** 光整机弯辊力 */ - @Excel(name = "光整机弯辊力") - @TableField("TM_BENDFORCE") - private Long tmBendforce; - - /** 光整机防皱辊插入量 */ - @Excel(name = "光整机防皱辊插入量") - @TableField("TM_ACR_MESH") - private Long tmAcrMesh; - - /** 光整机防颤辊插入量 */ - @Excel(name = "光整机防颤辊插入量") - @TableField("TM_BR_MESH") - private Long tmBrMesh; - - /** 拉矫机不投张力 */ - @Excel(name = "拉矫机不投张力") - @TableField("TL_NONE_TENSION") - private Long tlNoneTension; - - /** 拉矫机出口张力 */ - @Excel(name = "拉矫机出口张力") - @TableField("TL_EXIT_TENSION") - private Long tlExitTension; - - /** 拉矫机延伸率 */ - @Excel(name = "拉矫机延伸率") - @TableField("TL_ELONG") - private Long tlElong; - - /** 拉矫机矫直辊插入量1 */ - @Excel(name = "拉矫机矫直辊插入量1") - @TableField("TL_LVL_MESH1") - private Long tlLvlMesh1; - - /** 拉矫机矫直辊插入量2 */ - @Excel(name = "拉矫机矫直辊插入量2") - @TableField("TL_LVL_MESH2") - private Long tlLvlMesh2; - - /** 拉矫机防横弓插入量 */ - @Excel(name = "拉矫机防横弓插入量") - @TableField("TL_ACB_MESH") - private Long tlAcbMesh; - - /** 后处理张力 */ - @Excel(name = "后处理张力") - @TableField("COAT_TENSION") - private Long coatTension; + /** 钝化段张力 */ + @Excel(name = "钝化段张力") + private BigDecimal passivationTension; /** 出口活套张力 */ @Excel(name = "出口活套张力") - @TableField("CXL_TENSION") - private Long cxlTension; + private BigDecimal cxlTension; /** 卷取机张力 */ @Excel(name = "卷取机张力") - @TableField("TR_TENSION") - private Long trTension; + private BigDecimal trTension; - /** 类型，或可用于记录更改次数 */ - @Excel(name = "类型，或可用于记录更改次数") - @TableField("TYPE") - private Long type; + /** 平整机入口张力 */ + @Excel(name = "平整机入口张力") + private BigDecimal levelerEntryTension; - /** 预热段出口板温 */ - @Excel(name = "预热段出口板温") - @TableField("PREHEATING_SECTION") - private Float preheatingSection; + /** 平整机出口张力 */ + @Excel(name = "平整机出口张力") + private BigDecimal levelerExitTension; - /** 加热段出口板温 */ - @Excel(name = "加热段出口板温") - @TableField("HEATING_SECTION") - private Float heatingSection; + /** 矫直机出口张力 */ + @Excel(name = "矫直机出口张力") + private BigDecimal straightenerExitTension; - /** 冷却段出口板温 */ - @Excel(name = "冷却段出口板温") - @TableField("COOLING_SECTION") - private Float coolingSection; + /** 炉区张力 */ + @Excel(name = "炉区张力") + private BigDecimal furTension; + /** 冷却塔张力 */ + @Excel(name = "冷却塔张力") + private BigDecimal towerTension; + + /** 创建时间 */ + @Excel(name = "创建时间") + private Date createTime; + + /** 更新时间 */ + @Excel(name = "更新时间") + private Date updateTime; } diff --git a/business/src/main/java/com/fizz/business/domain/SetupTensionAllLine.java b/business/src/main/java/com/fizz/business/domain/SetupTensionAllLine.java new file mode 100644 index 0000000..2dc4b06 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTensionAllLine.java @@ -0,0 +1,150 @@ +package com.fizz.business.domain; + +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 全线张力对象 setup_tension_all_line + * + * 三主键：steel_grade + thick + yield_stren + */ +public class SetupTensionAllLine extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 钢种 */ + @Excel(name = "钢种") + private String steelGrade; + + /** 厚度 */ + @Excel(name = "厚度") + private Float thick; + + /** 屈服强度 */ + @Excel(name = "屈服强度") + private Float yieldStren; + + /** 开卷机张力 */ + @Excel(name = "开卷机张力") + private Float value1; + + /** 入口活套张力 */ + @Excel(name = "入口活套张力") + private Float value2; + + /** 清洗段张力 */ + @Excel(name = "清洗段张力") + private Float value3; + + /** 钝化段张力 */ + @Excel(name = "钝化段张力") + private Float value4; + + /** 出口活套张力 */ + @Excel(name = "出口活套张力") + private Float value5; + + /** 卷取机张力 */ + @Excel(name = "卷取机张力") + private Float value6; + + /** 创建时间（表字段） */ + private Date createTime; + + /** 更新时间（表字段） */ + private Date updateTime; + + public String getSteelGrade() { + return steelGrade; + } + + public void setSteelGrade(String steelGrade) { + this.steelGrade = steelGrade; + } + + public Float getThick() { + return thick; + } + + public void setThick(Float thick) { + this.thick = thick; + } + + public Float getYieldStren() { + return yieldStren; + } + + public void setYieldStren(Float yieldStren) { + this.yieldStren = yieldStren; + } + + public Float getValue1() { + return value1; + } + + public void setValue1(Float value1) { + this.value1 = value1; + } + + public Float getValue2() { + return value2; + } + + public void setValue2(Float value2) { + this.value2 = value2; + } + + public Float getValue3() { + return value3; + } + + public void setValue3(Float value3) { + this.value3 = value3; + } + + public Float getValue4() { + return value4; + } + + public void setValue4(Float value4) { + this.value4 = value4; + } + + public Float getValue5() { + return value5; + } + + public void setValue5(Float value5) { + this.value5 = value5; + } + + public Float getValue6() { + return value6; + } + + public void setValue6(Float value6) { + this.value6 = value6; + } + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Override + public Date getUpdateTime() { + return updateTime; + } + + @Override + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } +} + diff --git a/business/src/main/java/com/fizz/business/domain/SetupTensionAnnealingFurnace.java b/business/src/main/java/com/fizz/business/domain/SetupTensionAnnealingFurnace.java new file mode 100644 index 0000000..c3f16d2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTensionAnnealingFurnace.java @@ -0,0 +1,61 @@ +package com.fizz.business.domain; + +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 退火炉张力对象 setup_tension_annealing_furnace + * + * 三主键：steel_grade + thick + yield_stren + */ +public class SetupTensionAnnealingFurnace extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + @Excel(name = "钢种") + private String steelGrade; + + @Excel(name = "厚度") + private Float thick; + + @Excel(name = "屈服强度") + private Float yieldStren; + + @Excel(name = "炉区张力") + private Float value1; + + @Excel(name = "冷却塔张力") + private Float value2; + + private Date createTime; + private Date updateTime; + + public String getSteelGrade() { return steelGrade; } + public void setSteelGrade(String steelGrade) { this.steelGrade = steelGrade; } + + public Float getThick() { return thick; } + public void setThick(Float thick) { this.thick = thick; } + + public Float getYieldStren() { return yieldStren; } + public void setYieldStren(Float yieldStren) { this.yieldStren = yieldStren; } + + public Float getValue1() { return value1; } + public void setValue1(Float value1) { this.value1 = value1; } + + public Float getValue2() { return value2; } + public void setValue2(Float value2) { this.value2 = value2; } + + @Override + public Date getCreateTime() { return createTime; } + + @Override + public void setCreateTime(Date createTime) { this.createTime = createTime; } + + @Override + public Date getUpdateTime() { return updateTime; } + + @Override + public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } +} + diff --git a/business/src/main/java/com/fizz/business/domain/SetupTensionLeveler.java b/business/src/main/java/com/fizz/business/domain/SetupTensionLeveler.java new file mode 100644 index 0000000..8df3fb8 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTensionLeveler.java @@ -0,0 +1,61 @@ +package com.fizz.business.domain; + +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 平整机张力对象 setup_tension_leveler + * + * 三主键：steel_grade + thick + yield_stren + */ +public class SetupTensionLeveler extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + @Excel(name = "钢种") + private String steelGrade; + + @Excel(name = "厚度") + private Float thick; + + @Excel(name = "屈服强度") + private Float yieldStren; + + @Excel(name = "平整机入口张力") + private Float value1; + + @Excel(name = "平整机出口张力") + private Float value2; + + private Date createTime; + private Date updateTime; + + public String getSteelGrade() { return steelGrade; } + public void setSteelGrade(String steelGrade) { this.steelGrade = steelGrade; } + + public Float getThick() { return thick; } + public void setThick(Float thick) { this.thick = thick; } + + public Float getYieldStren() { return yieldStren; } + public void setYieldStren(Float yieldStren) { this.yieldStren = yieldStren; } + + public Float getValue1() { return value1; } + public void setValue1(Float value1) { this.value1 = value1; } + + public Float getValue2() { return value2; } + public void setValue2(Float value2) { this.value2 = value2; } + + @Override + public Date getCreateTime() { return createTime; } + + @Override + public void setCreateTime(Date createTime) { this.createTime = createTime; } + + @Override + public Date getUpdateTime() { return updateTime; } + + @Override + public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } +} + diff --git a/business/src/main/java/com/fizz/business/domain/SetupTensionStraightener.java b/business/src/main/java/com/fizz/business/domain/SetupTensionStraightener.java new file mode 100644 index 0000000..4a4f5c2 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTensionStraightener.java @@ -0,0 +1,55 @@ +package com.fizz.business.domain; + +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 矫直机张力对象 setup_tension_straightener + * + * 三主键：steel_grade + thick + yield_stren + */ +public class SetupTensionStraightener extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + @Excel(name = "钢种") + private String steelGrade; + + @Excel(name = "厚度") + private Float thick; + + @Excel(name = "屈服强度") + private Float yieldStren; + + @Excel(name = "矫直机出口张力") + private Float value1; + + private Date createTime; + private Date updateTime; + + public String getSteelGrade() { return steelGrade; } + public void setSteelGrade(String steelGrade) { this.steelGrade = steelGrade; } + + public Float getThick() { return thick; } + public void setThick(Float thick) { this.thick = thick; } + + public Float getYieldStren() { return yieldStren; } + public void setYieldStren(Float yieldStren) { this.yieldStren = yieldStren; } + + public Float getValue1() { return value1; } + public void setValue1(Float value1) { this.value1 = value1; } + + @Override + public Date getCreateTime() { return createTime; } + + @Override + public void setCreateTime(Date createTime) { this.createTime = createTime; } + + @Override + public Date getUpdateTime() { return updateTime; } + + @Override + public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } +} + diff --git a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java index b0418d6..de3733c 100644 --- a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java @@ -1,63 +1,16 @@ package com.fizz.business.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fizz.business.domain.PdiSetups; /** * 生产计划的参数详情Mapper接口 - * + * * @author Joshi * @date 2025-09-25 */ public interface PdiSetupMapper extends BaseMapper { - /** - * 查询生产计划的参数详情 - * - * @param id 生产计划的参数详情主键 - * @return 生产计划的参数详情 - */ - public PdiSetups selectPdiSetupById(Long id); - - /** - * 查询生产计划的参数详情列表 - * - * @param pdiSetup 生产计划的参数详情 - * @return 生产计划的参数详情集合 - */ - public List selectPdiSetupList(PdiSetups pdiSetup); - - /** - * 新增生产计划的参数详情 - * - * @param pdiSetup 生产计划的参数详情 - * @return 结果 - */ - public int insertPdiSetup(PdiSetups pdiSetup); - - /** - * 修改生产计划的参数详情 - * - * @param pdiSetup 生产计划的参数详情 - * @return 结果 - */ - public int updatePdiSetup(PdiSetups pdiSetup); - - /** - * 删除生产计划的参数详情 - * - * @param id 生产计划的参数详情主键 - * @return 结果 - */ - public int deletePdiSetupById(Long id); - - /** - * 批量删除生产计划的参数详情 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deletePdiSetupByIds(Long[] ids); + // 使用 MyBatis-Plus BaseMapper 提供基础 CRUD（含按 id 的 selectById/deleteById/updateById 等）。 } + diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionAllLineMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionAllLineMapper.java new file mode 100644 index 0000000..13b0979 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionAllLineMapper.java @@ -0,0 +1,26 @@ +package com.fizz.business.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.fizz.business.domain.SetupTensionAllLine; + +/** + * 全线张力Mapper接口 + */ +public interface SetupTensionAllLineMapper +{ + SetupTensionAllLine selectByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); + + List selectList(SetupTensionAllLine query); + + int insert(SetupTensionAllLine entity); + + int updateByKey(SetupTensionAllLine entity); + + int deleteByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionAnnealingFurnaceMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionAnnealingFurnaceMapper.java new file mode 100644 index 0000000..eda813e --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionAnnealingFurnaceMapper.java @@ -0,0 +1,26 @@ +package com.fizz.business.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.fizz.business.domain.SetupTensionAnnealingFurnace; + +/** + * 退火炉张力Mapper接口 + */ +public interface SetupTensionAnnealingFurnaceMapper +{ + SetupTensionAnnealingFurnace selectByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); + + List selectList(SetupTensionAnnealingFurnace query); + + int insert(SetupTensionAnnealingFurnace entity); + + int updateByKey(SetupTensionAnnealingFurnace entity); + + int deleteByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionLevelerMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionLevelerMapper.java new file mode 100644 index 0000000..bc677e5 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionLevelerMapper.java @@ -0,0 +1,26 @@ +package com.fizz.business.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.fizz.business.domain.SetupTensionLeveler; + +/** + * 平整机张力Mapper接口 + */ +public interface SetupTensionLevelerMapper +{ + SetupTensionLeveler selectByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); + + List selectList(SetupTensionLeveler query); + + int insert(SetupTensionLeveler entity); + + int updateByKey(SetupTensionLeveler entity); + + int deleteByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java deleted file mode 100644 index e288c12..0000000 --- a/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fizz.business.mapper; - -import java.util.List; -import com.fizz.business.domain.SetupTension; -import org.apache.ibatis.annotations.Param; - -/** - * 全线张力Mapper接口 - * - * @author ruoyi - * @date 2025-09-26 - */ -public interface SetupTensionMapper -{ - /** - * 查询全线张力 - * - * @param thick 全线张力主键 - * @return 全线张力 - */ - public SetupTension selectSetupTensionByThick(@Param("thick") Long thick,@Param("yieldStren") Long yieldStren); - - /** - * 查询全线张力列表 - * - * @param setupTension 全线张力 - * @return 全线张力集合 - */ - public List selectSetupTensionList(SetupTension setupTension); - - /** - * 新增全线张力 - * - * @param setupTension 全线张力 - * @return 结果 - */ - public int insertSetupTension(SetupTension setupTension); - - /** - * 修改全线张力 - * - * @param setupTension 全线张力 - * @return 结果 - */ - public int updateSetupTension(SetupTension setupTension); - - /** - * 删除全线张力 - * - * @param thick 全线张力主键 - * @return 结果 - */ - public int deleteSetupTensionByThick(Long thick); - - /** - * 批量删除全线张力 - * - * @param thicks 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSetupTensionByThicks(@Param("thicks") Long[] thicks,@Param("yieldStrens") Long[] yieldStrens); -} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionStraightenerMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionStraightenerMapper.java new file mode 100644 index 0000000..1fb9a76 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionStraightenerMapper.java @@ -0,0 +1,26 @@ +package com.fizz.business.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.fizz.business.domain.SetupTensionStraightener; + +/** + * 矫直机张力Mapper接口 + */ +public interface SetupTensionStraightenerMapper +{ + SetupTensionStraightener selectByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); + + List selectList(SetupTensionStraightener query); + + int insert(SetupTensionStraightener entity); + + int updateByKey(SetupTensionStraightener entity); + + int deleteByKey(@Param("steelGrade") String steelGrade, + @Param("thick") Float thick, + @Param("yieldStren") Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java deleted file mode 100644 index c251d50..0000000 --- a/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fizz.business.mapper; - -import java.util.List; -import com.fizz.business.domain.SetupTl; -import org.apache.ibatis.annotations.Param; - -/** - * 拉矫机参数Mapper接口 - * - * @author ruoyi - * @date 2025-09-26 - */ -public interface SetupTlMapper -{ - /** - * 查询拉矫机参数 - * - * @param steelGrade 拉矫机参数主键 - * @return 拉矫机参数 - */ - public SetupTl selectSetupTlBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick); - - /** - * 查询拉矫机参数列表 - * - * @param setupTl 拉矫机参数 - * @return 拉矫机参数集合 - */ - public List selectSetupTlList(SetupTl setupTl); - - /** - * 新增拉矫机参数 - * - * @param setupTl 拉矫机参数 - * @return 结果 - */ - public int insertSetupTl(SetupTl setupTl); - - /** - * 修改拉矫机参数 - * - * @param setupTl 拉矫机参数 - * @return 结果 - */ - public int updateSetupTl(SetupTl setupTl); - - /** - * 删除拉矫机参数 - * - * @param steelGrade 拉矫机参数主键 - * @return 结果 - */ - public int deleteSetupTlBySteelGrade(String steelGrade); - - /** - * 批量删除拉矫机参数 - * - * @param steelGrades 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSetupTlBySteelGrades(@Param("steelGrades") String[] steelGrades,@Param("yieldStrens") Long[] yieldStrens,@Param("thicks") Long[] thicks); -} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java deleted file mode 100644 index f4c4074..0000000 --- a/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fizz.business.mapper; - -import java.util.List; -import com.fizz.business.domain.SetupTmBendforce; -import org.apache.ibatis.annotations.Param; - -/** - * 光整机弯辊力Mapper接口 - * - * @author Joshi - * @date 2025-09-26 - */ -public interface SetupTmBendforceMapper -{ - /** - * 查询光整机弯辊力 - * - * @param width 光整机弯辊力主键 - * @return 光整机弯辊力 - */ - public SetupTmBendforce selectSetupTmBendforceByWidth(@Param("width") Long width,@Param("rollForce") Long rollForce); - - /** - * 查询光整机弯辊力列表 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 光整机弯辊力集合 - */ - public List selectSetupTmBendforceList(SetupTmBendforce setupTmBendforce); - - /** - * 新增光整机弯辊力 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 结果 - */ - public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce); - - /** - * 修改光整机弯辊力 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 结果 - */ - public int updateSetupTmBendforce(SetupTmBendforce setupTmBendforce); - - /** - * 删除光整机弯辊力 - * - * @param width 光整机弯辊力主键 - * @return 结果 - */ - public int deleteSetupTmBendforceByWidth(Long width); - - /** - * 批量删除光整机弯辊力 - * - * @param widths 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSetupTmBendforceByWidths(@Param("widths") Long[] widths,@Param("rollForces") Long[] rollForces); -} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java deleted file mode 100644 index f9a5f2a..0000000 --- a/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.fizz.business.mapper; - -import java.util.List; -import com.fizz.business.domain.SetupTmMesh; -import org.apache.ibatis.annotations.Param; - -/** - * 光整机插入量Mapper接口 - * - * @author Joshi - * @date 2025-09-26 - */ -public interface SetupTmMeshMapper -{ - /** - * 查询光整机插入量 - * - * @param steelGrade 光整机插入量主键 - * @return 光整机插入量 - */ - public SetupTmMesh selectSetupTmMeshBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick); - - /** - * 查询光整机插入量列表 - * - * @param setupTmMesh 光整机插入量 - * @return 光整机插入量集合 - */ - public List selectSetupTmMeshList(SetupTmMesh setupTmMesh); - - /** - * 新增光整机插入量 - * - * @param setupTmMesh 光整机插入量 - * @return 结果 - */ - public int insertSetupTmMesh(SetupTmMesh setupTmMesh); - - /** - * 修改光整机插入量 - * - * @param setupTmMesh 光整机插入量 - * @return 结果 - */ - public int updateSetupTmMesh(SetupTmMesh setupTmMesh); - - /** - * 删除光整机插入量 - * - * @param steelGrade 光整机插入量主键 - * @return 结果 - */ - public int deleteSetupTmMeshBySteelGrade(String steelGrade); - - /** - * 批量删除光整机插入量 - * - * @param steelGrades 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSetupTmMeshBySteelGrades(@Param("steelGrades") String[] steelGrades, - @Param("yieldStrens") Long[] yieldStrens, - @Param("thicks") Long[] thicks); -} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java deleted file mode 100644 index f6947d7..0000000 --- a/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.fizz.business.mapper; - -import java.util.List; -import com.fizz.business.domain.SetupTmRollforce; -import org.apache.ibatis.annotations.Param; - -/** - * 光整机轧制力Mapper接口 - * - * @author Joshi - * @date 2025-09-26 - */ -public interface SetupTmRollforceMapper -{ - /** - * 查询光整机轧制力 - * - * @param steelGrade 光整机轧制力主键 - * @return 光整机轧制力 - */ - public SetupTmRollforce selectSetupTmRollforceBySteelGrade(@Param("steelGrade") String steelGrade,@Param("yieldStren") Long yieldStren,@Param("thick") Long thick,@Param("elong") Long elong); - - /** - * 查询光整机轧制力列表 - * - * @param setupTmRollforce 光整机轧制力 - * @return 光整机轧制力集合 - */ - public List selectSetupTmRollforceList(SetupTmRollforce setupTmRollforce); - - /** - * 新增光整机轧制力 - * - * @param setupTmRollforce 光整机轧制力 - * @return 结果 - */ - public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce); - - /** - * 修改光整机轧制力 - * - * @param setupTmRollforce 光整机轧制力 - * @return 结果 - */ - public int updateSetupTmRollforce(SetupTmRollforce setupTmRollforce); - - /** - * 删除光整机轧制力 - * - * @param steelGrade 光整机轧制力主键 - * @return 结果 - */ - public int deleteSetupTmRollforceBySteelGrade(String steelGrade); - - /** - * 批量删除光整机轧制力 - * - * @param steelGrades 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSetupTmRollforceBySteelGrades(@Param("steelGrades") String[] steelGrades, - @Param("thicks") Long[] thicks, - @Param("yieldStrens") Long[] yieldStrens, - @Param("elongs") Long[] elongs); -} diff --git a/business/src/main/java/com/fizz/business/service/IPdiSetupService.java b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java index e575a77..9cceda5 100644 --- a/business/src/main/java/com/fizz/business/service/IPdiSetupService.java +++ b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java @@ -4,62 +4,39 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.fizz.business.domain.PdiSetups; -import com.fizz.business.domain.ProStoppage; -import com.fizz.business.domain.msg.PdiSetup; + /** * 生产计划的参数详情Service接口 - * + * * @author Joshi * @date 2025-09-25 */ public interface IPdiSetupService extends IService { /** - * 查询生产计划的参数详情 - * - * @param id 生产计划的参数详情主键 - * @return 生产计划的参数详情 + * 查询张力参数列表 */ - public PdiSetups selectPdiSetupByid(Long id); + List selectPdiSetupList(PdiSetups pdiSetup); /** - * 查询生产计划的参数详情列表 - * - * @param pdiSetup 生产计划的参数详情 - * @return 生产计划的参数详情集合 + * 按 id 查询 */ - public List selectPdiSetupList(PdiSetups pdiSetup); + PdiSetups selectPdiSetupById(Long id); /** - * 新增生产计划的参数详情 - * - * @param pdiSetup 生产计划的参数详情 - * @return 结果 + * 新增 */ - public Boolean insertPdiSetup(PdiSetups pdiSetup); + Boolean insertPdiSetup(PdiSetups pdiSetup); /** - * 修改生产计划的参数详情 - * - * @param pdiSetup 生产计划的参数详情 - * @return 结果 + * 按 id 更新 */ - public Boolean updatePdiSetup(PdiSetups pdiSetup); + Boolean updatePdiSetup(PdiSetups pdiSetup); /** - * 批量删除生产计划的参数详情 - * - * @param ids 需要删除的生产计划的参数详情主键集合 - * @return 结果 + * 按 id 批量删除 */ - public Boolean deletePdiSetupByids(Long[] ids); - - /** - * 删除生产计划的参数详情信息 - * - * @param id 生产计划的参数详情主键 - * @return 结果 - */ - public Boolean deletePdiSetupByid(Long id); + Boolean deletePdiSetupByIds(Long[] ids); } + diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionAllLineService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionAllLineService.java new file mode 100644 index 0000000..2e9d1ed --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionAllLineService.java @@ -0,0 +1,21 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTensionAllLine; + +/** + * 全线张力Service接口 + */ +public interface ISetupTensionAllLineService +{ + SetupTensionAllLine selectByKey(String steelGrade, Float thick, Float yieldStren); + + List selectList(SetupTensionAllLine query); + + int insert(SetupTensionAllLine entity); + + int updateByKey(SetupTensionAllLine entity); + + int deleteByKey(String steelGrade, Float thick, Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionAnnealingFurnaceService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionAnnealingFurnaceService.java new file mode 100644 index 0000000..7caaea6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionAnnealingFurnaceService.java @@ -0,0 +1,21 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTensionAnnealingFurnace; + +/** + * 退火炉张力Service接口 + */ +public interface ISetupTensionAnnealingFurnaceService +{ + SetupTensionAnnealingFurnace selectByKey(String steelGrade, Float thick, Float yieldStren); + + List selectList(SetupTensionAnnealingFurnace query); + + int insert(SetupTensionAnnealingFurnace entity); + + int updateByKey(SetupTensionAnnealingFurnace entity); + + int deleteByKey(String steelGrade, Float thick, Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionLevelerService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionLevelerService.java new file mode 100644 index 0000000..ee8382f --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionLevelerService.java @@ -0,0 +1,21 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTensionLeveler; + +/** + * 平整机张力Service接口 + */ +public interface ISetupTensionLevelerService +{ + SetupTensionLeveler selectByKey(String steelGrade, Float thick, Float yieldStren); + + List selectList(SetupTensionLeveler query); + + int insert(SetupTensionLeveler entity); + + int updateByKey(SetupTensionLeveler entity); + + int deleteByKey(String steelGrade, Float thick, Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java deleted file mode 100644 index 7dad000..0000000 --- a/business/src/main/java/com/fizz/business/service/ISetupTensionService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.fizz.business.service; - -import java.util.List; -import com.fizz.business.domain.SetupTension; - -/** - * 全线张力Service接口 - * - * @author ruoyi - * @date 2025-09-26 - */ -public interface ISetupTensionService -{ - /** - * 查询全线张力 - * - * @param thick 全线张力主键 - * @return 全线张力 - */ - public SetupTension selectSetupTensionByThick(Long thick,Long yieldStren); - - /** - * 查询全线张力列表 - * - * @param setupTension 全线张力 - * @return 全线张力集合 - */ - public List selectSetupTensionList(SetupTension setupTension); - - /** - * 新增全线张力 - * - * @param setupTension 全线张力 - * @return 结果 - */ - public int insertSetupTension(SetupTension setupTension); - - /** - * 修改全线张力 - * - * @param setupTension 全线张力 - * @return 结果 - */ - public int updateSetupTension(SetupTension setupTension); - - /** - * 批量删除全线张力 - * - * @param thicks 需要删除的全线张力主键集合 - * @return 结果 - */ - public int deleteSetupTensionByThicks(Long[] thicks,Long[] yieldStrens ); - - /** - * 删除全线张力信息 - * - * @param thick 全线张力主键 - * @return 结果 - */ - public int deleteSetupTensionByThick(Long thick); -} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionStraightenerService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionStraightenerService.java new file mode 100644 index 0000000..604cc8b --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionStraightenerService.java @@ -0,0 +1,21 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupTensionStraightener; + +/** + * 矫直机张力Service接口 + */ +public interface ISetupTensionStraightenerService +{ + SetupTensionStraightener selectByKey(String steelGrade, Float thick, Float yieldStren); + + List selectList(SetupTensionStraightener query); + + int insert(SetupTensionStraightener entity); + + int updateByKey(SetupTensionStraightener entity); + + int deleteByKey(String steelGrade, Float thick, Float yieldStren); +} + diff --git a/business/src/main/java/com/fizz/business/service/ISetupTlService.java b/business/src/main/java/com/fizz/business/service/ISetupTlService.java deleted file mode 100644 index 301a4a3..0000000 --- a/business/src/main/java/com/fizz/business/service/ISetupTlService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.fizz.business.service; - -import java.util.List; -import com.fizz.business.domain.SetupTl; - -/** - * 拉矫机参数Service接口 - * - * @author ruoyi - * @date 2025-09-26 - */ -public interface ISetupTlService -{ - /** - * 查询拉矫机参数 - * - * @param steelGrade 拉矫机参数主键 - * @return 拉矫机参数 - */ - public SetupTl selectSetupTlBySteelGrade(String steelGrade,Long yieldStren,Long thick); - - /** - * 查询拉矫机参数列表 - * - * @param setupTl 拉矫机参数 - * @return 拉矫机参数集合 - */ - public List selectSetupTlList(SetupTl setupTl); - - /** - * 新增拉矫机参数 - * - * @param setupTl 拉矫机参数 - * @return 结果 - */ - public int insertSetupTl(SetupTl setupTl); - - /** - * 修改拉矫机参数 - * - * @param setupTl 拉矫机参数 - * @return 结果 - */ - public int updateSetupTl(SetupTl setupTl); - - /** - * 批量删除拉矫机参数 - * - * @param steelGrades 需要删除的拉矫机参数主键集合 - * @return 结果 - */ - public int deleteSetupTlBySteelGrades(String[] steelGrades,Long[] yieldStrens,Long[] thicks); - - /** - * 删除拉矫机参数信息 - * - * @param steelGrade 拉矫机参数主键 - * @return 结果 - */ - public int deleteSetupTlBySteelGrade(String steelGrade); -} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java b/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java deleted file mode 100644 index adad3ae..0000000 --- a/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.fizz.business.service; - -import java.util.List; -import com.fizz.business.domain.SetupTmBendforce; - -/** - * 光整机弯辊力Service接口 - * - * @author Joshi - * @date 2025-09-26 - */ -public interface ISetupTmBendforceService -{ - /** - * 查询光整机弯辊力 - * - * @param width 光整机弯辊力主键 - * @return 光整机弯辊力 - */ - public SetupTmBendforce selectSetupTmBendforceByWidth(Long width,Long rollForce); - - /** - * 查询光整机弯辊力列表 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 光整机弯辊力集合 - */ - public List selectSetupTmBendforceList(SetupTmBendforce setupTmBendforce); - - /** - * 新增光整机弯辊力 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 结果 - */ - public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce); - - /** - * 修改光整机弯辊力 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 结果 - */ - public int updateSetupTmBendforce(SetupTmBendforce setupTmBendforce); - - /** - * 批量删除光整机弯辊力 - * - * @param widths 需要删除的光整机弯辊力主键集合 - * @return 结果 - */ - public int deleteSetupTmBendforceByWidths(Long[] widths,Long[] rollForces); - - /** - * 删除光整机弯辊力信息 - * - * @param width 光整机弯辊力主键 - * @return 结果 - */ - public int deleteSetupTmBendforceByWidth(Long width); -} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java b/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java deleted file mode 100644 index f289ef6..0000000 --- a/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.fizz.business.service; - -import java.util.List; -import com.fizz.business.domain.SetupTmMesh; - -/** - * 光整机插入量Service接口 - * - * @author Joshi - * @date 2025-09-26 - */ -public interface ISetupTmMeshService -{ - /** - * 查询光整机插入量 - * - * @param steelGrade 光整机插入量主键 - * @return 光整机插入量 - */ - public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade,Long yildStren,Long thick); - - /** - * 查询光整机插入量列表 - * - * @param setupTmMesh 光整机插入量 - * @return 光整机插入量集合 - */ - public List selectSetupTmMeshList(SetupTmMesh setupTmMesh); - - /** - * 新增光整机插入量 - * - * @param setupTmMesh 光整机插入量 - * @return 结果 - */ - public int insertSetupTmMesh(SetupTmMesh setupTmMesh); - - /** - * 修改光整机插入量 - * - * @param setupTmMesh 光整机插入量 - * @return 结果 - */ - public int updateSetupTmMesh(SetupTmMesh setupTmMesh); - - /** - * 批量删除光整机插入量 - * - * @param steelGrades 需要删除的光整机插入量主键集合 - * @return 结果 - */ - public int deleteSetupTmMeshBySteelGrades(String[] steelGrades,Long[] yildStrens,Long[] thicks); - - /** - * 删除光整机插入量信息 - * - * @param steelGrade 光整机插入量主键 - * @return 结果 - */ - public int deleteSetupTmMeshBySteelGrade(String steelGrade); -} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java b/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java deleted file mode 100644 index 2f27ed4..0000000 --- a/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.fizz.business.service; - -import java.util.List; -import com.fizz.business.domain.SetupTmRollforce; - -/** - * 光整机轧制力Service接口 - * - * @author Joshi - * @date 2025-09-26 - */ -public interface ISetupTmRollforceService -{ - /** - * 查询光整机轧制力 - * - * @param steelGrade 光整机轧制力主键 - * @return 光整机轧制力 - */ - public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade,Long yieldStren,Long thick,Long elong); - - /** - * 查询光整机轧制力列表 - * - * @param setupTmRollforce 光整机轧制力 - * @return 光整机轧制力集合 - */ - public List selectSetupTmRollforceList(SetupTmRollforce setupTmRollforce); - - /** - * 新增光整机轧制力 - * - * @param setupTmRollforce 光整机轧制力 - * @return 结果 - */ - public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce); - - /** - * 修改光整机轧制力 - * - * @param setupTmRollforce 光整机轧制力 - * @return 结果 - */ - public int updateSetupTmRollforce(SetupTmRollforce setupTmRollforce); - - /** - * 批量删除光整机轧制力 - * - * @param steelGrades 需要删除的光整机轧制力主键集合 - * @return 结果 - */ - public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades,Long[] yieldStrens,Long[] thicks,Long[] elongs); - - /** - * 删除光整机轧制力信息 - * - * @param steelGrade 光整机轧制力主键 - * @return 结果 - */ - public int deleteSetupTmRollforceBySteelGrade(String steelGrade); -} diff --git a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java index bbf02a2..414a8ff 100644 --- a/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/PdiSetupServiceImpl.java @@ -1,13 +1,12 @@ package com.fizz.business.service.impl; -import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.Objects; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fizz.business.mapper.PdiSetupMapper; import com.fizz.business.domain.PdiSetups; @@ -15,83 +14,48 @@ import com.fizz.business.service.IPdiSetupService; /** * 生产计划的参数详情Service业务层处理 - * + * * @author Joshi * @date 2025-09-25 */ @Service public class PdiSetupServiceImpl extends ServiceImpl implements IPdiSetupService { - /** - * 查询生产计划的参数详情 - * - * @param id 生产计划的参数详情主键 - * @return 生产计划的参数详情 - */ + @Override - public PdiSetups selectPdiSetupByid(Long id) - { - return baseMapper.selectById(id); + public List selectPdiSetupList(PdiSetups pdiSetup) { + return lambdaQuery() + .eq(StrUtil.isNotBlank(pdiSetup.getCoilid()), PdiSetups::getCoilid, pdiSetup.getCoilid()) + .eq(StrUtil.isNotBlank(pdiSetup.getPlanid()), PdiSetups::getPlanid, pdiSetup.getPlanid()) + .eq(StrUtil.isNotBlank(pdiSetup.getSteelGrade()), PdiSetups::getSteelGrade, pdiSetup.getSteelGrade()) + .eq(Objects.nonNull(pdiSetup.getThick()), PdiSetups::getThick, pdiSetup.getThick()) + .eq(Objects.nonNull(pdiSetup.getYieldStren()), PdiSetups::getYieldStren, pdiSetup.getYieldStren()) + .orderByDesc(PdiSetups::getUpdateTime) + .list(); } - /** - * 查询生产计划的参数详情列表 - * - * @param pdiSetup 生产计划的参数详情 - * @return 生产计划的参数详情 - */ @Override - public List selectPdiSetupList(PdiSetups pdiSetup) - { - QueryWrapper queryWrapper = new QueryWrapper<>(pdiSetup); - queryWrapper.orderByDesc("create_time"); - return baseMapper.selectList(queryWrapper); + public PdiSetups selectPdiSetupById(Long id) { + return getById(id); } - /** - * 新增生产计划的参数详情 - * - * @param pdiSetup 生产计划的参数详情 - * @return 结果 - */ @Override - public Boolean insertPdiSetup(PdiSetups pdiSetup) - { - return this.save(pdiSetup); + public Boolean insertPdiSetup(PdiSetups pdiSetup) { + pdiSetup.setCreateTime(ObjectUtil.defaultIfNull(pdiSetup.getCreateTime(), new Date())); + pdiSetup.setUpdateTime(new Date()); + return save(pdiSetup); } - /** - * 修改生产计划的参数详情 - * - * @param pdiSetup 生产计划的参数详情 - * @return 结果 - */ @Override - public Boolean updatePdiSetup(PdiSetups pdiSetup) - { - return this.updateById(pdiSetup); + public Boolean updatePdiSetup(PdiSetups pdiSetup) { + if (pdiSetup.getId() == null) { + throw new IllegalArgumentException("When updating the tension parameter, the id cannot be empty"); + } + pdiSetup.setUpdateTime(new Date()); + return updateById(pdiSetup); } - /** - * 批量删除生产计划的参数详情 - * - * @param ids 需要删除的生产计划的参数详情主键 - * @return 结果 - */ @Override - public Boolean deletePdiSetupByids(Long[] ids) - { - return this.removeByIds(Arrays.asList(ids)); - } - - /** - * 删除生产计划的参数详情信息 - * - * @param id 生产计划的参数详情主键 - * @return 结果 - */ - @Override - public Boolean deletePdiSetupByid(Long id) - { - return this.removeById(id); + public Boolean deletePdiSetupByIds(Long[] ids) { + return removeByIds(java.util.Arrays.asList(ids)); } } diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionAllLineServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionAllLineServiceImpl.java new file mode 100644 index 0000000..6f330ea --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionAllLineServiceImpl.java @@ -0,0 +1,59 @@ +package com.fizz.business.service.impl; + +import java.util.List; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.fizz.business.domain.SetupTensionAllLine; +import com.fizz.business.mapper.SetupTensionAllLineMapper; +import com.fizz.business.service.ISetupTensionAllLineService; + +/** + * 全线张力Service业务层处理 + */ +@Service +public class SetupTensionAllLineServiceImpl implements ISetupTensionAllLineService +{ + @Autowired + private SetupTensionAllLineMapper mapper; + + @Override + public SetupTensionAllLine selectByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.selectByKey(steelGrade, thick, yieldStren); + } + + @Override + public List selectList(SetupTensionAllLine query) + { + return mapper.selectList(query); + } + + @Override + public int insert(SetupTensionAllLine entity) + { + // 三主键存在则禁止新增 + if (mapper.selectByKey(entity.getSteelGrade(), entity.getThick(), entity.getYieldStren()) != null) { + throw new RuntimeException("该参数已存在"); + } + entity.setCreateTime(DateUtils.getNowDate()); + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.insert(entity); + } + + @Override + public int updateByKey(SetupTensionAllLine entity) + { + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.updateByKey(entity); + } + + @Override + public int deleteByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.deleteByKey(steelGrade, thick, yieldStren); + } +} + diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionAnnealingFurnaceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionAnnealingFurnaceServiceImpl.java new file mode 100644 index 0000000..48d5cdb --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionAnnealingFurnaceServiceImpl.java @@ -0,0 +1,58 @@ +package com.fizz.business.service.impl; + +import java.util.List; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.fizz.business.domain.SetupTensionAnnealingFurnace; +import com.fizz.business.mapper.SetupTensionAnnealingFurnaceMapper; +import com.fizz.business.service.ISetupTensionAnnealingFurnaceService; + +/** + * 退火炉张力Service业务层处理 + */ +@Service +public class SetupTensionAnnealingFurnaceServiceImpl implements ISetupTensionAnnealingFurnaceService +{ + @Autowired + private SetupTensionAnnealingFurnaceMapper mapper; + + @Override + public SetupTensionAnnealingFurnace selectByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.selectByKey(steelGrade, thick, yieldStren); + } + + @Override + public List selectList(SetupTensionAnnealingFurnace query) + { + return mapper.selectList(query); + } + + @Override + public int insert(SetupTensionAnnealingFurnace entity) + { + if (mapper.selectByKey(entity.getSteelGrade(), entity.getThick(), entity.getYieldStren()) != null) { + throw new RuntimeException("This parameter already exists"); + } + entity.setCreateTime(DateUtils.getNowDate()); + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.insert(entity); + } + + @Override + public int updateByKey(SetupTensionAnnealingFurnace entity) + { + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.updateByKey(entity); + } + + @Override + public int deleteByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.deleteByKey(steelGrade, thick, yieldStren); + } +} + diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionLevelerServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionLevelerServiceImpl.java new file mode 100644 index 0000000..3158e9e --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionLevelerServiceImpl.java @@ -0,0 +1,58 @@ +package com.fizz.business.service.impl; + +import java.util.List; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.fizz.business.domain.SetupTensionLeveler; +import com.fizz.business.mapper.SetupTensionLevelerMapper; +import com.fizz.business.service.ISetupTensionLevelerService; + +/** + * 平整机张力Service业务层处理 + */ +@Service +public class SetupTensionLevelerServiceImpl implements ISetupTensionLevelerService +{ + @Autowired + private SetupTensionLevelerMapper mapper; + + @Override + public SetupTensionLeveler selectByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.selectByKey(steelGrade, thick, yieldStren); + } + + @Override + public List selectList(SetupTensionLeveler query) + { + return mapper.selectList(query); + } + + @Override + public int insert(SetupTensionLeveler entity) + { + if (mapper.selectByKey(entity.getSteelGrade(), entity.getThick(), entity.getYieldStren()) != null) { + throw new RuntimeException("This parameter already exists"); + } + entity.setCreateTime(DateUtils.getNowDate()); + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.insert(entity); + } + + @Override + public int updateByKey(SetupTensionLeveler entity) + { + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.updateByKey(entity); + } + + @Override + public int deleteByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.deleteByKey(steelGrade, thick, yieldStren); + } +} + diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java deleted file mode 100644 index 264a76c..0000000 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fizz.business.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fizz.business.mapper.SetupTensionMapper; -import com.fizz.business.domain.SetupTension; -import com.fizz.business.service.ISetupTensionService; - -/** - * 全线张力Service业务层处理 - * - * @author ruoyi - * @date 2025-09-26 - */ -@Service -public class SetupTensionServiceImpl implements ISetupTensionService -{ - @Autowired - private SetupTensionMapper setupTensionMapper; - - /** - * 查询全线张力 - * - * @param thick 全线张力主键 - * @return 全线张力 - */ - @Override - public SetupTension selectSetupTensionByThick(Long thick,Long yieldStren) - { - return setupTensionMapper.selectSetupTensionByThick(thick,yieldStren); - } - - /** - * 查询全线张力列表 - * - * @param setupTension 全线张力 - * @return 全线张力 - */ - @Override - public List selectSetupTensionList(SetupTension setupTension) - { - return setupTensionMapper.selectSetupTensionList(setupTension); - } - - /** - * 新增全线张力 - * - * @param setupTension 全线张力 - * @return 结果 - */ - @Override - public int insertSetupTension(SetupTension setupTension) - { - //如果thick 和 yield_stren已存在那么就不需要插入 - if(setupTensionMapper.selectSetupTensionByThick(setupTension.getThick(), setupTension.getYieldStren()) != null){ - throw new RuntimeException("The parameter already exists."); - } - setupTension.setCreateTime(DateUtils.getNowDate()); - return setupTensionMapper.insertSetupTension(setupTension); - } - - /** - * 修改全线张力 - * - * @param setupTension 全线张力 - * @return 结果 - */ - @Override - public int updateSetupTension(SetupTension setupTension) - { - setupTension.setUpdateTime(DateUtils.getNowDate()); - return setupTensionMapper.updateSetupTension(setupTension); - } - - /** - * 批量删除全线张力 - * - * @param thicks 需要删除的全线张力主键 - * @return 结果 - */ - @Override - public int deleteSetupTensionByThicks(Long[] thicks,Long[] yieldStrens) - { - return setupTensionMapper.deleteSetupTensionByThicks(thicks,yieldStrens); - } - - /** - * 删除全线张力信息 - * - * @param thick 全线张力主键 - * @return 结果 - */ - @Override - public int deleteSetupTensionByThick(Long thick) - { - return setupTensionMapper.deleteSetupTensionByThick(thick); - } -} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTensionStraightenerServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTensionStraightenerServiceImpl.java new file mode 100644 index 0000000..44d32d9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionStraightenerServiceImpl.java @@ -0,0 +1,58 @@ +package com.fizz.business.service.impl; + +import java.util.List; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.fizz.business.domain.SetupTensionStraightener; +import com.fizz.business.mapper.SetupTensionStraightenerMapper; +import com.fizz.business.service.ISetupTensionStraightenerService; + +/** + * 矫直机张力Service业务层处理 + */ +@Service +public class SetupTensionStraightenerServiceImpl implements ISetupTensionStraightenerService +{ + @Autowired + private SetupTensionStraightenerMapper mapper; + + @Override + public SetupTensionStraightener selectByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.selectByKey(steelGrade, thick, yieldStren); + } + + @Override + public List selectList(SetupTensionStraightener query) + { + return mapper.selectList(query); + } + + @Override + public int insert(SetupTensionStraightener entity) + { + if (mapper.selectByKey(entity.getSteelGrade(), entity.getThick(), entity.getYieldStren()) != null) { + throw new RuntimeException("This parameter already exists"); + } + entity.setCreateTime(DateUtils.getNowDate()); + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.insert(entity); + } + + @Override + public int updateByKey(SetupTensionStraightener entity) + { + entity.setUpdateTime(DateUtils.getNowDate()); + return mapper.updateByKey(entity); + } + + @Override + public int deleteByKey(String steelGrade, Float thick, Float yieldStren) + { + return mapper.deleteByKey(steelGrade, thick, yieldStren); + } +} + diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java deleted file mode 100644 index 5f8eb4f..0000000 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fizz.business.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fizz.business.mapper.SetupTlMapper; -import com.fizz.business.domain.SetupTl; -import com.fizz.business.service.ISetupTlService; - -/** - * 拉矫机参数Service业务层处理 - * - * @author ruoyi - * @date 2025-09-26 - */ -@Service -public class SetupTlServiceImpl implements ISetupTlService -{ - @Autowired - private SetupTlMapper setupTlMapper; - - /** - * 查询拉矫机参数 - * - * @param steelGrade 拉矫机参数主键 - * @return 拉矫机参数 - */ - @Override - public SetupTl selectSetupTlBySteelGrade(String steelGrade, Long yieldStren, Long thick) - { - return setupTlMapper.selectSetupTlBySteelGrade(steelGrade, yieldStren, thick); - } - - /** - * 查询拉矫机参数列表 - * - * @param setupTl 拉矫机参数 - * @return 拉矫机参数 - */ - @Override - public List selectSetupTlList(SetupTl setupTl) - { - return setupTlMapper.selectSetupTlList(setupTl); - } - - /** - * 新增拉矫机参数 - * - * @param setupTl 拉矫机参数 - * @return 结果 - */ - @Override - public int insertSetupTl(SetupTl setupTl) - { - setupTl.setCreateTime(DateUtils.getNowDate()); - return setupTlMapper.insertSetupTl(setupTl); - } - - /** - * 修改拉矫机参数 - * - * @param setupTl 拉矫机参数 - * @return 结果 - */ - @Override - public int updateSetupTl(SetupTl setupTl) - { - //如果thick 和 yield_stren已存在那么就不需要插入 - if(setupTlMapper.selectSetupTlBySteelGrade(setupTl.getSteelGrade(), setupTl.getYieldStren(), setupTl.getThick()) != null){ - throw new RuntimeException("The parameter already exists."); - } - setupTl.setUpdateTime(DateUtils.getNowDate()); - return setupTlMapper.updateSetupTl(setupTl); - } - - /** - * 批量删除拉矫机参数 - * - * @param steelGrades 需要删除的拉矫机参数主键 - * @return 结果 - */ - @Override - public int deleteSetupTlBySteelGrades(String[] steelGrades,Long[] yieldStres,Long[] thicks) - { - return setupTlMapper.deleteSetupTlBySteelGrades(steelGrades, yieldStres, thicks); - } - - /** - * 删除拉矫机参数信息 - * - * @param steelGrade 拉矫机参数主键 - * @return 结果 - */ - @Override - public int deleteSetupTlBySteelGrade(String steelGrade) - { - return setupTlMapper.deleteSetupTlBySteelGrade(steelGrade); - } -} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java deleted file mode 100644 index ff09fc4..0000000 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fizz.business.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fizz.business.mapper.SetupTmBendforceMapper; -import com.fizz.business.domain.SetupTmBendforce; -import com.fizz.business.service.ISetupTmBendforceService; - -/** - * 光整机弯辊力Service业务层处理 - * - * @author Joshi - * @date 2025-09-26 - */ -@Service -public class SetupTmBendforceServiceImpl implements ISetupTmBendforceService -{ - @Autowired - private SetupTmBendforceMapper setupTmBendforceMapper; - - /** - * 查询光整机弯辊力 - * - * @param width 光整机弯辊力主键 - * @return 光整机弯辊力 - */ - @Override - public SetupTmBendforce selectSetupTmBendforceByWidth(Long width,Long rollForce) - { - return setupTmBendforceMapper.selectSetupTmBendforceByWidth(width,rollForce); - } - - /** - * 查询光整机弯辊力列表 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 光整机弯辊力 - */ - @Override - public List selectSetupTmBendforceList(SetupTmBendforce setupTmBendforce) - { - return setupTmBendforceMapper.selectSetupTmBendforceList(setupTmBendforce); - } - - /** - * 新增光整机弯辊力 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 结果 - */ - @Override - public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce) - { - // 如果width 和 rollForce 在表里已存在则不能新增 - if (setupTmBendforceMapper.selectSetupTmBendforceByWidth(setupTmBendforce.getWidth(),setupTmBendforce.getRollForce()) != null) { - throw new RuntimeException("The parameter already exists."); - } - setupTmBendforce.setCreateTime(DateUtils.getNowDate()); - return setupTmBendforceMapper.insertSetupTmBendforce(setupTmBendforce); - } - - /** - * 修改光整机弯辊力 - * - * @param setupTmBendforce 光整机弯辊力 - * @return 结果 - */ - @Override - public int updateSetupTmBendforce(SetupTmBendforce setupTmBendforce) - { - setupTmBendforce.setUpdateTime(DateUtils.getNowDate()); - return setupTmBendforceMapper.updateSetupTmBendforce(setupTmBendforce); - } - - /** - * 批量删除光整机弯辊力 - * - * @param widths 需要删除的光整机弯辊力主键 - * @return 结果 - */ - @Override - public int deleteSetupTmBendforceByWidths(Long[] widths,Long[] rollForces) - { - return setupTmBendforceMapper.deleteSetupTmBendforceByWidths(widths,rollForces); - } - - /** - * 删除光整机弯辊力信息 - * - * @param width 光整机弯辊力主键 - * @return 结果 - */ - @Override - public int deleteSetupTmBendforceByWidth(Long width) - { - return setupTmBendforceMapper.deleteSetupTmBendforceByWidth(width); - } -} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java deleted file mode 100644 index 4dd22ec..0000000 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fizz.business.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fizz.business.mapper.SetupTmMeshMapper; -import com.fizz.business.domain.SetupTmMesh; -import com.fizz.business.service.ISetupTmMeshService; - -/** - * 光整机插入量Service业务层处理 - * - * @author Joshi - * @date 2025-09-26 - */ -@Service -public class SetupTmMeshServiceImpl implements ISetupTmMeshService -{ - @Autowired - private SetupTmMeshMapper setupTmMeshMapper; - - /** - * 查询光整机插入量 - * - * @param steelGrade 光整机插入量主键 - * @return 光整机插入量 - */ - @Override - public SetupTmMesh selectSetupTmMeshBySteelGrade(String steelGrade, Long yieldStren, Long thick) - { - return setupTmMeshMapper.selectSetupTmMeshBySteelGrade(steelGrade, yieldStren, thick); - } - - /** - * 查询光整机插入量列表 - * - * @param setupTmMesh 光整机插入量 - * @return 光整机插入量 - */ - @Override - public List selectSetupTmMeshList(SetupTmMesh setupTmMesh) - { - return setupTmMeshMapper.selectSetupTmMeshList(setupTmMesh); - } - - /** - * 新增光整机插入量 - * - * @param setupTmMesh 光整机插入量 - * @return 结果 - */ - @Override - public int insertSetupTmMesh(SetupTmMesh setupTmMesh) - { - // 如果steelGrade,yieldStren,thick 在表里已存在则不能新增 - if (setupTmMeshMapper.selectSetupTmMeshBySteelGrade(setupTmMesh.getSteelGrade(), setupTmMesh.getYieldStren(), setupTmMesh.getThick()) != null) { - throw new RuntimeException("The parameter already exists."); - } - setupTmMesh.setCreateTime(DateUtils.getNowDate()); - return setupTmMeshMapper.insertSetupTmMesh(setupTmMesh); - } - - /** - * 修改光整机插入量 - * - * @param setupTmMesh 光整机插入量 - * @return 结果 - */ - @Override - public int updateSetupTmMesh(SetupTmMesh setupTmMesh) - { - setupTmMesh.setUpdateTime(DateUtils.getNowDate()); - return setupTmMeshMapper.updateSetupTmMesh(setupTmMesh); - } - - /** - * 批量删除光整机插入量 - * - * @param steelGrades 需要删除的光整机插入量主键 - * @return 结果 - */ - @Override - public int deleteSetupTmMeshBySteelGrades(String[] steelGrades, Long[] yieldStrens, Long[] thicks) - { - return setupTmMeshMapper.deleteSetupTmMeshBySteelGrades(steelGrades, yieldStrens, thicks); - } - - /** - * 删除光整机插入量信息 - * - * @param steelGrade 光整机插入量主键 - * @return 结果 - */ - @Override - public int deleteSetupTmMeshBySteelGrade(String steelGrade) - { - return setupTmMeshMapper.deleteSetupTmMeshBySteelGrade(steelGrade); - } -} diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java deleted file mode 100644 index 23fca66..0000000 --- a/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fizz.business.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fizz.business.mapper.SetupTmRollforceMapper; -import com.fizz.business.domain.SetupTmRollforce; -import com.fizz.business.service.ISetupTmRollforceService; - -/** - * 光整机轧制力Service业务层处理 - * - * @author Joshi - * @date 2025-09-26 - */ -@Service -public class SetupTmRollforceServiceImpl implements ISetupTmRollforceService -{ - @Autowired - private SetupTmRollforceMapper setupTmRollforceMapper; - - /** - * 查询光整机轧制力 - * - * @param steelGrade 光整机轧制力主键 - * @return 光整机轧制力 - */ - @Override - public SetupTmRollforce selectSetupTmRollforceBySteelGrade(String steelGrade, Long yieldStren, Long thick, Long elong) - { - return setupTmRollforceMapper.selectSetupTmRollforceBySteelGrade(steelGrade, yieldStren, thick, elong); - } - - /** - * 查询光整机轧制力列表 - * - * @param setupTmRollforce 光整机轧制力 - * @return 光整机轧制力 - */ - @Override - public List selectSetupTmRollforceList(SetupTmRollforce setupTmRollforce) - { - return setupTmRollforceMapper.selectSetupTmRollforceList(setupTmRollforce); - } - - /** - * 新增光整机轧制力 - * - * @param setupTmRollforce 光整机轧制力 - * @return 结果 - */ - @Override - public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce) - { - //如果steelGrade,yieldStren,thick,elong 在表里已存在则不能新增 - if (setupTmRollforceMapper.selectSetupTmRollforceBySteelGrade(setupTmRollforce.getSteelGrade(), setupTmRollforce.getYieldStren(), setupTmRollforce.getThick(), setupTmRollforce.getElong()) != null) { - throw new RuntimeException("The parameter already exists."); - } - setupTmRollforce.setCreateTime(DateUtils.getNowDate()); - return setupTmRollforceMapper.insertSetupTmRollforce(setupTmRollforce); - } - - /** - * 修改光整机轧制力 - * - * @param setupTmRollforce 光整机轧制力 - * @return 结果 - */ - @Override - public int updateSetupTmRollforce(SetupTmRollforce setupTmRollforce) - { - setupTmRollforce.setUpdateTime(DateUtils.getNowDate()); - return setupTmRollforceMapper.updateSetupTmRollforce(setupTmRollforce); - } - - /** - * 批量删除光整机轧制力 - * - * @param steelGrades 需要删除的光整机轧制力主键 - * @return 结果 - */ - @Override - public int deleteSetupTmRollforceBySteelGrades(String[] steelGrades, Long[] thicks, Long[] yieldStrens, Long[] elongs) - { - return setupTmRollforceMapper.deleteSetupTmRollforceBySteelGrades(steelGrades, thicks, yieldStrens, elongs); - } - - /** - * 删除光整机轧制力信息 - * - * @param steelGrade 光整机轧制力主键 - * @return 结果 - */ - @Override - public int deleteSetupTmRollforceBySteelGrade(String steelGrade) - { - return setupTmRollforceMapper.deleteSetupTmRollforceBySteelGrade(steelGrade); - } -} diff --git a/business/src/main/resources/mapper/PdiSetupMapper.xml b/business/src/main/resources/mapper/PdiSetupMapper.xml index dba055a..410176d 100644 --- a/business/src/main/resources/mapper/PdiSetupMapper.xml +++ b/business/src/main/resources/mapper/PdiSetupMapper.xml @@ -4,178 +4,167 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - select ID, COILID, PLANID, POR_TENSION, CEL_TENSION, CLEAN_TENSION, FUR_TENSION, TOWER_TENSION, TM_NONE_TENSION, TM_ENTRY_TENSION, TM_EXIT_TENSION, TM_ROLLFORCE, TM_BENDFORCE, TM_ACR_MESH, TM_BR_MESH, TL_NONE_TENSION, TL_EXIT_TENSION, TL_ELONG, TL_LVL_MESH1, TL_LVL_MESH2, TL_ACB_MESH, COAT_TENSION, CXL_TENSION, TR_TENSION, CREATE_TIME, UPDATE_TIME, TYPE from pdi_setup + + id, + coilid, + planid, + steel_grade, + thick, + yield_stren, + por_tension, + cel_tension, + clean_tension, + passivation_tension, + cxl_tension, + tr_tension, + leveler_entry_tension, + leveler_exit_tension, + straightener_exit_tension, + fur_tension, + tower_tension, + create_time, + update_time - + select + + from pdi_setup - and COILID = #{COILID} - and PLANID = #{PLANID} - and POR_TENSION = #{porTension} - and CEL_TENSION = #{celTension} - and CLEAN_TENSION = #{cleanTension} - and FUR_TENSION = #{furTension} - and TOWER_TENSION = #{towerTension} - and TM_NONE_TENSION = #{tmNoneTension} - and TM_ENTRY_TENSION = #{tmEntryTension} - and TM_EXIT_TENSION = #{tmExitTension} - and TM_ROLLFORCE = #{tmRollforce} - and TM_BENDFORCE = #{tmBendforce} - and TM_ACR_MESH = #{tmAcrMesh} - and TM_BR_MESH = #{tmBrMesh} - and TL_NONE_TENSION = #{tlNoneTension} - and TL_EXIT_TENSION = #{tlExitTension} - and TL_ELONG = #{tlElong} - and TL_LVL_MESH1 = #{tlLvlMesh1} - and TL_LVL_MESH2 = #{tlLvlMesh2} - and TL_ACB_MESH = #{tlAcbMesh} - and COAT_TENSION = #{coatTension} - and CXL_TENSION = #{cxlTension} - and TR_TENSION = #{trTension} - and CREATE_TIME = #{createTime} - and UPDATE_TIME = #{updateTime} - and TYPE = #{TYPE} + and coilid = #{coilid} + and planid = #{planid} + and steel_grade = #{steelGrade} + and thick = #{thick} + and yield_stren = #{yieldStren} + order by update_time desc - + select + + from pdi_setup + where id = #{id} - + + insert into pdi_setup - COILID, - PLANID, - POR_TENSION, - CEL_TENSION, - CLEAN_TENSION, - FUR_TENSION, - TOWER_TENSION, - TM_NONE_TENSION, - TM_ENTRY_TENSION, - TM_EXIT_TENSION, - TM_ROLLFORCE, - TM_BENDFORCE, - TM_ACR_MESH, - TM_BR_MESH, - TL_NONE_TENSION, - TL_EXIT_TENSION, - TL_ELONG, - TL_LVL_MESH1, - TL_LVL_MESH2, - TL_ACB_MESH, - COAT_TENSION, - CXL_TENSION, - TR_TENSION, - CREATE_TIME, - UPDATE_TIME, - TYPE, + coilid, + planid, + steel_grade, + thick, + yield_stren, + + por_tension, + cel_tension, + clean_tension, + passivation_tension, + cxl_tension, + tr_tension, + leveler_entry_tension, + leveler_exit_tension, + straightener_exit_tension, + fur_tension, + tower_tension, + + create_time, + update_time, - #{COILID}, - #{PLANID}, + #{coilid}, + #{planid}, + #{steelGrade}, + #{thick}, + #{yieldStren}, + #{porTension}, #{celTension}, #{cleanTension}, - #{furTension}, - #{towerTension}, - #{tmNoneTension}, - #{tmEntryTension}, - #{tmExitTension}, - #{tmRollforce}, - #{tmBendforce}, - #{tmAcrMesh}, - #{tmBrMesh}, - #{tlNoneTension}, - #{tlExitTension}, - #{tlElong}, - #{tlLvlMesh1}, - #{tlLvlMesh2}, - #{tlAcbMesh}, - #{coatTension}, + #{passivationTension}, #{cxlTension}, #{trTension}, + #{levelerEntryTension}, + #{levelerExitTension}, + #{straightenerExitTension}, + #{furTension}, + #{towerTension}, + #{createTime}, #{updateTime}, - #{TYPE}, - + update pdi_setup - COILID = #{COILID}, - PLANID = #{PLANID}, - POR_TENSION = #{porTension}, - CEL_TENSION = #{celTension}, - CLEAN_TENSION = #{cleanTension}, - FUR_TENSION = #{furTension}, - TOWER_TENSION = #{towerTension}, - TM_NONE_TENSION = #{tmNoneTension}, - TM_ENTRY_TENSION = #{tmEntryTension}, - TM_EXIT_TENSION = #{tmExitTension}, - TM_ROLLFORCE = #{tmRollforce}, - TM_BENDFORCE = #{tmBendforce}, - TM_ACR_MESH = #{tmAcrMesh}, - TM_BR_MESH = #{tmBrMesh}, - TL_NONE_TENSION = #{tlNoneTension}, - TL_EXIT_TENSION = #{tlExitTension}, - TL_ELONG = #{tlElong}, - TL_LVL_MESH1 = #{tlLvlMesh1}, - TL_LVL_MESH2 = #{tlLvlMesh2}, - TL_ACB_MESH = #{tlAcbMesh}, - COAT_TENSION = #{coatTension}, - CXL_TENSION = #{cxlTension}, - TR_TENSION = #{trTension}, - CREATE_TIME = #{createTime}, - UPDATE_TIME = #{updateTime}, - TYPE = #{TYPE}, + coilid = #{coilid}, + planid = #{planid}, + steel_grade = #{steelGrade}, + thick = #{thick}, + yield_stren = #{yieldStren}, + + por_tension = #{porTension}, + cel_tension = #{celTension}, + clean_tension = #{cleanTension}, + passivation_tension = #{passivationTension}, + cxl_tension = #{cxlTension}, + tr_tension = #{trTension}, + leveler_entry_tension = #{levelerEntryTension}, + leveler_exit_tension = #{levelerExitTension}, + straightener_exit_tension = #{straightenerExitTension}, + fur_tension = #{furTension}, + tower_tension = #{towerTension}, + + create_time = #{createTime}, + update_time = #{updateTime}, - where ID = #{ID} + where id = #{id} - - delete from pdi_setup where ID = #{id} + + delete from pdi_setup where id = #{id} - - delete from pdi_setup where ID in - + + delete from pdi_setup where id in + #{id} - \ No newline at end of file + + diff --git a/business/src/main/resources/mapper/SetupTensionAllLineMapper.xml b/business/src/main/resources/mapper/SetupTensionAllLineMapper.xml new file mode 100644 index 0000000..8d74c53 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionAllLineMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + select steel_grade, thick, yield_stren, value1, value2, value3, value4, value5, value6, create_time, update_time from setup_tension_all_line + + + + + + + + insert into setup_tension_all_line + + steel_grade, + thick, + yield_stren, + value1, + value2, + value3, + value4, + value5, + value6, + create_time, + update_time, + + + #{steelGrade}, + #{thick}, + #{yieldStren}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{createTime}, + #{updateTime}, + + + + + update setup_tension_all_line + + value1 = #{value1}, + value2 = #{value2}, + value3 = #{value3}, + value4 = #{value4}, + value5 = #{value5}, + value6 = #{value6}, + update_time = #{updateTime}, + + where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + + + delete from setup_tension_all_line where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + diff --git a/business/src/main/resources/mapper/SetupTensionAnnealingFurnaceMapper.xml b/business/src/main/resources/mapper/SetupTensionAnnealingFurnaceMapper.xml new file mode 100644 index 0000000..bf2a075 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionAnnealingFurnaceMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + select steel_grade, thick, yield_stren, value1, value2, create_time, update_time from setup_tension_annealing_furnace + + + + + + + + insert into setup_tension_annealing_furnace + + steel_grade, + thick, + yield_stren, + value1, + value2, + create_time, + update_time, + + + #{steelGrade}, + #{thick}, + #{yieldStren}, + #{value1}, + #{value2}, + #{createTime}, + #{updateTime}, + + + + + update setup_tension_annealing_furnace + + value1 = #{value1}, + value2 = #{value2}, + update_time = #{updateTime}, + + where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + + + delete from setup_tension_annealing_furnace where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + diff --git a/business/src/main/resources/mapper/SetupTensionLevelerMapper.xml b/business/src/main/resources/mapper/SetupTensionLevelerMapper.xml new file mode 100644 index 0000000..e3efd6e --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionLevelerMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + select steel_grade, thick, yield_stren, value1, value2, create_time, update_time from setup_tension_leveler + + + + + + + + insert into setup_tension_leveler + + steel_grade, + thick, + yield_stren, + value1, + value2, + create_time, + update_time, + + + #{steelGrade}, + #{thick}, + #{yieldStren}, + #{value1}, + #{value2}, + #{createTime}, + #{updateTime}, + + + + + update setup_tension_leveler + + value1 = #{value1}, + value2 = #{value2}, + update_time = #{updateTime}, + + where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + + + delete from setup_tension_leveler where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + diff --git a/business/src/main/resources/mapper/SetupTensionMapper.xml b/business/src/main/resources/mapper/SetupTensionMapper.xml deleted file mode 100644 index e354acb..0000000 --- a/business/src/main/resources/mapper/SetupTensionMapper.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select thick, yield_stren, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, create_time, update_time from setup_tension - - - - - - - - insert into setup_tension - - thick, - yield_stren, - value1, - value2, - value3, - value4, - value5, - value6, - value7, - value8, - value9, - value10, - value11, - value12, - value13, - value14, - value15, - create_time, - update_time, - - - #{thick}, - #{yieldStren}, - #{value1}, - #{value2}, - #{value3}, - #{value4}, - #{value5}, - #{value6}, - #{value7}, - #{value8}, - #{value9}, - #{value10}, - #{value11}, - #{value12}, - #{value13}, - #{value14}, - #{value15}, - #{createTime}, - #{updateTime}, - - - - - update setup_tension - - value1 = #{value1}, - value2 = #{value2}, - value3 = #{value3}, - value4 = #{value4}, - value5 = #{value5}, - value6 = #{value6}, - value7 = #{value7}, - value8 = #{value8}, - value9 = #{value9}, - value10 = #{value10}, - value11 = #{value11}, - value12 = #{value12}, - value13 = #{value13}, - value14 = #{value14}, - value15 = #{value15}, - create_time = #{createTime}, - update_time = #{updateTime}, - - where thick = #{thick} and yield_stren = #{yieldStren} - - - - delete from setup_tension where thick = #{thick} - - - - delete from setup_tension - where - - thick = #{thicks[${index}]} - AND yield_stren = #{yieldStrens[${index}]} - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTensionStraightenerMapper.xml b/business/src/main/resources/mapper/SetupTensionStraightenerMapper.xml new file mode 100644 index 0000000..f20ac51 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionStraightenerMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + select steel_grade, thick, yield_stren, value1, create_time, update_time from setup_tension_straightener + + + + + + + + insert into setup_tension_straightener + + steel_grade, + thick, + yield_stren, + value1, + create_time, + update_time, + + + #{steelGrade}, + #{thick}, + #{yieldStren}, + #{value1}, + #{createTime}, + #{updateTime}, + + + + + update setup_tension_straightener + + value1 = #{value1}, + update_time = #{updateTime}, + + where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + + + delete from setup_tension_straightener where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} + + diff --git a/business/src/main/resources/mapper/SetupTlMapper.xml b/business/src/main/resources/mapper/SetupTlMapper.xml deleted file mode 100644 index 33854de..0000000 --- a/business/src/main/resources/mapper/SetupTlMapper.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select steel_grade, yield_stren, thick, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_tl - - - - - - - - insert into setup_tl - - steel_grade, - yield_stren, - thick, - value1, - value2, - value3, - value4, - value5, - value6, - value7, - value8, - value9, - value10, - update_time, - create_time, - - - #{steelGrade}, - #{yieldStren}, - #{thick}, - #{value1}, - #{value2}, - #{value3}, - #{value4}, - #{value5}, - #{value6}, - #{value7}, - #{value8}, - #{value9}, - #{value10}, - #{updateTime}, - #{createTime}, - - - - - update setup_tl - - value1 = #{value1}, - value2 = #{value2}, - value3 = #{value3}, - value4 = #{value4}, - value5 = #{value5}, - value6 = #{value6}, - value7 = #{value7}, - value8 = #{value8}, - value9 = #{value9}, - value10 = #{value10}, - update_time = #{updateTime}, - create_time = #{createTime}, - - where steel_grade = #{steelGrade} and yield_stren = #{yieldStren} and thick = #{thick} - - - - delete from setup_tl where steel_grade = #{steelGrade} - - - - DELETE FROM setup_tl - WHERE - - steel_grade = #{steelGrades[${index}]} - AND yield_stren = #{yieldStrens[${index}]} - AND thick = #{thicks[${index}]} - - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml deleted file mode 100644 index cf6dba8..0000000 --- a/business/src/main/resources/mapper/SetupTmBendforceMapper.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - select width, roll_force, value1, value2, value3, value4, update_time, create_time from setup_tm_bendforce - - - - - - - - insert into setup_tm_bendforce - - width, - roll_force, - value1, - value2, - value3, - value4, - update_time, - create_time, - - - #{width}, - #{rollForce}, - #{value1}, - #{value2}, - #{value3}, - #{value4}, - #{updateTime}, - #{createTime}, - - - - - update setup_tm_bendforce - - value1 = #{value1}, - value2 = #{value2}, - value3 = #{value3}, - value4 = #{value4}, - update_time = #{updateTime}, - create_time = #{createTime}, - - where width = #{width} and roll_force = #{rollForce} - - - - delete from setup_tm_bendforce where width = #{width} - - - - DELETE FROM setup_tm_bendforce - WHERE - - width = #{widths[${index}]} - AND roll_force = #{rollForces[${index}]} - - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmMeshMapper.xml b/business/src/main/resources/mapper/SetupTmMeshMapper.xml deleted file mode 100644 index 3e86e79..0000000 --- a/business/src/main/resources/mapper/SetupTmMeshMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select steel_grade, yield_stren, thick, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_tm_mesh - - - - - - - - insert into setup_tm_mesh - - steel_grade, - yield_stren, - thick, - value1, - value2, - value3, - value4, - value5, - value6, - value7, - value8, - value9, - value10, - update_time, - create_time, - - - #{steelGrade}, - #{yieldStren}, - #{thick}, - #{value1}, - #{value2}, - #{value3}, - #{value4}, - #{value5}, - #{value6}, - #{value7}, - #{value8}, - #{value9}, - #{value10}, - #{updateTime}, - #{createTime}, - - - - - update setup_tm_mesh - - value1 = #{value1}, - value2 = #{value2}, - value3 = #{value3}, - value4 = #{value4}, - value5 = #{value5}, - value6 = #{value6}, - value7 = #{value7}, - value8 = #{value8}, - value9 = #{value9}, - value10 = #{value10}, - update_time = #{updateTime}, - create_time = #{createTime}, - - where steel_grade = #{steelGrade} and yield_stren = #{yieldStren} and thick = #{thick} - - - - delete from setup_tm_mesh where steel_grade = #{steelGrade} - - - - DELETE FROM setup_tm_mesh - WHERE - - thick = #{thicks[${index}]} - AND steel_grade = #{steelGrades[${index}]} - AND yield_stren = #{yieldStrens[${index}]} - - - - \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml deleted file mode 100644 index 6784683..0000000 --- a/business/src/main/resources/mapper/SetupTmRollforceMapper.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select steel_grade, thick, yield_stren, elong, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_tm_rollforce - - - - - - - - insert into setup_tm_rollforce - - steel_grade, - thick, - yield_stren, - elong, - value1, - value2, - value3, - value4, - value5, - value6, - value7, - value8, - value9, - value10, - update_time, - create_time, - - - #{steelGrade}, - #{thick}, - #{yieldStren}, - #{elong}, - #{value1}, - #{value2}, - #{value3}, - #{value4}, - #{value5}, - #{value6}, - #{value7}, - #{value8}, - #{value9}, - #{value10}, - #{updateTime}, - #{createTime}, - - - - - update setup_tm_rollforce - - value1 = #{value1}, - value2 = #{value2}, - value3 = #{value3}, - value4 = #{value4}, - value5 = #{value5}, - value6 = #{value6}, - value7 = #{value7}, - value8 = #{value8}, - value9 = #{value9}, - value10 = #{value10}, - update_time = #{updateTime}, - create_time = #{createTime}, - - where steel_grade = #{steelGrade} and thick = #{thick} and yield_stren = #{yieldStren} and elong = #{elong} - - - - delete from setup_tm_rollforce where steel_grade = #{steelGrade} - - - - DELETE FROM setup_tm_rollforce - WHERE - - thick = #{thicks[${index}]} - AND steel_grade = #{steelGrades[${index}]} - AND yield_stren = #{yieldStrens[${index}]} - AND elong = #{elongs[${index}]} - - - - \ No newline at end of file