From 1f7ed1b0b30057bfb65293f0334655ab2a891a3a Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Thu, 28 Jan 2021 10:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=AE=A1=E7=90=86-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE=E5=8A=A8=E6=80=81=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing/TBdSubstationController.java | 55 +++--- .../TSyStationparameternotesController.java | 153 ++++++++++++++++ .../main/resources/static/ruoyi/js/ry-ui.js | 28 +++ .../nanjing/ProductChangeInfo/add.html | 33 ---- .../StationParameterNotes.html | 150 ++++++++++++++++ .../nanjing/StationParameterNotes/add.html | 79 +++++++++ .../nanjing/StationParameterNotes/edit.html | 80 +++++++++ .../nanjing/SubStation/SubStation.html | 11 +- .../nanjing/SubStation/editParam.html | 150 ++++++++++++++++ .../domain/TSyStationparameternotes.java | 163 ++++++++++++++++++ .../nanjing/mapper/TBdSubstationMapper.java | 1 + .../TSyStationparameternotesMapper.java | 65 +++++++ .../service/ITBdSubstationService.java | 1 + .../ITSyStationparameternotesService.java | 65 +++++++ .../impl/TBdSubstationServiceImpl.java | 1 + .../TSyStationparameternotesServiceImpl.java | 104 +++++++++++ .../mapper/nanjing/TBdSubstationMapper.xml | 16 +- .../TSyStationparameternotesMapper.xml | 108 ++++++++++++ 18 files changed, 1198 insertions(+), 65 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/StationParameterNotes.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyStationparameternotes.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/TSyStationparameternotesMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java index 3cbbe3e2..d2266093 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import com.ruoyi.common.core.text.Convert; +import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.nanjing.domain.TBdLinetype; import com.ruoyi.nanjing.domain.TBdProductinfo; import com.ruoyi.nanjing.domain.TBdStationtype; @@ -29,6 +30,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.servlet.http.HttpServletRequest; + /** * 工位管理Controller * @@ -119,14 +122,14 @@ public class TBdSubstationController extends BaseController @ResponseBody public AjaxResult addSave(TBdSubstation tBdSubstation) { - int result = tBdSubstationService.insertTBdSubstation(tBdSubstation); - if (result>0){ - Map map = new HashMap(); - map.put("tableName",tBdSubstation.getTableName()); - map.put("ParaAmount",tBdSubstation.getParaCount()); - tBdSubstationService.createTable(map); - } - return toAjax(result); + Map map = new HashMap(); + map.put("tableName",tBdSubstation.getTableName()); + map.put("ParaAmount",tBdSubstation.getParaCount()); + tBdSubstationService.createTable(map); + + tBdSubstation.setUniteID(0L); + tBdSubstation.setUserID(ShiroUtils.getUserId().toString()); + return toAjax(tBdSubstationService.insertTBdSubstation(tBdSubstation)); } /** @@ -144,6 +147,14 @@ public class TBdSubstationController extends BaseController return prefix + "/edit"; } + @GetMapping("/editParam/{ID}") + public String editParam(@PathVariable("ID") Long ID,ModelMap modelMap) + { + TBdSubstation tBdSubstation = tBdSubstationService.selectTBdSubstationById(ID); + modelMap.put("tBdSubstation", tBdSubstation); + return prefix + "/editParam"; + } + /** * 修改保存工位管理 */ @@ -154,15 +165,12 @@ public class TBdSubstationController extends BaseController public AjaxResult editSave(TBdSubstation tBdSubstation) { tBdSubstation.setUpdateTime(new Date()); - int result = tBdSubstationService.updateTBdSubstation(tBdSubstation); - if(result>0){ - Map map = new HashMap(); - map.put("paraCount",tBdSubstation.getParaCount()); - map.put("tableName",tBdSubstation.getTableName()); - map.put("stationID",tBdSubstation.getStationID()); - tBdSubstationService.updateTable(map); - } - return toAjax(result); + Map map = new HashMap(); + map.put("paraCount",tBdSubstation.getParaCount()); + map.put("tableName",tBdSubstation.getTableName()); + map.put("stationID",tBdSubstation.getStationID()); + tBdSubstationService.updateTable(map); + return toAjax(tBdSubstationService.updateTBdSubstation(tBdSubstation)); } /** @@ -174,12 +182,11 @@ public class TBdSubstationController extends BaseController @ResponseBody public AjaxResult remove(String ids) { - int result = tBdSubstationService.deleteTBdSubstationByIds(ids); - if(result>0){ - Map map = new HashMap(); - map.put("stationID",ids); - tBdSubstationService.deletePara(map); - } - return toAjax(result); + TBdSubstation substation = tBdSubstationService.selectTBdSubstationById(Convert.toLong(ids)); + Map map = new HashMap(); + map.put("stationID",substation.getStationID()); + tBdSubstationService.deletePara(map); +// tBdSubstationService.deleteTBdSubstationByIds(ids) + return toAjax(1); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java new file mode 100644 index 00000000..9d351885 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java @@ -0,0 +1,153 @@ +package com.ruoyi.web.controller.nanjing; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.nanjing.domain.TSyStationparameternotes; +import com.ruoyi.nanjing.service.ITSyStationparameternotesService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +import javax.servlet.http.HttpServletRequest; + +/** + * 工位参数定义Controller + * + * @author limy + * @date 2021-01-27 + */ +@Controller +@RequestMapping("/nanjing/StationParameterNotes") +public class TSyStationparameternotesController extends BaseController +{ + private String prefix = "nanjing/StationParameterNotes"; + + @Autowired + private ITSyStationparameternotesService tSyStationparameternotesService; + + @RequiresPermissions("nanjing:StationParameterNotes:view") + @GetMapping() + public String StationParameterNotes() + { + return prefix + "/StationParameterNotes"; + } + + /** + * 查询工位参数定义列表 + */ + @RequiresPermissions("nanjing:StationParameterNotes:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TSyStationparameternotes tSyStationparameternotes) + { + startPage(); + List list = tSyStationparameternotesService.selectTSyStationparameternotesList(tSyStationparameternotes); + return getDataTable(list); + } + + /** + * 导出工位参数定义列表 + */ + @RequiresPermissions("nanjing:StationParameterNotes:export") + @Log(title = "工位参数定义", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TSyStationparameternotes tSyStationparameternotes) + { + List list = tSyStationparameternotesService.selectTSyStationparameternotesList(tSyStationparameternotes); + ExcelUtil util = new ExcelUtil(TSyStationparameternotes.class); + return util.exportExcel(list, "StationParameterNotes"); + } + + /** + * 新增工位参数定义 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存工位参数定义 + */ + @RequiresPermissions("nanjing:StationParameterNotes:add") + @Log(title = "工位参数定义", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TSyStationparameternotes tSyStationparameternotes) + { + return toAjax(tSyStationparameternotesService.insertTSyStationparameternotes(tSyStationparameternotes)); + } + + /** + * 修改工位参数定义 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + TSyStationparameternotes tSyStationparameternotes = tSyStationparameternotesService.selectTSyStationparameternotesById(id); + mmap.put("tSyStationparameternotes", tSyStationparameternotes); + return prefix + "/edit"; + } + + /** + * 修改保存工位参数定义 + */ + @RequiresPermissions("nanjing:StationParameterNotes:edit") + @Log(title = "工位参数定义", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TSyStationparameternotes tSyStationparameternotes) + { + return toAjax(tSyStationparameternotesService.updateTSyStationparameternotes(tSyStationparameternotes)); + } + + /** + * 删除工位参数定义 + */ + @RequiresPermissions("nanjing:StationParameterNotes:remove") + @Log(title = "工位参数定义", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tSyStationparameternotesService.deleteTSyStationparameternotesByIds(ids)); + } + + @RequiresPermissions("nanjing:SubStation:param") + @PostMapping("/getParamData") + @ResponseBody + public AjaxResult getParamData(HttpServletRequest request){ + String paraMean=""; + String stationID = request.getParameter("stationID"); + String para = request.getParameter("para"); + List tSyStationparameternotes = tSyStationparameternotesService.selectByStationID(stationID); + for (TSyStationparameternotes sp:tSyStationparameternotes) + { + if(sp.getParaColumn().equals(para)){ + paraMean = sp.getParaMeaning(); + break; + } + else { + paraMean=""; + } + } +// TSyStationparameternotes tSyStationparameternotes = tSyStationparameternotesService.getParaVal(stationID,para); +// if(tSyStationparameternotes.getParaMeaning().equals("")||tSyStationparameternotes.getParaMeaning()==null){ +// return AjaxResult.error(" "); +// } + return AjaxResult.success(paraMean); + } +} diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 64bb93ff..e73fa4cd 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1053,6 +1053,34 @@ var table = { $.modal.open("修改" + table.options.modalName, $.operate.editUrl(id)); } }, + editParameter:function(id){ + table.set(); + if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) { + var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; + if ($.common.isEmpty(row)) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + var url = table.options.editParamUrl.replace("{id}", row[table.options.uniqueId]); + $.modal.open("修改" + table.options.modalName, url); + } else { + $.modal.open("修改" + table.options.modalName, $.operate.paramUrl(id)); + } + }, + paramUrl: function(id) { + var url = "/404.html"; + if ($.common.isNotEmpty(id)) { + url = table.options.editParamUrl.replace("{id}", id); + } else { + var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + if (id.length == 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + url = table.options.editParamUrl.replace("{id}", id); + } + return url; + }, // 修改信息，以tab页展现 editTab: function(id) { table.set(); diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/add.html index dbde1d9e..927090a1 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/add.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/add.html @@ -22,39 +22,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/StationParameterNotes.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/StationParameterNotes.html new file mode 100644 index 00000000..94534783 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/StationParameterNotes.html @@ -0,0 +1,150 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/add.html new file mode 100644 index 00000000..a52fca00 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/add.html @@ -0,0 +1,79 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/edit.html new file mode 100644 index 00000000..842a5661 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParameterNotes/edit.html @@ -0,0 +1,80 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html index 12945743..301925e4 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html @@ -52,6 +52,7 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html new file mode 100644 index 00000000..634960a0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html @@ -0,0 +1,150 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + + + + + + +
+ +
+ +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyStationparameternotes.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyStationparameternotes.java new file mode 100644 index 00000000..38f28597 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyStationparameternotes.java @@ -0,0 +1,163 @@ +package com.ruoyi.nanjing.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; + +/** + * 工位参数定义对象 T_SY_StationParameterNotes + * + * @author limy + * @date 2021-01-27 + */ +public class TSyStationparameternotes extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 表名 */ + @Excel(name = "表名") + private String tabelName; + + /** 参数名 */ + @Excel(name = "参数名") + private String paraColumn; + + /** 参数值 */ + @Excel(name = "参数值") + private String paraMeaning; + + /** 工位ID */ + @Excel(name = "工位ID") + private String stationID; + + /** 工位码 */ + @Excel(name = "工位码") + private String stationCode; + + /** 父工位ID */ + @Excel(name = "父工位ID") + private String parentStationID; + + /** 父工位码 */ + @Excel(name = "父工位码") + private String parentStationCode; + + /** 父工位名 */ + @Excel(name = "父工位名") + private String parentStationName; + + /** 是否显示 */ + @Excel(name = "是否显示") + private String usedFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setTabelName(String tabelName) + { + this.tabelName = tabelName; + } + + public String getTabelName() + { + return tabelName; + } + public void setParaColumn(String paraColumn) + { + this.paraColumn = paraColumn; + } + + public String getParaColumn() + { + return paraColumn; + } + public void setParaMeaning(String paraMeaning) + { + this.paraMeaning = paraMeaning; + } + + public String getParaMeaning() + { + return paraMeaning; + } + public void setStationID(String stationID) + { + this.stationID = stationID; + } + + public String getStationID() + { + return stationID; + } + public void setStationCode(String stationCode) + { + this.stationCode = stationCode; + } + + public String getStationCode() + { + return stationCode; + } + public void setParentStationID(String parentStationID) + { + this.parentStationID = parentStationID; + } + + public String getParentStationID() + { + return parentStationID; + } + public void setParentStationCode(String parentStationCode) + { + this.parentStationCode = parentStationCode; + } + + public String getParentStationCode() + { + return parentStationCode; + } + public void setParentStationName(String parentStationName) + { + this.parentStationName = parentStationName; + } + + public String getParentStationName() + { + return parentStationName; + } + public void setUsedFlag(String usedFlag) + { + this.usedFlag = usedFlag; + } + + public String getUsedFlag() + { + return usedFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("tabelName", getTabelName()) + .append("paraColumn", getParaColumn()) + .append("paraMeaning", getParaMeaning()) + .append("stationID", getStationID()) + .append("stationCode", getStationCode()) + .append("parentStationID", getParentStationID()) + .append("parentStationCode", getParentStationCode()) + .append("parentStationName", getParentStationName()) + .append("usedFlag", getUsedFlag()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java index 0c5829d7..e3462a5d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java @@ -70,4 +70,5 @@ public interface TBdSubstationMapper void updateTable(Map map); void deletePara(Map map); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java new file mode 100644 index 00000000..3a53bec2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.nanjing.mapper; + +import java.util.List; +import com.ruoyi.nanjing.domain.TSyStationparameternotes; + +/** + * 工位参数定义Mapper接口 + * + * @author limy + * @date 2021-01-27 + */ +public interface TSyStationparameternotesMapper +{ + /** + * 查询工位参数定义 + * + * @param id 工位参数定义ID + * @return 工位参数定义 + */ + public TSyStationparameternotes selectTSyStationparameternotesById(Long id); + + /** + * 查询工位参数定义列表 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 工位参数定义集合 + */ + public List selectTSyStationparameternotesList(TSyStationparameternotes tSyStationparameternotes); + + /** + * 新增工位参数定义 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 结果 + */ + public int insertTSyStationparameternotes(TSyStationparameternotes tSyStationparameternotes); + + /** + * 修改工位参数定义 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 结果 + */ + public int updateTSyStationparameternotes(TSyStationparameternotes tSyStationparameternotes); + + /** + * 删除工位参数定义 + * + * @param id 工位参数定义ID + * @return 结果 + */ + public int deleteTSyStationparameternotesById(Long id); + + /** + * 批量删除工位参数定义 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSyStationparameternotesByIds(String[] ids); + + TSyStationparameternotes getParaVal(String stationID, String para); + + List selectByStationID(String stationID); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java index 336c6772..c738172c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java @@ -70,4 +70,5 @@ public interface ITBdSubstationService void updateTable(Map map); void deletePara(Map map); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java new file mode 100644 index 00000000..a7152492 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java @@ -0,0 +1,65 @@ +package com.ruoyi.nanjing.service; + +import java.util.List; +import com.ruoyi.nanjing.domain.TSyStationparameternotes; + +/** + * 工位参数定义Service接口 + * + * @author limy + * @date 2021-01-27 + */ +public interface ITSyStationparameternotesService +{ + /** + * 查询工位参数定义 + * + * @param id 工位参数定义ID + * @return 工位参数定义 + */ + public TSyStationparameternotes selectTSyStationparameternotesById(Long id); + + /** + * 查询工位参数定义列表 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 工位参数定义集合 + */ + public List selectTSyStationparameternotesList(TSyStationparameternotes tSyStationparameternotes); + + /** + * 新增工位参数定义 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 结果 + */ + public int insertTSyStationparameternotes(TSyStationparameternotes tSyStationparameternotes); + + /** + * 修改工位参数定义 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 结果 + */ + public int updateTSyStationparameternotes(TSyStationparameternotes tSyStationparameternotes); + + /** + * 批量删除工位参数定义 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSyStationparameternotesByIds(String ids); + + /** + * 删除工位参数定义信息 + * + * @param id 工位参数定义ID + * @return 结果 + */ + public int deleteTSyStationparameternotesById(Long id); + + TSyStationparameternotes getParaVal(String stationID, String para); + + List selectByStationID(String stationID); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java index ceefdc7b..a3d72d09 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java @@ -118,4 +118,5 @@ public class TBdSubstationServiceImpl implements ITBdSubstationService public void deletePara(Map map) { tBdSubstationMapper.deletePara(map); } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java new file mode 100644 index 00000000..71ac30fc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java @@ -0,0 +1,104 @@ +package com.ruoyi.nanjing.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.nanjing.mapper.TSyStationparameternotesMapper; +import com.ruoyi.nanjing.domain.TSyStationparameternotes; +import com.ruoyi.nanjing.service.ITSyStationparameternotesService; +import com.ruoyi.common.core.text.Convert; + +/** + * 工位参数定义Service业务层处理 + * + * @author limy + * @date 2021-01-27 + */ +@Service +public class TSyStationparameternotesServiceImpl implements ITSyStationparameternotesService +{ + @Autowired + private TSyStationparameternotesMapper tSyStationparameternotesMapper; + + /** + * 查询工位参数定义 + * + * @param id 工位参数定义ID + * @return 工位参数定义 + */ + @Override + public TSyStationparameternotes selectTSyStationparameternotesById(Long id) + { + return tSyStationparameternotesMapper.selectTSyStationparameternotesById(id); + } + + /** + * 查询工位参数定义列表 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 工位参数定义 + */ + @Override + public List selectTSyStationparameternotesList(TSyStationparameternotes tSyStationparameternotes) + { + return tSyStationparameternotesMapper.selectTSyStationparameternotesList(tSyStationparameternotes); + } + + /** + * 新增工位参数定义 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 结果 + */ + @Override + public int insertTSyStationparameternotes(TSyStationparameternotes tSyStationparameternotes) + { + return tSyStationparameternotesMapper.insertTSyStationparameternotes(tSyStationparameternotes); + } + + /** + * 修改工位参数定义 + * + * @param tSyStationparameternotes 工位参数定义 + * @return 结果 + */ + @Override + public int updateTSyStationparameternotes(TSyStationparameternotes tSyStationparameternotes) + { + return tSyStationparameternotesMapper.updateTSyStationparameternotes(tSyStationparameternotes); + } + + /** + * 删除工位参数定义对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSyStationparameternotesByIds(String ids) + { + return tSyStationparameternotesMapper.deleteTSyStationparameternotesByIds(Convert.toStrArray(ids)); + } + + /** + * 删除工位参数定义信息 + * + * @param id 工位参数定义ID + * @return 结果 + */ + @Override + public int deleteTSyStationparameternotesById(Long id) + { + return tSyStationparameternotesMapper.deleteTSyStationparameternotesById(id); + } + + @Override + public TSyStationparameternotes getParaVal(String stationID, String para) { + return tSyStationparameternotesMapper.getParaVal(stationID,para); + } + + @Override + public List selectByStationID(String stationID) { + return tSyStationparameternotesMapper.selectByStationID(stationID); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml index e1f2cc97..10b12069 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml @@ -72,22 +72,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) } - + + + + + + + and TabelName like ('%' + #{tabelName} + '%') + and ParaColumn = #{paraColumn} + and ParaMeaning = #{paraMeaning} + and StationID = #{stationID} + and StationCode = #{stationCode} + and ParentStationID = #{parentStationID} + and ParentStationCode = #{parentStationCode} + and ParentStationName like ('%' + #{parentStationName} + '%') + and UsedFlag = #{usedFlag} + + + + + + + + + + insert into T_SY_StationParameterNotes + + ID, + TabelName, + ParaColumn, + ParaMeaning, + StationID, + StationCode, + ParentStationID, + ParentStationCode, + ParentStationName, + UsedFlag, + + + #{id}, + #{tabelName}, + #{paraColumn}, + #{paraMeaning}, + #{stationID}, + #{stationCode}, + #{parentStationID}, + #{parentStationCode}, + #{parentStationName}, + #{usedFlag}, + + + + + update T_SY_StationParameterNotes + + TabelName = #{tabelName}, + ParaColumn = #{paraColumn}, + ParaMeaning = #{paraMeaning}, + StationID = #{stationID}, + StationCode = #{stationCode}, + ParentStationID = #{parentStationID}, + ParentStationCode = #{parentStationCode}, + ParentStationName = #{parentStationName}, + UsedFlag = #{usedFlag}, + + where ID = #{id} + + + + delete from T_SY_StationParameterNotes where ID = #{id} + + + + delete from T_SY_StationParameterNotes where ID in + + #{id} + + + +