diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/ApifoxUploaderProjectSetting.xml b/.idea/ApifoxUploaderProjectSetting.xml new file mode 100644 index 0000000..cde3cbe --- /dev/null +++ b/.idea/ApifoxUploaderProjectSetting.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b081600 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..ba84fb8 --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,446 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..f6651fd --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c48ef6b --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..36638b4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/controller/PdiSetupController.java b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java new file mode 100644 index 0000000..cf1a008 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/PdiSetupController.java @@ -0,0 +1,93 @@ +package com.fizz.business.controller; + +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; +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 + */ +@RestController +@RequestMapping("/business/setup") +public class PdiSetupController extends BaseController +{ + @Autowired + private IPdiSetupService pdiSetupService; + + /** + * 查询生产计划的参数详情列表 + */ + @PostMapping("/list") + public TableDataInfo list(@RequestBody PdiSetups pdiSetup) + { + startPage(); + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + return getDataTable(list); + } + + /** + * 导出生产计划的参数详情列表 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PdiSetups pdiSetup) + { + List list = pdiSetupService.selectPdiSetupList(pdiSetup); + ExcelUtil util = new ExcelUtil(PdiSetups.class); + util.exportExcel(response, list, "生产计划的参数详情数据"); + } + + /** + * 获取生产计划的参数详情详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(pdiSetupService.selectPdiSetupByid(id)); + } + + /** + * 新增生产计划的参数详情 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PdiSetups pdiSetup) + { + return toAjax(pdiSetupService.insertPdiSetup(pdiSetup)); + } + + /** + * 修改生产计划的参数详情 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PdiSetups pdiSetup) + { + return toAjax(pdiSetupService.updatePdiSetup(pdiSetup)); + } + + /** + * 删除生产计划的参数详情 + */ + @Log(title = "生产计划的参数详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(pdiSetupService.deletePdiSetupByids(ids)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java index e4f0e6c..a7b031b 100644 --- a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java +++ b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java @@ -45,4 +45,10 @@ public class ProStoppageController { public R> list(@RequestBody ProStoppageForm form) { return R.ok(proStoppageService.listAll(form)); } + //计算停机次数停机时长 作业率 + @PostMapping("/calc") + @Operation(summary ="计算停机次数停机时长 作业率") + public R> calc(@RequestBody ProStoppageForm form) { + return R.ok(proStoppageService.calc(form)); + } } diff --git a/business/src/main/java/com/fizz/business/controller/SetupFurTempController.java b/business/src/main/java/com/fizz/business/controller/SetupFurTempController.java new file mode 100644 index 0000000..77910a9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupFurTempController.java @@ -0,0 +1,104 @@ +package com.fizz.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +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.SetupFurTemp; +import com.fizz.business.service.ISetupFurTempService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 炉火段工艺参数Controller + * + * @author ruoyi + * @date 2025-09-29 + */ +@RestController +@RequestMapping("/business/fur") +public class SetupFurTempController extends BaseController +{ + @Autowired + private ISetupFurTempService setupFurTempService; + + /** + * 查询炉火段工艺参数列表 + */ + @PreAuthorize("@ss.hasPermi('business:fur:list')") + @GetMapping("/list") + public TableDataInfo list(SetupFurTemp setupFurTemp) + { + startPage(); + List list = setupFurTempService.selectSetupFurTempList(setupFurTemp); + return getDataTable(list); + } + + /** + * 导出炉火段工艺参数列表 + */ + @PreAuthorize("@ss.hasPermi('business:fur:export')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SetupFurTemp setupFurTemp) + { + List list = setupFurTempService.selectSetupFurTempList(setupFurTemp); + ExcelUtil util = new ExcelUtil(SetupFurTemp.class); + util.exportExcel(response, list, "炉火段工艺参数数据"); + } + + /** + * 获取炉火段工艺参数详细信息 + */ + @PreAuthorize("@ss.hasPermi('business:fur:query')") + @GetMapping(value = "/{steelGrade}") + public AjaxResult getInfo(@PathVariable("steelGrade") String steelGrade) + { + return success(setupFurTempService.selectSetupFurTempBySteelGrade(steelGrade)); + } + + /** + * 新增炉火段工艺参数 + */ + @PreAuthorize("@ss.hasPermi('business:fur:add')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SetupFurTemp setupFurTemp) + { + return toAjax(setupFurTempService.insertSetupFurTemp(setupFurTemp)); + } + + /** + * 修改炉火段工艺参数 + */ + @PreAuthorize("@ss.hasPermi('business:fur:edit')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SetupFurTemp setupFurTemp) + { + return toAjax(setupFurTempService.updateSetupFurTemp(setupFurTemp)); + } + + /** + * 删除炉火段工艺参数 + */ + @PreAuthorize("@ss.hasPermi('business:fur:remove')") + @Log(title = "炉火段工艺参数", businessType = BusinessType.DELETE) + @DeleteMapping("/{steelGrades}") + public AjaxResult remove(@PathVariable String[] steelGrades) + { + return toAjax(setupFurTempService.deleteSetupFurTempBySteelGrades(steelGrades)); + } +} diff --git a/business/src/main/java/com/fizz/business/controller/SetupTensionController.java b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java new file mode 100644 index 0000000..0010a8b --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTensionController.java @@ -0,0 +1,95 @@ +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 Long thick ,@RequestParam 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/SetupTlController.java b/business/src/main/java/com/fizz/business/controller/SetupTlController.java new file mode 100644 index 0000000..711ea5f --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTlController.java @@ -0,0 +1,96 @@ +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 new file mode 100644 index 0000000..d3b4905 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmBendforceController.java @@ -0,0 +1,96 @@ +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 new file mode 100644 index 0000000..c9c942e --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmMeshController.java @@ -0,0 +1,98 @@ +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 new file mode 100644 index 0000000..5ea5c48 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/SetupTmRollforceController.java @@ -0,0 +1,100 @@ +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/controller/SteelGradeInfoController.java b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java index 830f2e2..4544562 100644 --- a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java +++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java @@ -58,7 +58,7 @@ public class SteelGradeInfoController { queryWrapper.eq(StdAlloy::getGradeid, gradeid); // 只查询 gradeId 和 name 字段 // 查询 StdAlloy 数据 - StdAlloy stdAlloyList = steelGradeInfoService.getById(queryWrapper); + StdAlloy stdAlloyList = steelGradeInfoService.getById(gradeid); // 返回结果 return R.ok(stdAlloyList); diff --git a/business/src/main/java/com/fizz/business/domain/PdiSetups.java b/business/src/main/java/com/fizz/business/domain/PdiSetups.java new file mode 100644 index 0000000..7a28873 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/PdiSetups.java @@ -0,0 +1,166 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import 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; + +/** + * 生产计划的参数详情对象 pdi_setup + * + * @author Joshi + * @date 2025-09-25 + */ +@Data +@TableName("pdi_setup") +public class PdiSetups implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + @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 = "开卷机张力") + @TableField("POR_TENSION") + private Long porTension; + + /** 入口活套张力 */ + @Excel(name = "入口活套张力") + @TableField("CEL_TENSION") + private Long celTension; + + /** 清洗段张力 */ + @Excel(name = "清洗段张力") + @TableField("CLEAN_TENSION") + private Long 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 = "出口活套张力") + @TableField("CXL_TENSION") + private Long cxlTension; + + /** 卷取机张力 */ + @Excel(name = "卷取机张力") + @TableField("TR_TENSION") + private Long trTension; + + /** 类型，或可用于记录更改次数 */ + @Excel(name = "类型，或可用于记录更改次数") + @TableField("TYPE") + private Long type; + + /** 预热段出口板温 */ + @Excel(name = "预热段出口板温") + @TableField("PREHEATING_SECTION") + private Float preheatingSection; + + /** 加热段出口板温 */ + @Excel(name = "加热段出口板温") + @TableField("HEATING_SECTION") + private Float heatingSection; + + /** 冷却段出口板温 */ + @Excel(name = "冷却段出口板温") + @TableField("COOLING_SECTION") + private Float coolingSection; + +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupFurTemp.java b/business/src/main/java/com/fizz/business/domain/SetupFurTemp.java new file mode 100644 index 0000000..c4d9dcd --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupFurTemp.java @@ -0,0 +1,172 @@ +package com.fizz.business.domain; + +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; + +/** + * 炉火段工艺参数对象 setup_fur_temp + * + * @author ruoyi + * @date 2025-09-29 + */ +public class SetupFurTemp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** 预热段出口板温 */ + @Excel(name = "预热段出口板温") + private Long value1; + + /** 加热段出口板温 */ + @Excel(name = "加热段出口板温") + private Long value2; + + /** 冷却段出口板温 */ + @Excel(name = "冷却段出口板温") + private Long value3; + + /** $column.columnComment */ + private Long value4; + + /** $column.columnComment */ + private Long value5; + + /** $column.columnComment */ + private Long value6; + + /** $column.columnComment */ + private Long value7; + + /** $column.columnComment */ + private Long value8; + + /** $column.columnComment */ + private Long value9; + + /** $column.columnComment */ + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTension.java b/business/src/main/java/com/fizz/business/domain/SetupTension.java new file mode 100644 index 0000000..c440d5d --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTension.java @@ -0,0 +1,262 @@ +package com.fizz.business.domain; + +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; + +/** + * 全线张力对象 setup_tension + * + * @author ruoyi + * @date 2025-09-26 + */ +public class SetupTension extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long thick; + + /** 强度 */ + private Long yieldStren; + + /** 开卷机张力 */ + @Excel(name = "开卷机张力") + private Long value1; + + /** 入口活套 */ + @Excel(name = "入口活套") + private Long value2; + + /** 清洗段 */ + @Excel(name = "清洗段") + private Long value3; + + /** 炉区张力 */ + @Excel(name = "炉区张力") + private Long value4; + + /** 冷却塔 */ + @Excel(name = "冷却塔") + private Long value5; + + /** 光整机-不投 */ + @Excel(name = "光整机-不投") + private Long value6; + + /** 光整机入口 */ + @Excel(name = "光整机入口") + private Long value7; + + /** 光整机出口 */ + @Excel(name = "光整机出口") + private Long value8; + + /** 拉矫机-不投 */ + @Excel(name = "拉矫机-不投") + private Long value9; + + /** 拉矫机出口 */ + @Excel(name = "拉矫机出口") + private Long value10; + + /** 后处理 */ + @Excel(name = "后处理") + private Long value11; + + /** 出口活套 */ + @Excel(name = "出口活套") + private Long value12; + + /** 卷取机 */ + @Excel(name = "卷取机") + private Long value13; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value14; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value15; + + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + public void setValue11(Long value11) + { + this.value11 = value11; + } + + public Long getValue11() + { + return value11; + } + public void setValue12(Long value12) + { + this.value12 = value12; + } + + public Long getValue12() + { + return value12; + } + public void setValue13(Long value13) + { + this.value13 = value13; + } + + public Long getValue13() + { + return value13; + } + public void setValue14(Long value14) + { + this.value14 = value14; + } + + public Long getValue14() + { + return value14; + } + public void setValue15(Long value15) + { + this.value15 = value15; + } + + public Long getValue15() + { + return value15; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("thick", getThick()) + .append("yieldStren", getYieldStren()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("value11", getValue11()) + .append("value12", getValue12()) + .append("value13", getValue13()) + .append("value14", getValue14()) + .append("value15", getValue15()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTl.java b/business/src/main/java/com/fizz/business/domain/SetupTl.java new file mode 100644 index 0000000..a9d9e68 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTl.java @@ -0,0 +1,205 @@ +package com.fizz.business.domain; + +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; + +/** + * 拉矫机参数对象 setup_tl + * + * @author ruoyi + * @date 2025-09-26 + */ +public class SetupTl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** $column.columnComment */ + private Long yieldStren; + + /** $column.columnComment */ + private Long thick; + + /** 延伸率 */ + @Excel(name = "延伸率") + private Long value1; + + /** 矫直辊插入量1 */ + @Excel(name = "矫直辊插入量1") + private Long value2; + + /** 矫直辊插入量2 */ + @Excel(name = "矫直辊插入量2") + private Long value3; + + /** 防横弓插入量 */ + @Excel(name = "防横弓插入量") + private Long value4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value5; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value6; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value7; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value8; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value9; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("yieldStren", getYieldStren()) + .append("thick", getThick()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java b/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java new file mode 100644 index 0000000..2446848 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmBendforce.java @@ -0,0 +1,108 @@ +package com.fizz.business.domain; + +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; + +/** + * 光整机弯辊力对象 setup_tm_bendforce + * + * @author Joshi + * @date 2025-09-26 + */ +public class SetupTmBendforce extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 宽度 */ + private Long width; + + /** 轧制力 */ + private Long rollForce; + + /** 弯辊力 */ + @Excel(name = "弯辊力") + private Long value1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value4; + + public void setWidth(Long width) + { + this.width = width; + } + + public Long getWidth() + { + return width; + } + public void setRollForce(Long rollForce) + { + this.rollForce = rollForce; + } + + public Long getRollForce() + { + return rollForce; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("width", getWidth()) + .append("rollForce", getRollForce()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java b/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java new file mode 100644 index 0000000..b50bf91 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmMesh.java @@ -0,0 +1,205 @@ +package com.fizz.business.domain; + +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; + +/** + * 光整机插入量对象 setup_tm_mesh + * + * @author Joshi + * @date 2025-09-26 + */ +public class SetupTmMesh extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** $column.columnComment */ + private Long yieldStren; + + /** $column.columnComment */ + private Long thick; + + /** 防皱辊插入量 */ + @Excel(name = "防皱辊插入量") + private Long value1; + + /** 防颤辊插入量 */ + @Excel(name = "防颤辊插入量") + private Long value2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value5; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value6; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value7; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value8; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value9; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("yieldStren", getYieldStren()) + .append("thick", getThick()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java b/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java new file mode 100644 index 0000000..5ba1a86 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/SetupTmRollforce.java @@ -0,0 +1,218 @@ +package com.fizz.business.domain; + +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; + +/** + * 光整机轧制力对象 setup_tm_rollforce + * + * @author Joshi + * @date 2025-09-26 + */ +public class SetupTmRollforce extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String steelGrade; + + /** $column.columnComment */ + private Long thick; + + /** $column.columnComment */ + private Long yieldStren; + + /** 延伸率 */ + private Long elong; + + /** 轧制力 */ + @Excel(name = "轧制力") + private Long value1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value5; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value6; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value7; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value8; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value9; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long value10; + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + public void setThick(Long thick) + { + this.thick = thick; + } + + public Long getThick() + { + return thick; + } + public void setYieldStren(Long yieldStren) + { + this.yieldStren = yieldStren; + } + + public Long getYieldStren() + { + return yieldStren; + } + public void setElong(Long elong) + { + this.elong = elong; + } + + public Long getElong() + { + return elong; + } + public void setValue1(Long value1) + { + this.value1 = value1; + } + + public Long getValue1() + { + return value1; + } + public void setValue2(Long value2) + { + this.value2 = value2; + } + + public Long getValue2() + { + return value2; + } + public void setValue3(Long value3) + { + this.value3 = value3; + } + + public Long getValue3() + { + return value3; + } + public void setValue4(Long value4) + { + this.value4 = value4; + } + + public Long getValue4() + { + return value4; + } + public void setValue5(Long value5) + { + this.value5 = value5; + } + + public Long getValue5() + { + return value5; + } + public void setValue6(Long value6) + { + this.value6 = value6; + } + + public Long getValue6() + { + return value6; + } + public void setValue7(Long value7) + { + this.value7 = value7; + } + + public Long getValue7() + { + return value7; + } + public void setValue8(Long value8) + { + this.value8 = value8; + } + + public Long getValue8() + { + return value8; + } + public void setValue9(Long value9) + { + this.value9 = value9; + } + + public Long getValue9() + { + return value9; + } + public void setValue10(Long value10) + { + this.value10 = value10; + } + + public Long getValue10() + { + return value10; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("steelGrade", getSteelGrade()) + .append("thick", getThick()) + .append("yieldStren", getYieldStren()) + .append("elong", getElong()) + .append("value1", getValue1()) + .append("value2", getValue2()) + .append("value3", getValue3()) + .append("value4", getValue4()) + .append("value5", getValue5()) + .append("value6", getValue6()) + .append("value7", getValue7()) + .append("value8", getValue8()) + .append("value9", getValue9()) + .append("value10", getValue10()) + .append("updateTime", getUpdateTime()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/StdAlloy.java b/business/src/main/java/com/fizz/business/domain/StdAlloy.java index 51f083d..a8c259b 100644 --- a/business/src/main/java/com/fizz/business/domain/StdAlloy.java +++ b/business/src/main/java/com/fizz/business/domain/StdAlloy.java @@ -1,36 +1,83 @@ package com.fizz.business.domain; - +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; - import java.time.LocalDateTime; @Data public class StdAlloy { - private Integer gradeid; // GRADEID - private String name; // NAME - private Integer origin; // ORIGIN - private Float sigma0; // SIGMA0 - private Float firstSigma0; // FIRST_SIGMA0 - private Float initSigma; // INIT_SIGMA - private Float ro; // RO - private Integer classId; // CLASSID - private Float a; // A - private Float b; // B - private Float c; // C - private Float d; // D - private Float kc0; // KC0 - private Float kc1; // KC1 - private Float kc2; // KC2 - private Float kc3; // KC3 - private Float kc4; // KC4 - private Float nu; // NU - private Float e; // E - private Float chal; // CHAL - private Float temp0; // TEMP0 - private Float strength; // STRENGTH - private Integer weldCode; // WELD_CODE - private LocalDateTime insDate; // INSDATE + @TableId("GRADEID") + private Integer gradeid; // 对应数据库字段 GRADEID + + @TableField("NAME") + private String name; // 对应数据库字段 NAME + + @TableField("ORIGIN") + private Integer origin; // 对应数据库字段 ORIGIN + + @TableField("SIGMA0") + private Float sigma0; // 对应数据库字段 SIGMA0 + + @TableField("FIRST_SIGMA0") + private Float firstSigma0; // 对应数据库字段 FIRST_SIGMA0 + + @TableField("INIT_SIGMA") + private Float initSigma; // 对应数据库字段 INIT_SIGMA + + @TableField("RO") + private Float ro; // 对应数据库字段 RO + + @TableField("CLASSID") + private Integer classId; // 对应数据库字段 CLASSID + + @TableField("A") + private Float a; // 对应数据库字段 A + + @TableField("B") + private Float b; // 对应数据库字段 B + + @TableField("C") + private Float c; // 对应数据库字段 C + + @TableField("D") + private Float d; // 对应数据库字段 D + + @TableField("KC0") + private Float kc0; // 对应数据库字段 KC0 + + @TableField("KC1") + private Float kc1; // 对应数据库字段 KC1 + + @TableField("KC2") + private Float kc2; // 对应数据库字段 KC2 + + @TableField("KC3") + private Float kc3; // 对应数据库字段 KC3 + + @TableField("KC4") + private Float kc4; // 对应数据库字段 KC4 + + @TableField("NU") + private Float nu; // 对应数据库字段 NU + + @TableField("E") + private Float e; // 对应数据库字段 E + + @TableField("CHAL") + private Float chal; // 对应数据库字段 CHAL + + @TableField("TEMP0") + private Float temp0; // 对应数据库字段 TEMP0 + + @TableField("STRENGTH") + private Float strength; // 对应数据库字段 STRENGTH + + @TableField("WELD_CODE") + private Integer weldCode; // 对应数据库字段 WELD_CODE + + @TableField("INSDATE") + private LocalDateTime insDate; // 对应数据库字段 INSDATE } diff --git a/business/src/main/java/com/fizz/business/form/TensionDeleteForm.java b/business/src/main/java/com/fizz/business/form/TensionDeleteForm.java new file mode 100644 index 0000000..cf45605 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TensionDeleteForm.java @@ -0,0 +1,12 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 全线张力删除参数封装类 + */ +@Data +public class TensionDeleteForm { + private Long[] thicks; + private Long[] yieldStrens; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/form/TlDeleteForm.java b/business/src/main/java/com/fizz/business/form/TlDeleteForm.java new file mode 100644 index 0000000..bdf1ebc --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TlDeleteForm.java @@ -0,0 +1,13 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 拉矫机参数删除参数封装类 + */ +@Data +public class TlDeleteForm { + private String[] steelGrades; + private Long[] yieldStrens; + private Long[] thicks; +} diff --git a/business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java b/business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java new file mode 100644 index 0000000..b4d579d --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TmBendforceDeleteForm.java @@ -0,0 +1,12 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 光整机弯辊力删除参数封装类 + */ +@Data +public class TmBendforceDeleteForm { + private Long[] widths; + private Long[] rollForces; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java b/business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java new file mode 100644 index 0000000..9a5c0dd --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TmMeshDeleteForm.java @@ -0,0 +1,13 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 光整机插入量删除参数封装类 + */ +@Data +public class TmMeshDeleteForm { + private String[] steelGrades; + private Long[] yieldStrens; + private Long[] thicks; +} diff --git a/business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java b/business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java new file mode 100644 index 0000000..b028131 --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/TmRollforceDeleteForm.java @@ -0,0 +1,14 @@ +package com.fizz.business.form; + +import lombok.Data; + +/** + * 光整机轧制力删除参数封装类 + */ +@Data +public class TmRollforceDeleteForm { + private String[] steelGrades; + private Long[] thicks; + private Long[] yieldStrens; + private Long[] elongs; +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java new file mode 100644 index 0000000..b0418d6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/PdiSetupMapper.java @@ -0,0 +1,63 @@ +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); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java new file mode 100644 index 0000000..6fd7301 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupFurTempMapper.java @@ -0,0 +1,61 @@ +package com.fizz.business.mapper; + +import java.util.List; +import com.fizz.business.domain.SetupFurTemp; + +/** + * 炉火段工艺参数Mapper接口 + * + * @author ruoyi + * @date 2025-09-29 + */ +public interface SetupFurTempMapper +{ + /** + * 查询炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 炉火段工艺参数 + */ + public SetupFurTemp selectSetupFurTempBySteelGrade(String steelGrade); + + /** + * 查询炉火段工艺参数列表 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 炉火段工艺参数集合 + */ + public List selectSetupFurTempList(SetupFurTemp setupFurTemp); + + /** + * 新增炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int insertSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 修改炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int updateSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 删除炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrade(String steelGrade); + + /** + * 批量删除炉火段工艺参数 + * + * @param steelGrades 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrades(String[] steelGrades); +} diff --git a/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java new file mode 100644 index 0000000..e288c12 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTensionMapper.java @@ -0,0 +1,62 @@ +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/SetupTlMapper.java b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java new file mode 100644 index 0000000..c251d50 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTlMapper.java @@ -0,0 +1,62 @@ +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 new file mode 100644 index 0000000..f4c4074 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmBendforceMapper.java @@ -0,0 +1,62 @@ +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 new file mode 100644 index 0000000..f9a5f2a --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmMeshMapper.java @@ -0,0 +1,64 @@ +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 new file mode 100644 index 0000000..f6947d7 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/SetupTmRollforceMapper.java @@ -0,0 +1,65 @@ +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 new file mode 100644 index 0000000..e575a77 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/IPdiSetupService.java @@ -0,0 +1,65 @@ +package com.fizz.business.service; + +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); + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情集合 + */ + public List selectPdiSetupList(PdiSetups pdiSetup); + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public Boolean insertPdiSetup(PdiSetups pdiSetup); + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + public Boolean updatePdiSetup(PdiSetups pdiSetup); + + /** + * 批量删除生产计划的参数详情 + * + * @param ids 需要删除的生产计划的参数详情主键集合 + * @return 结果 + */ + public Boolean deletePdiSetupByids(Long[] ids); + + /** + * 删除生产计划的参数详情信息 + * + * @param id 生产计划的参数详情主键 + * @return 结果 + */ + public Boolean deletePdiSetupByid(Long id); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupFurTempService.java b/business/src/main/java/com/fizz/business/service/ISetupFurTempService.java new file mode 100644 index 0000000..56b43a6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupFurTempService.java @@ -0,0 +1,61 @@ +package com.fizz.business.service; + +import java.util.List; +import com.fizz.business.domain.SetupFurTemp; + +/** + * 炉火段工艺参数Service接口 + * + * @author ruoyi + * @date 2025-09-29 + */ +public interface ISetupFurTempService +{ + /** + * 查询炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 炉火段工艺参数 + */ + public SetupFurTemp selectSetupFurTempBySteelGrade(String steelGrade); + + /** + * 查询炉火段工艺参数列表 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 炉火段工艺参数集合 + */ + public List selectSetupFurTempList(SetupFurTemp setupFurTemp); + + /** + * 新增炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int insertSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 修改炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + public int updateSetupFurTemp(SetupFurTemp setupFurTemp); + + /** + * 批量删除炉火段工艺参数 + * + * @param steelGrades 需要删除的炉火段工艺参数主键集合 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrades(String[] steelGrades); + + /** + * 删除炉火段工艺参数信息 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 结果 + */ + public int deleteSetupFurTempBySteelGrade(String steelGrade); +} diff --git a/business/src/main/java/com/fizz/business/service/ISetupTensionService.java b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java new file mode 100644 index 0000000..7dad000 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTensionService.java @@ -0,0 +1,61 @@ +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/ISetupTlService.java b/business/src/main/java/com/fizz/business/service/ISetupTlService.java new file mode 100644 index 0000000..301a4a3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTlService.java @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000..adad3ae --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTmBendforceService.java @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000..f289ef6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTmMeshService.java @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000..2f27ed4 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ISetupTmRollforceService.java @@ -0,0 +1,61 @@ +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/ProStoppageService.java b/business/src/main/java/com/fizz/business/service/ProStoppageService.java index 06267a3..5b5f19f 100644 --- a/business/src/main/java/com/fizz/business/service/ProStoppageService.java +++ b/business/src/main/java/com/fizz/business/service/ProStoppageService.java @@ -16,4 +16,5 @@ public interface ProStoppageService extends IService { boolean deleteProStoppage(Long stopid); + List calc(ProStoppageForm form); } diff --git a/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java b/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java index 7fdc0c6..6467804 100644 --- a/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java +++ b/business/src/main/java/com/fizz/business/service/client/RedisCacheManager.java @@ -18,6 +18,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; @@ -40,12 +41,15 @@ public class RedisCacheManager { RedisTemplate segmentRedisTemplate; @Autowired + @Qualifier("redisTemplateOfMatmap") RedisTemplate matmapRedisTemplate; @Autowired + @Qualifier("redisTemplateOfHead") RedisTemplate headRedisTemplate; @Autowired + @Qualifier("redisTemplateOfCoilPos") RedisTemplate coilPosRedisTemplate; @Autowired @@ -144,7 +148,39 @@ public class RedisCacheManager { } public List getMatmapList() { - return matmapRedisTemplate.opsForList().range(COIL_MATMAP_LIST_KEY, 0, -1); + List rawList = matmapRedisTemplate.opsForList().range(COIL_MATMAP_LIST_KEY, 0, -1); + if (rawList == null) { + return null; + } + + List result = new ArrayList<>(); + for (Object item : rawList) { + if (item == null) { + result.add(null); + continue; + } + + // 如果是LinkedHashMap，转换为MatmapDTO + if (item instanceof java.util.LinkedHashMap) { + try { + MatmapDTO dto = BeanUtil.toBean((java.util.LinkedHashMap) item, MatmapDTO.class); + result.add(dto); + } catch (Exception e) { + log.error("Failed to convert LinkedHashMap to MatmapDTO: {}", e.getMessage()); + result.add(null); + } + } + // 如果已经是MatmapDTO，直接添加 + else if (item instanceof MatmapDTO) { + result.add((MatmapDTO) item); + } + else { + log.warn("Unexpected type in Redis list: {}", item.getClass().getName()); + result.add(null); + } + } + + return result; } public void setMatmap(int index, MatmapDTO matmap) { @@ -152,7 +188,28 @@ public class RedisCacheManager { } public MatmapDTO getMatmap(int index) { - return matmapRedisTemplate.opsForList().index(COIL_MATMAP_LIST_KEY, index); + Object result = matmapRedisTemplate.opsForList().index(COIL_MATMAP_LIST_KEY, index); + if (result == null) { + return null; + } + + // 如果是LinkedHashMap，转换为MatmapDTO + if (result instanceof java.util.LinkedHashMap) { + try { + return BeanUtil.toBean((java.util.LinkedHashMap) result, MatmapDTO.class); + } catch (Exception e) { + log.error("Failed to convert LinkedHashMap to MatmapDTO: {}", e.getMessage()); + return null; + } + } + + // 如果已经是MatmapDTO，直接返回 + if (result instanceof MatmapDTO) { + return (MatmapDTO) result; + } + + log.warn("Unexpected type in Redis: {}", result.getClass().getName()); + return null; } public List getHeadList() { diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java index 94940fc..7d37326 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java @@ -153,10 +153,15 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl implements IPdiSetupService { + /** + * 查询生产计划的参数详情 + * + * @param id 生产计划的参数详情主键 + * @return 生产计划的参数详情 + */ + @Override + public PdiSetups selectPdiSetupByid(Long id) + { + return baseMapper.selectById(id); + } + + /** + * 查询生产计划的参数详情列表 + * + * @param pdiSetup 生产计划的参数详情 + * @return 生产计划的参数详情 + */ + @Override + public List selectPdiSetupList(PdiSetups pdiSetup) + { + QueryWrapper queryWrapper = new QueryWrapper<>(pdiSetup); + queryWrapper.orderByDesc("create_time"); + return baseMapper.selectList(queryWrapper); + } + + /** + * 新增生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + @Override + public Boolean insertPdiSetup(PdiSetups pdiSetup) + { + return this.save(pdiSetup); + } + + /** + * 修改生产计划的参数详情 + * + * @param pdiSetup 生产计划的参数详情 + * @return 结果 + */ + @Override + public Boolean updatePdiSetup(PdiSetups pdiSetup) + { + return this.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); + } +} diff --git a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java index 814ca69..0517243 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java @@ -1,5 +1,6 @@ package com.fizz.business.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fizz.business.domain.ProStoppage; @@ -10,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -45,4 +47,40 @@ public class ProStoppageServiceImpl extends ServiceImpl calc(ProStoppageForm form) { + // 构建查询条件，筛选指定时间范围内的停机记录 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00") + .le("end_date", form.getEndDate() + " 23:59:59"); + + // 查询符合条件的停机记录列表 + List stoppageList = baseMapper.selectList(queryWrapper); + + // 计算停机次数 + int stopCount = stoppageList.size(); + + // 计算停机总时长（单位：小时，保留两位小数） + BigDecimal totalStopDuration = BigDecimal.ZERO; + for (ProStoppage stoppage : stoppageList) { + totalStopDuration = totalStopDuration.add(stoppage.getDuration().divide(BigDecimal.valueOf(3600), 2, BigDecimal.ROUND_HALF_UP)); + } + + // 计算总时长（查询时间范围的时长，单位：小时） + long totalTimeMillis = DateUtil.parse(form.getEndDate() + " 23:59:59").getTime() - DateUtil.parse(form.getStartDate() + " 00:00:00").getTime(); + BigDecimal totalDuration = BigDecimal.valueOf(totalTimeMillis).divide(BigDecimal.valueOf(3600 * 1000), 2, BigDecimal.ROUND_HALF_UP); + + // 计算作业率（保留两位小数，百分比形式） + BigDecimal operationRate = BigDecimal.ONE.subtract(totalStopDuration.divide(totalDuration, 4, BigDecimal.ROUND_HALF_UP)) + .multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP); + + // 创建List来承载结果 + List resultList = new ArrayList<>(); + resultList.add(stopCount); + resultList.add(totalStopDuration); + resultList.add(operationRate); + + return resultList; + } } diff --git a/business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java new file mode 100644 index 0000000..b185e06 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java @@ -0,0 +1,96 @@ +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.SetupFurTempMapper; +import com.fizz.business.domain.SetupFurTemp; +import com.fizz.business.service.ISetupFurTempService; + +/** + * 炉火段工艺参数Service业务层处理 + * + * @author ruoyi + * @date 2025-09-29 + */ +@Service +public class SetupFurTempServiceImpl implements ISetupFurTempService +{ + @Autowired + private SetupFurTempMapper setupFurTempMapper; + + /** + * 查询炉火段工艺参数 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 炉火段工艺参数 + */ + @Override + public SetupFurTemp selectSetupFurTempBySteelGrade(String steelGrade) + { + return setupFurTempMapper.selectSetupFurTempBySteelGrade(steelGrade); + } + + /** + * 查询炉火段工艺参数列表 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 炉火段工艺参数 + */ + @Override + public List selectSetupFurTempList(SetupFurTemp setupFurTemp) + { + return setupFurTempMapper.selectSetupFurTempList(setupFurTemp); + } + + /** + * 新增炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + @Override + public int insertSetupFurTemp(SetupFurTemp setupFurTemp) + { + setupFurTemp.setCreateTime(DateUtils.getNowDate()); + return setupFurTempMapper.insertSetupFurTemp(setupFurTemp); + } + + /** + * 修改炉火段工艺参数 + * + * @param setupFurTemp 炉火段工艺参数 + * @return 结果 + */ + @Override + public int updateSetupFurTemp(SetupFurTemp setupFurTemp) + { + setupFurTemp.setUpdateTime(DateUtils.getNowDate()); + return setupFurTempMapper.updateSetupFurTemp(setupFurTemp); + } + + /** + * 批量删除炉火段工艺参数 + * + * @param steelGrades 需要删除的炉火段工艺参数主键 + * @return 结果 + */ + @Override + public int deleteSetupFurTempBySteelGrades(String[] steelGrades) + { + return setupFurTempMapper.deleteSetupFurTempBySteelGrades(steelGrades); + } + + /** + * 删除炉火段工艺参数信息 + * + * @param steelGrade 炉火段工艺参数主键 + * @return 结果 + */ + @Override + public int deleteSetupFurTempBySteelGrade(String steelGrade) + { + return setupFurTempMapper.deleteSetupFurTempBySteelGrade(steelGrade); + } +} 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 new file mode 100644 index 0000000..fe825cd --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java @@ -0,0 +1,96 @@ +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) + { + 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/SetupTlServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java new file mode 100644 index 0000000..c7d43a8 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java @@ -0,0 +1,96 @@ +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) + { + 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 new file mode 100644 index 0000000..9927086 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java @@ -0,0 +1,96 @@ +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) + { + 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 new file mode 100644 index 0000000..873ada6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java @@ -0,0 +1,96 @@ +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) + { + 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 new file mode 100644 index 0000000..1cb71c6 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java @@ -0,0 +1,96 @@ +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) + { + 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/java/com/fizz/business/service/impl/TrackServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java index 04662d8..fac54bc 100644 --- a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -65,18 +66,45 @@ public class TrackServiceImpl implements TrackService { public ReturnInfoVO getReturnInfo(int posIdx) { MatmapDTO matmap = MatmapUtil.getMatmap(posIdx); if (MatmapUtil.notReady(matmap)) { + log.warn("Matmap not ready for position index: {}", posIdx); + return ReturnInfoVO.builder() + .returnWeight(0.0) + .returnType(null) + .entryMatId(null) + .planId(null) + .build(); } CrmPdiPlanVO planVO = crmPdiPlanService.getByCoilIdAndOperId(matmap.getPlanId()); + if (planVO == null) { + log.warn("Plan not found for planId: {}", matmap.getPlanId()); + return ReturnInfoVO.builder() + .returnWeight(0.0) + .returnType(null) + .entryMatId(matmap.getMatId()) + .planId(Long.valueOf(matmap.getPlanId())) + .build(); + } + String returnType = null; double returnWt = 0; if (Objects.equals(planVO.getStatus(), PlanStatusEnum.PRODUCING.name())) { double coiledLength = redisCacheManager.getStripLocation(); double calcCoilWeight = CalcUtil.calcCoilWeight(coiledLength, planVO.getEntryThick(), planVO.getEntryWidth()); - returnWt = planVO.getEntryWeight().divide(BigDecimal.valueOf(calcCoilWeight)).setScale(2, RoundingMode.HALF_UP).doubleValue(); + if (planVO.getEntryWeight() != null && calcCoilWeight > 0) { + returnWt = planVO.getEntryWeight().divide(BigDecimal.valueOf(calcCoilWeight)).setScale(2, RoundingMode.HALF_UP).doubleValue(); + } else { + log.warn("Invalid entry weight or calc coil weight: entryWeight={}, calcCoilWeight={}", planVO.getEntryWeight(), calcCoilWeight); + returnWt = 0.0; + } returnType = HALF_RETURN.name(); } else if (Objects.equals(planVO.getStatus(), PlanStatusEnum.ONLINE.name())) { - returnWt = planVO.getEntryWeight().doubleValue(); + if (planVO.getEntryWeight() != null) { + returnWt = planVO.getEntryWeight().doubleValue(); + } else { + log.warn("Entry weight is null for planId: {}", planVO.getId()); + returnWt = 0.0; + } returnType = ALL_RETURN.name(); } else { log.error("invalid plan status[{}], planId={}", planVO.getStatus(), planVO.getId()); @@ -133,6 +161,13 @@ public class TrackServiceImpl implements TrackService { Integer currPosIdx = currDevice.getIdx(); MatmapDTO target = MatmapUtil.getMatmap(targetPosIdx); MatmapDTO curr = MatmapUtil.getMatmap(currPosIdx); + + if (curr == null || target == null) { + log.warn("Matmap is null - curr: {}, target: {}, currPosIdx: {}, targetPosIdx: {}", + curr, target, currPosIdx, targetPosIdx); + return; + } + if (Objects.equals(curr.getMatId(), target.getMatId())) { return; } @@ -208,9 +243,18 @@ public class TrackServiceImpl implements TrackService { @Override public CoilPositionDTO getCoilPosition() { CoilPositionDTO position = redisCacheManager.getCoilPosition(); + if (position == null) { + log.warn("CoilPosition not found in Redis, creating empty position"); + position = new CoilPositionDTO(); + } + List matmapList = redisCacheManager.getMatmapList(); + if (matmapList == null) { + log.warn("MatmapList not found in Redis, using empty list"); + matmapList = new ArrayList<>(); + } + position.setMatMapList(matmapList); - return position; } diff --git a/business/src/main/resources/mapper/PdiSetupMapper.xml b/business/src/main/resources/mapper/PdiSetupMapper.xml new file mode 100644 index 0000000..dba055a --- /dev/null +++ b/business/src/main/resources/mapper/PdiSetupMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + 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}, + #{porTension}, + #{celTension}, + #{cleanTension}, + #{furTension}, + #{towerTension}, + #{tmNoneTension}, + #{tmEntryTension}, + #{tmExitTension}, + #{tmRollforce}, + #{tmBendforce}, + #{tmAcrMesh}, + #{tmBrMesh}, + #{tlNoneTension}, + #{tlExitTension}, + #{tlElong}, + #{tlLvlMesh1}, + #{tlLvlMesh2}, + #{tlAcbMesh}, + #{coatTension}, + #{cxlTension}, + #{trTension}, + #{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}, + + where ID = #{ID} + + + + delete from pdi_setup where ID = #{id} + + + + delete from pdi_setup where ID in + + #{id} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupFurTempMapper.xml b/business/src/main/resources/mapper/SetupFurTempMapper.xml new file mode 100644 index 0000000..c74041a --- /dev/null +++ b/business/src/main/resources/mapper/SetupFurTempMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + select steel_grade, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, update_time, create_time from setup_fur_temp + + + + + + + + insert into setup_fur_temp + + steel_grade, + value1, + value2, + value3, + value4, + value5, + value6, + value7, + value8, + value9, + value10, + update_time, + create_time, + + + #{steelGrade}, + #{value1}, + #{value2}, + #{value3}, + #{value4}, + #{value5}, + #{value6}, + #{value7}, + #{value8}, + #{value9}, + #{value10}, + #{updateTime}, + #{createTime}, + + + + + update setup_fur_temp + + 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} + + + + delete from setup_fur_temp where steel_grade = #{steelGrade} + + + + delete from setup_fur_temp where steel_grade in + + #{steelGrade} + + + \ No newline at end of file diff --git a/business/src/main/resources/mapper/SetupTensionMapper.xml b/business/src/main/resources/mapper/SetupTensionMapper.xml new file mode 100644 index 0000000..e354acb --- /dev/null +++ b/business/src/main/resources/mapper/SetupTensionMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/SetupTlMapper.xml b/business/src/main/resources/mapper/SetupTlMapper.xml new file mode 100644 index 0000000..33854de --- /dev/null +++ b/business/src/main/resources/mapper/SetupTlMapper.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..cf6dba8 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmBendforceMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..3e86e79 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmMeshMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..6784683 --- /dev/null +++ b/business/src/main/resources/mapper/SetupTmRollforceMapper.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 diff --git a/business/target/classes/mapper/CrmPdiPlanMapper.xml b/business/target/classes/mapper/CrmPdiPlanMapper.xml new file mode 100644 index 0000000..a5e815b --- /dev/null +++ b/business/target/classes/mapper/CrmPdiPlanMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/CrmPdoExcoilMapper.xml b/business/target/classes/mapper/CrmPdoExcoilMapper.xml new file mode 100644 index 0000000..f82ee39 --- /dev/null +++ b/business/target/classes/mapper/CrmPdoExcoilMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/DeviceDefineMapper.xml b/business/target/classes/mapper/DeviceDefineMapper.xml new file mode 100644 index 0000000..a5ca5bb --- /dev/null +++ b/business/target/classes/mapper/DeviceDefineMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/HalfReturnMapper.xml b/business/target/classes/mapper/HalfReturnMapper.xml new file mode 100644 index 0000000..349c3b2 --- /dev/null +++ b/business/target/classes/mapper/HalfReturnMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/LogDataMapper.xml b/business/target/classes/mapper/LogDataMapper.xml new file mode 100644 index 0000000..ae6f5cc --- /dev/null +++ b/business/target/classes/mapper/LogDataMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/PdoExcoilMapper.xml b/business/target/classes/mapper/PdoExcoilMapper.xml new file mode 100644 index 0000000..c898848 --- /dev/null +++ b/business/target/classes/mapper/PdoExcoilMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/PdoExcoilSubMapper.xml b/business/target/classes/mapper/PdoExcoilSubMapper.xml new file mode 100644 index 0000000..f1edd13 --- /dev/null +++ b/business/target/classes/mapper/PdoExcoilSubMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/PdoStripvalueMapper.xml b/business/target/classes/mapper/PdoStripvalueMapper.xml new file mode 100644 index 0000000..fde7887 --- /dev/null +++ b/business/target/classes/mapper/PdoStripvalueMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/business/target/classes/mapper/PlantConfigMapper.xml b/business/target/classes/mapper/PlantConfigMapper.xml new file mode 100644 index 0000000..4962deb --- /dev/null +++ b/business/target/classes/mapper/PlantConfigMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/ProMatmapMapper.xml b/business/target/classes/mapper/ProMatmapMapper.xml new file mode 100644 index 0000000..1237932 --- /dev/null +++ b/business/target/classes/mapper/ProMatmapMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + insert into track_ca1_romtb_matmap ( + pos_idx, mat_id, plan_no, plan_id + ) + values + + (#{item.posIdx}, #{item.matId}, #{item.planNo}, #{item.planId}) + + on duplicate key update + mat_id = VALUES(mat_id),plan_no = VALUES(plan_no),plan_id = VALUES(plan_id) + + + \ No newline at end of file diff --git a/business/target/classes/mapper/ProStoppageMapper.xml b/business/target/classes/mapper/ProStoppageMapper.xml new file mode 100644 index 0000000..314e7ed --- /dev/null +++ b/business/target/classes/mapper/ProStoppageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/RollChangeCycleMapper.xml b/business/target/classes/mapper/RollChangeCycleMapper.xml new file mode 100644 index 0000000..15ea6ad --- /dev/null +++ b/business/target/classes/mapper/RollChangeCycleMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/SegmentMapper.xml b/business/target/classes/mapper/SegmentMapper.xml new file mode 100644 index 0000000..04f0aa7 --- /dev/null +++ b/business/target/classes/mapper/SegmentMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + diff --git a/business/target/classes/mapper/SegmentTotalMapper.xml b/business/target/classes/mapper/SegmentTotalMapper.xml new file mode 100644 index 0000000..3c92be4 --- /dev/null +++ b/business/target/classes/mapper/SegmentTotalMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/business/target/classes/mapper/ShiftHistoryMapper.xml b/business/target/classes/mapper/ShiftHistoryMapper.xml new file mode 100644 index 0000000..80fa335 --- /dev/null +++ b/business/target/classes/mapper/ShiftHistoryMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/mapper/SteelGradeInfoMapper.xml b/business/target/classes/mapper/SteelGradeInfoMapper.xml new file mode 100644 index 0000000..6148baf --- /dev/null +++ b/business/target/classes/mapper/SteelGradeInfoMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/business/target/classes/rabbitmq.http b/business/target/classes/rabbitmq.http new file mode 100644 index 0000000..e69de29 diff --git a/ruoyi-admin/target/classes/META-INF/spring-devtools.properties b/ruoyi-admin/target/classes/META-INF/spring-devtools.properties new file mode 100644 index 0000000..37e7b58 --- /dev/null +++ b/ruoyi-admin/target/classes/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.json=/com.alibaba.fastjson2.*.jar \ No newline at end of file diff --git a/ruoyi-admin/target/classes/application-druid.yml b/ruoyi-admin/target/classes/application-druid.yml new file mode 100644 index 0000000..e41404a --- /dev/null +++ b/ruoyi-admin/target/classes/application-druid.yml @@ -0,0 +1,69 @@ +# 数据源配置 +spring: + # 数据源配置 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://140.143.206.120:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: klp + password: KeLunPu123@ +# url: jdbc:mysql://47.109.139.82:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: cgldb +# password: cgldb@123456 +# url: jdbc:mysql://127.0.0.1:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: root + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: admin + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/target/classes/banner.txt b/ruoyi-admin/target/classes/banner.txt new file mode 100644 index 0000000..95f8b48 --- /dev/null +++ b/ruoyi-admin/target/classes/banner.txt @@ -0,0 +1,9 @@ +Application Version: ${ruoyi.version} +Spring Boot Version: ${spring-boot.version} + ________ ___ ________ ________ +|\ _____\|\ \ |\_____ \ |\_____ \ +\ \ \__/ \ \ \ \|___/ /| \|___/ /| + \ \ __\ \ \ \ / / / / / / + \ \ \_| \ \ \ / /_/__ / /_/__ + \ \__\ \ \__\|\________\|\________\ + \|__| \|__| \|_______| \|_______| \ No newline at end of file diff --git a/ruoyi-admin/target/classes/i18n/messages.properties b/ruoyi-admin/target/classes/i18n/messages.properties new file mode 100644 index 0000000..93de005 --- /dev/null +++ b/ruoyi-admin/target/classes/i18n/messages.properties @@ -0,0 +1,38 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=用户不存在/密码错误 +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 +user.password.delete=对不起，您的账号已被删除 +user.blocked=用户已封禁，请联系管理员 +role.blocked=角色已封禁，请联系管理员 +login.blocked=很遗憾，访问IP已被列入系统黑名单 +user.logout.success=退出成功 + +length.not.valid=长度必须在{min}到{max}个字符之间 + +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 +user.password.not.valid=* 5-50个字符 + +user.email.not.valid=邮箱格式错误 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出，请重新登录 +user.unknown.error=未知错误，请重新登录 + +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ +upload.filename.exceed.length=上传的文件名最长{0}个字符 + +##权限 +no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] diff --git a/ruoyi-admin/target/classes/logback.xml b/ruoyi-admin/target/classes/logback.xml new file mode 100644 index 0000000..281dc14 --- /dev/null +++ b/ruoyi-admin/target/classes/logback.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 7 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 7 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 7 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/target/classes/mybatis/mybatis-config.xml b/ruoyi-admin/target/classes/mybatis/mybatis-config.xml new file mode 100644 index 0000000..4da6e21 --- /dev/null +++ b/ruoyi-admin/target/classes/mybatis/mybatis-config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 0c384c6..4b7012e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -158,7 +158,7 @@ public class Constants /** * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） */ - public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi", "com.fizz" }; /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 1cba320..69c40a9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**").permitAll() + requests.antMatchers("/login", "/register", "/captchaImage", "/roller/**","/pdi/**","/pdo/**","/track/**","/business/**").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/doc.html","/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/v3/api-docs/**", "/druid/**").permitAll() diff --git a/ruoyi-generator/target/classes/generator.yml b/ruoyi-generator/target/classes/generator.yml new file mode 100644 index 0000000..7eae68e --- /dev/null +++ b/ruoyi-generator/target/classes/generator.yml @@ -0,0 +1,10 @@ +# 代码生成 +gen: + # 作者 + author: ruoyi + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.ruoyi.system + # 自动去除表前缀，默认是false + autoRemovePre: false + # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） + tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..52857e8 --- /dev/null +++ b/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column + + + + + + + + insert into gen_table_column ( + table_id, + column_name, + column_comment, + column_type, + java_type, + java_field, + is_pk, + is_increment, + is_required, + is_insert, + is_edit, + is_list, + is_query, + query_type, + html_type, + dict_type, + sort, + create_by, + create_time + )values( + #{tableId}, + #{columnName}, + #{columnComment}, + #{columnType}, + #{javaType}, + #{javaField}, + #{isPk}, + #{isIncrement}, + #{isRequired}, + #{isInsert}, + #{isEdit}, + #{isList}, + #{isQuery}, + #{queryType}, + #{htmlType}, + #{dictType}, + #{sort}, + #{createBy}, + sysdate() + ) + + + + update gen_table_column + + column_comment = #{columnComment}, + java_type = #{javaType}, + java_field = #{javaField}, + is_insert = #{isInsert}, + is_edit = #{isEdit}, + is_list = #{isList}, + is_query = #{isQuery}, + is_required = #{isRequired}, + query_type = #{queryType}, + html_type = #{htmlType}, + dict_type = #{dictType}, + sort = #{sort}, + update_by = #{updateBy}, + update_time = sysdate() + + where column_id = #{columnId} + + + + delete from gen_table_column where table_id in + + #{tableId} + + + + + delete from gen_table_column where column_id in + + #{item.columnId} + + + + \ No newline at end of file diff --git a/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml b/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..d1110f7 --- /dev/null +++ b/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table + + + + + + + + + + + + + + + + + + insert into gen_table ( + table_name, + table_comment, + class_name, + tpl_category, + tpl_web_type, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + remark, + create_by, + create_time + )values( + #{tableName}, + #{tableComment}, + #{className}, + #{tplCategory}, + #{tplWebType}, + #{packageName}, + #{moduleName}, + #{businessName}, + #{functionName}, + #{functionAuthor}, + #{genType}, + #{genPath}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + ${sql} + + + + update gen_table + + table_name = #{tableName}, + table_comment = #{tableComment}, + sub_table_name = #{subTableName}, + sub_table_fk_name = #{subTableFkName}, + class_name = #{className}, + function_author = #{functionAuthor}, + gen_type = #{genType}, + gen_path = #{genPath}, + tpl_category = #{tplCategory}, + tpl_web_type = #{tplWebType}, + package_name = #{packageName}, + module_name = #{moduleName}, + business_name = #{businessName}, + function_name = #{functionName}, + options = #{options}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where table_id = #{tableId} + + + + delete from gen_table where table_id in + + #{tableId} + + + + \ No newline at end of file diff --git a/ruoyi-generator/target/classes/vm/java/controller.java.vm b/ruoyi-generator/target/classes/vm/java/controller.java.vm new file mode 100644 index 0000000..bf88988 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/controller.java.vm @@ -0,0 +1,115 @@ +package ${packageName}.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +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 ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.ruoyi.common.utils.poi.ExcelUtil; +#if($table.crud || $table.sub) +import com.ruoyi.common.core.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@RestController +@RequestMapping("/${moduleName}/${businessName}") +public class ${ClassName}Controller extends BaseController +{ + @Autowired + private I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") + @GetMapping("/list") +#if($table.crud || $table.sub) + public TableDataInfo list(${ClassName} ${className}) + { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } +#elseif($table.tree) + public AjaxResult list(${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "${functionName}数据"); + } + + /** + * 获取${functionName}详细信息 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") + @GetMapping(value = "/{${pkColumn.javaField}}") + public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) + { + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); + } + + /** + * 新增${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.insert${ClassName}(${className})); + } + + /** + * 修改${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.update${ClassName}(${className})); + } + + /** + * 删除${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) + { + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); + } +} diff --git a/ruoyi-generator/target/classes/vm/java/domain.java.vm b/ruoyi-generator/target/classes/vm/java/domain.java.vm new file mode 100644 index 0000000..bd51c17 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/domain.java.vm @@ -0,0 +1,105 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +#if($table.crud || $table.sub) +import com.ruoyi.common.core.domain.BaseEntity; +#elseif($table.tree) +import com.ruoyi.common.core.domain.TreeEntity; +#end + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end +public class ${ClassName} extends ${Entity} +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + private List<${subClassName}> ${subclassName}List; + +#end +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + +#if($table.sub) + public List<${subClassName}> get${subClassName}List() + { + return ${subclassName}List; + } + + public void set${subClassName}List(List<${subClassName}> ${subclassName}List) + { + this.${subclassName}List = ${subclassName}List; + } + +#end + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end +#if($table.sub) + .append("${subclassName}List", get${subClassName}List()) +#end + .toString(); + } +} diff --git a/ruoyi-generator/target/classes/vm/java/mapper.java.vm b/ruoyi-generator/target/classes/vm/java/mapper.java.vm new file mode 100644 index 0000000..7e7d7c2 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/mapper.java.vm @@ -0,0 +1,91 @@ +package ${packageName}.mapper; + +import java.util.List; +import ${packageName}.domain.${ClassName}; +#if($table.sub) +import ${packageName}.domain.${subClassName}; +#end + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 删除${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +#if($table.sub) + + /** + * 批量删除${subTable.functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 批量新增${subTable.functionName} + * + * @param ${subclassName}List ${subTable.functionName}列表 + * @return 结果 + */ + public int batch${subClassName}(List<${subClassName}> ${subclassName}List); + + + /** + * 通过${functionName}主键删除${subTable.functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}ID + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/ruoyi-generator/target/classes/vm/java/service.java.vm b/ruoyi-generator/target/classes/vm/java/service.java.vm new file mode 100644 index 0000000..264882b --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/service.java.vm @@ -0,0 +1,61 @@ +package ${packageName}.service; + +import java.util.List; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +} diff --git a/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm b/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..14746e1 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm @@ -0,0 +1,169 @@ +package ${packageName}.service.impl; + +import java.util.List; +#foreach ($column in $columns) +#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +import com.ruoyi.common.utils.DateUtils; +#break +#end +#end +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +#if($table.sub) +import java.util.ArrayList; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import ${packageName}.domain.${subClassName}; +#end +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service +public class ${ClassName}ServiceImpl implements I${ClassName}Service +{ + @Autowired + private ${ClassName}Mapper ${className}Mapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ + @Override + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) + { + return ${className}Mapper.select${ClassName}List(${className}); + } + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int insert${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + int rows = ${className}Mapper.insert${ClassName}(${className}); + insert${subClassName}(${className}); + return rows; +#else + return ${className}Mapper.insert${ClassName}(${className}); +#end + } + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int update${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); + insert${subClassName}(${className}); +#end + return ${className}Mapper.update${ClassName}(${className}); + } + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); + } + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } +#if($table.sub) + + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) + { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) + { + List<${subClassName}> list = new ArrayList<${subClassName}>(); + for (${subClassName} ${subclassName} : ${subclassName}List) + { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + list.add(${subclassName}); + } + if (list.size() > 0) + { + ${className}Mapper.batch${subClassName}(list); + } + } + } +#end +} diff --git a/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm b/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm new file mode 100644 index 0000000..a3f53eb --- /dev/null +++ b/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm @@ -0,0 +1,76 @@ +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +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; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/ruoyi-generator/target/classes/vm/js/api.js.vm b/ruoyi-generator/target/classes/vm/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/js/api.js.vm @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询${functionName}列表 +export function list${BusinessName}(query) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) +} + +// 查询${functionName}详细 +export function get${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) +} + +// 新增${functionName} +export function add${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) +} + +// 修改${functionName} +export function update${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) +} + +// 删除${functionName} +export function del${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) +} diff --git a/ruoyi-generator/target/classes/vm/sql/sql.vm b/ruoyi-generator/target/classes/vm/sql/sql.vm new file mode 100644 index 0000000..0575583 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/sql/sql.vm @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm b/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm new file mode 100644 index 0000000..4819c2a --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/index-tree.vue.vm @@ -0,0 +1,505 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/vue/index.vue.vm b/ruoyi-generator/target/classes/vm/vue/index.vue.vm new file mode 100644 index 0000000..6296014 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/index.vue.vm @@ -0,0 +1,602 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm new file mode 100644 index 0000000..c54d62b --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/v3/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm b/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm new file mode 100644 index 0000000..8b25665 --- /dev/null +++ b/ruoyi-generator/target/classes/vm/vue/v3/index.vue.vm @@ -0,0 +1,590 @@ + + + diff --git a/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm b/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..456755b --- /dev/null +++ b/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm @@ -0,0 +1,140 @@ + + + + + +#foreach ($column in $columns) + +#end + +#if($table.sub) + + + + + + +#foreach ($column in $subTable.columns) + +#end + +#end + + + select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} + + + + + +#if($table.sub) + + +#end + + + insert into ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + $column.columnName, +#end +#end + + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + #{$column.javaField}, +#end +#end + + + + + update ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName) + $column.columnName = #{$column.javaField}, +#end +#end + + where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} in + + #{${pkColumn.javaField}} + + +#if($table.sub) + + + delete from ${subTableName} where ${subTableFkName} in + + #{${subTableFkclassName}} + + + + + delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} + + + + insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values + + (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) + + +#end + \ No newline at end of file diff --git a/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml new file mode 100644 index 0000000..ba1b683 --- /dev/null +++ b/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + from sys_job_log + + + + + + + + + + delete from sys_job_log where job_log_id = #{jobLogId} + + + + delete from sys_job_log where job_log_id in + + #{jobLogId} + + + + + truncate table sys_job_log + + + + insert into sys_job_log( + job_log_id, + job_name, + job_group, + invoke_target, + job_message, + status, + exception_info, + create_time + )values( + #{jobLogId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{jobMessage}, + #{status}, + #{exceptionInfo}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml new file mode 100644 index 0000000..5605c44 --- /dev/null +++ b/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + from sys_job + + + + + + + + + + delete from sys_job where job_id = #{jobId} + + + + delete from sys_job where job_id in + + #{jobId} + + + + + update sys_job + + job_name = #{jobName}, + job_group = #{jobGroup}, + invoke_target = #{invokeTarget}, + cron_expression = #{cronExpression}, + misfire_policy = #{misfirePolicy}, + concurrent = #{concurrent}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where job_id = #{jobId} + + + + insert into sys_job( + job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + remark, + create_by, + create_time + )values( + #{jobId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{cronExpression}, + #{misfirePolicy}, + #{concurrent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml b/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..a5ff114 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark + from sys_config + + + + + + + and config_id = #{configId} + + + and config_key = #{configKey} + + + + + + + + + + + + + + insert into sys_config ( + config_name, + config_key, + config_value, + config_type, + create_by, + remark, + create_time + )values( + #{configName}, + #{configKey}, + #{configValue}, + #{configType}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_config + + config_name = #{configName}, + config_key = #{configKey}, + config_value = #{configValue}, + config_type = #{configType}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where config_id = #{configId} + + + + delete from sys_config where config_id = #{configId} + + + + delete from sys_config where config_id in + + #{configId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml new file mode 100644 index 0000000..cf439f6 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + + + + + + + + + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} + + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..3b94b7f --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + from sys_dict_data + + + + + + + + + + + + + + delete from sys_dict_data where dict_code = #{dictCode} + + + + delete from sys_dict_data where dict_code in + + #{dictCode} + + + + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_code = #{dictCode} + + + + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + + + + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + remark, + create_by, + create_time + )values( + #{dictSort}, + #{dictLabel}, + #{dictValue}, + #{dictType}, + #{cssClass}, + #{listClass}, + #{isDefault}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..438d484 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type + + + + + + + + + + + + + + delete from sys_dict_type where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml b/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml new file mode 100644 index 0000000..822d665 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + + + + truncate table sys_logininfor + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml b/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml new file mode 100644 index 0000000..84e87c9 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + from sys_menu + + + + + + + + + + + + + + + + + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + route_name = #{routeName}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where menu_id = #{menuId} + + + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + route_name, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{routeName}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete from sys_menu where menu_id = #{menuId} + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml b/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..65d3079 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark + from sys_notice + + + + + + + + insert into sys_notice ( + notice_title, + notice_type, + notice_content, + status, + remark, + create_by, + create_time + )values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_notice + + notice_title = #{noticeTitle}, + notice_type = #{noticeType}, + notice_content = #{noticeContent}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id in + + #{noticeId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml b/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..201db07 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time + from sys_oper_log + + + + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) + + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + + + + + + truncate table sys_oper_log + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml b/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml new file mode 100644 index 0000000..227c459 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + from sys_post + + + + + + + + + + + + + + + + + + update sys_post + + post_code = #{postCode}, + post_name = #{postName}, + post_sort = #{postSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where post_id = #{postId} + + + + insert into sys_post( + post_id, + post_code, + post_name, + post_sort, + status, + remark, + create_by, + create_time + )values( + #{postId}, + #{postCode}, + #{postName}, + #{postSort}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete from sys_post where post_id = #{postId} + + + + delete from sys_post where post_id in + + #{postId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..7c4139b --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_role_dept where role_id=#{roleId} + + + + + + delete from sys_role_dept where role_id in + + #{roleId} + + + + + insert into sys_role_dept(role_id, dept_id) values + + (#{item.roleId},#{item.deptId}) + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml b/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml new file mode 100644 index 0000000..955d4ee --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, + r.status, r.del_flag, r.create_time, r.remark + from sys_role r + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + left join sys_dept d on u.dept_id = d.dept_id + + + + + + + + + + + + + + + + + + + + insert into sys_role( + role_id, + role_name, + role_key, + role_sort, + data_scope, + menu_check_strictly, + dept_check_strictly, + status, + remark, + create_by, + create_time + )values( + #{roleId}, + #{roleName}, + #{roleKey}, + #{roleSort}, + #{dataScope}, + #{menuCheckStrictly}, + #{deptCheckStrictly}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_role + + role_name = #{roleName}, + role_key = #{roleKey}, + role_sort = #{roleSort}, + data_scope = #{dataScope}, + menu_check_strictly = #{menuCheckStrictly}, + dept_check_strictly = #{deptCheckStrictly}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id in + + #{roleId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..cb60a85 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + delete from sys_role_menu where role_id=#{roleId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml new file mode 100644 index 0000000..0856cb2 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + update sys_user set status = #{status} where user_id = #{userId} + + + + update sys_user set avatar = #{avatar} where user_name = #{userName} + + + + update sys_user set password = #{password} where user_name = #{userName} + + + + update sys_user set del_flag = '2' where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..2b90bc4 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_user_post where user_id=#{userId} + + + + + + delete from sys_user_post where user_id in + + #{userId} + + + + + insert into sys_user_post(user_id, post_id) values + + (#{item.userId},#{item.postId}) + + + + \ No newline at end of file diff --git a/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..dd72689 --- /dev/null +++ b/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + delete from sys_user_role where user_id=#{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + + + + delete from sys_user_role where role_id=#{roleId} and user_id in + + #{userId} + + + \ No newline at end of file