From 2d52984ba3b83cdd7c016e1b1f58f7e0ddfc32f2 Mon Sep 17 00:00:00 2001 From: xins Date: Wed, 21 Feb 2024 15:36:38 +0800 Subject: [PATCH] =?UTF-8?q?1.5.1=20=E7=99=BB=E5=BD=95=EF=BC=9A=E5=9C=A8?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hw/mes/api/RemoteMesService.java | 12 + .../hw/mes/api/domain/MesBaseStationInfo.java | 145 +++++++++ .../api/factory/RemoteMesFallbackFactory.java | 6 + .../hw/auth/controller/TokenController.java | 27 +- .../core/constant/TdEngineConstants.java | 2 +- .../hw/mes/controller/MesApiController.java | 2 +- .../MesBaseStationInfoController.java | 20 +- .../MesProductionLineController.java | 23 ++ .../com/hw/mes/domain/MesBaseStationInfo.java | 290 +++++++++--------- .../mes/mapper/MesBaseStationInfoMapper.java | 19 +- .../service/IMesBaseStationInfoService.java | 19 +- .../impl/MesBaseStationInfoServiceImpl.java | 18 +- 12 files changed, 403 insertions(+), 180 deletions(-) create mode 100644 hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseStationInfo.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionLineController.java diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java index 7fd341a..f2d61aa 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java @@ -5,6 +5,7 @@ import com.hw.common.core.constant.ServiceNameConstants; import com.hw.common.core.domain.R; import com.hw.mes.api.domain.MesBaseBarcodeInfo; import com.hw.mes.api.domain.MesBaseMaterialInfo; +import com.hw.mes.api.domain.MesBaseStationInfo; import com.hw.mes.api.domain.vo.MesBaseMaterialInfoVo; import com.hw.mes.api.factory.RemoteMesFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -36,4 +37,15 @@ public interface RemoteMesService { @PostMapping("/materialinfo/getMaterialsByMaterialIds") public R> getMaterialsByMaterialIds(@RequestBody MesBaseMaterialInfoVo mesBaseMaterialInfo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 查询工位信息列表 + * + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/baseStationInfo/getStations") + public R> getStations(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + } diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseStationInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseStationInfo.java new file mode 100644 index 0000000..5364140 --- /dev/null +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseStationInfo.java @@ -0,0 +1,145 @@ +package com.hw.mes.api.domain; + +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 工位信息对象 mes_base_station_info + * + * @author Yinq + * @date 2024-01-26 + */ +public class MesBaseStationInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long stationId; + + /** + * 工位编号 + */ + @Excel(name = "工位编号") + private String stationCode; + + /** + * 工位名称 + */ + @Excel(name = "工位名称") + private String stationName; + + /** + * 所属工序编号 + */ + @Excel(name = "所属工序编号") + private Long processId; + + /** + * 所属工序名称 + */ + @Excel(name = "所属工序名称") + private String processName; + + /** + * 楼层 + */ + @Excel(name = "楼层") + private Long floor; + + /** + * 单位生产时间 + */ + @Excel(name = "单位生产时间") + private Long productionTime; + + /** + * 激活标识 + */ + @Excel(name = "激活标识") + private String activeFlag; + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } + + public void setStationId(Long stationId) { + this.stationId = stationId; + } + + public Long getStationId() { + return stationId; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } + + public String getStationCode() { + return stationCode; + } + + public void setStationName(String stationName) { + this.stationName = stationName; + } + + public String getStationName() { + return stationName; + } + + public void setProcessId(Long processId) { + this.processId = processId; + } + + public Long getProcessId() { + return processId; + } + + public void setFloor(Long floor) { + this.floor = floor; + } + + public Long getFloor() { + return floor; + } + + public void setProductionTime(Long productionTime) { + this.productionTime = productionTime; + } + + public Long getProductionTime() { + return productionTime; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("stationId", getStationId()) + .append("stationCode", getStationCode()) + .append("stationName", getStationName()) + .append("processId", getProcessId()) + .append("floor", getFloor()) + .append("productionTime", getProductionTime()) + .append("activeFlag", getActiveFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java index 31a3fde..8f5d2d1 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java @@ -4,6 +4,7 @@ import com.hw.common.core.domain.R; import com.hw.mes.api.RemoteMesService; import com.hw.mes.api.domain.MesBaseBarcodeInfo; import com.hw.mes.api.domain.MesBaseMaterialInfo; +import com.hw.mes.api.domain.MesBaseStationInfo; import com.hw.mes.api.domain.vo.MesBaseMaterialInfoVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,6 +35,11 @@ public class RemoteMesFallbackFactory implements FallbackFactory> getMaterialsByMaterialIds(MesBaseMaterialInfoVo mesBaseMaterialInfo, String source) { return R.fail("获取物料信息失败:" + throwable.getMessage()); } + + @Override + public R> getStations(String source) { + return R.fail("获取工位列表信息失败:" + throwable.getMessage()); + } }; } } diff --git a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java index 008fcb2..680ea49 100644 --- a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java +++ b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java @@ -1,11 +1,12 @@ package com.hw.auth.controller; import javax.servlet.http.HttpServletRequest; + +import com.hw.common.core.constant.SecurityConstants; +import com.hw.mes.api.RemoteMesService; +import com.hw.mes.api.domain.MesBaseStationInfo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.hw.auth.form.LoginBody; import com.hw.auth.form.RegisterBody; import com.hw.auth.service.SysLoginService; @@ -17,6 +18,8 @@ import com.hw.common.security.service.TokenService; import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; +import java.util.List; + /** * token 控制 * @@ -31,6 +34,9 @@ public class TokenController @Autowired private SysLoginService sysLoginService; + @Autowired + private RemoteMesService remoteMesService; + @PostMapping("login") public R login(@RequestBody LoginBody form) { @@ -85,4 +91,17 @@ public class TokenController // 获取登录token return R.ok(tokenService.createToken(userInfo)); } + + + /** + * 获取工位信息列表 + * @return + */ + @GetMapping("getStations") + public R getStations() + { + R> resultR = remoteMesService.getStations(SecurityConstants.INNER); + return R.ok(resultR.getData()); + } + } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/TdEngineConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/TdEngineConstants.java index 75ef22a..68842fd 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/TdEngineConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/TdEngineConstants.java @@ -146,7 +146,7 @@ public class TdEngineConstants { * @param monitorId 计量设备编号 * @return String */ - public static String getEmsTableName(Long monitorId){ + public static String getEmsTableName(String monitorId){ return EMS_TABLE_NAME_PREFIX + monitorId; } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java index 8d7d855..af4d49f 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * 物料BOM信息Controller + * MES对外提供接口Controller * * @author Yinq * @date 2024-01-30 diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java index aafd0c4..0853036 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseStationInfoController.java @@ -3,7 +3,9 @@ package com.hw.mes.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.hw.common.security.annotation.InnerAuth; import com.hw.common.security.utils.SecurityUtils; +import com.hw.mes.api.domain.MesBaseStationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -16,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController; import com.hw.common.log.annotation.Log; import com.hw.common.log.enums.BusinessType; import com.hw.common.security.annotation.RequiresPermissions; -import com.hw.mes.domain.MesBaseStationInfo; import com.hw.mes.service.IMesBaseStationInfoService; import com.hw.common.core.web.controller.BaseController; import com.hw.common.core.web.domain.AjaxResult; @@ -25,7 +26,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 工位信息Controller - * + * * @author Yinq * @date 2024-01-26 */ @@ -105,4 +106,19 @@ public class MesBaseStationInfoController extends BaseController { return toAjax(mesBaseStationInfoService.deleteMesBaseStationInfoByStationIds(stationIds)); } + + + + + /** + * 查询工位信息列表 + */ + @InnerAuth + @GetMapping("/getStations") + public AjaxResult getStations(MesBaseStationInfo mesBaseStationInfo) + { + List list = mesBaseStationInfoService.selectMesBaseStationInfoList(mesBaseStationInfo); + return success(list); + } + } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionLineController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionLineController.java new file mode 100644 index 0000000..9497dc2 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionLineController.java @@ -0,0 +1,23 @@ +package com.hw.mes.controller; + +import com.hw.common.core.web.controller.BaseController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * MES产线接口Controller + * + * @author Yinq + * @date 2024-01-30 + */ +@RestController +@RequestMapping("/pl") +public class MesProductionLineController extends BaseController +{ + + + + +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java index 1633116..5fd5b22 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseStationInfo.java @@ -1,145 +1,145 @@ -package com.hw.mes.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.hw.common.core.annotation.Excel; -import com.hw.common.core.web.domain.BaseEntity; - -/** - * 工位信息对象 mes_base_station_info - * - * @author Yinq - * @date 2024-01-26 - */ -public class MesBaseStationInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键标识 - */ - private Long stationId; - - /** - * 工位编号 - */ - @Excel(name = "工位编号") - private String stationCode; - - /** - * 工位名称 - */ - @Excel(name = "工位名称") - private String stationName; - - /** - * 所属工序编号 - */ - @Excel(name = "所属工序编号") - private Long processId; - - /** - * 所属工序名称 - */ - @Excel(name = "所属工序名称") - private String processName; - - /** - * 楼层 - */ - @Excel(name = "楼层") - private Long floor; - - /** - * 单位生产时间 - */ - @Excel(name = "单位生产时间") - private Long productionTime; - - /** - * 激活标识 - */ - @Excel(name = "激活标识") - private String activeFlag; - - public String getProcessName() { - return processName; - } - - public void setProcessName(String processName) { - this.processName = processName; - } - - public void setStationId(Long stationId) { - this.stationId = stationId; - } - - public Long getStationId() { - return stationId; - } - - public void setStationCode(String stationCode) { - this.stationCode = stationCode; - } - - public String getStationCode() { - return stationCode; - } - - public void setStationName(String stationName) { - this.stationName = stationName; - } - - public String getStationName() { - return stationName; - } - - public void setProcessId(Long processId) { - this.processId = processId; - } - - public Long getProcessId() { - return processId; - } - - public void setFloor(Long floor) { - this.floor = floor; - } - - public Long getFloor() { - return floor; - } - - public void setProductionTime(Long productionTime) { - this.productionTime = productionTime; - } - - public Long getProductionTime() { - return productionTime; - } - - public void setActiveFlag(String activeFlag) { - this.activeFlag = activeFlag; - } - - public String getActiveFlag() { - return activeFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("stationId", getStationId()) - .append("stationCode", getStationCode()) - .append("stationName", getStationName()) - .append("processId", getProcessId()) - .append("floor", getFloor()) - .append("productionTime", getProductionTime()) - .append("activeFlag", getActiveFlag()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} +//package com.hw.mes.domain; +// +//import org.apache.commons.lang3.builder.ToStringBuilder; +//import org.apache.commons.lang3.builder.ToStringStyle; +//import com.hw.common.core.annotation.Excel; +//import com.hw.common.core.web.domain.BaseEntity; +// +///** +// * 工位信息对象 mes_base_station_info +// * +// * @author Yinq +// * @date 2024-01-26 +// */ +//public class MesBaseStationInfo extends BaseEntity { +// private static final long serialVersionUID = 1L; +// +// /** +// * 主键标识 +// */ +// private Long stationId; +// +// /** +// * 工位编号 +// */ +// @Excel(name = "工位编号") +// private String stationCode; +// +// /** +// * 工位名称 +// */ +// @Excel(name = "工位名称") +// private String stationName; +// +// /** +// * 所属工序编号 +// */ +// @Excel(name = "所属工序编号") +// private Long processId; +// +// /** +// * 所属工序名称 +// */ +// @Excel(name = "所属工序名称") +// private String processName; +// +// /** +// * 楼层 +// */ +// @Excel(name = "楼层") +// private Long floor; +// +// /** +// * 单位生产时间 +// */ +// @Excel(name = "单位生产时间") +// private Long productionTime; +// +// /** +// * 激活标识 +// */ +// @Excel(name = "激活标识") +// private String activeFlag; +// +// public String getProcessName() { +// return processName; +// } +// +// public void setProcessName(String processName) { +// this.processName = processName; +// } +// +// public void setStationId(Long stationId) { +// this.stationId = stationId; +// } +// +// public Long getStationId() { +// return stationId; +// } +// +// public void setStationCode(String stationCode) { +// this.stationCode = stationCode; +// } +// +// public String getStationCode() { +// return stationCode; +// } +// +// public void setStationName(String stationName) { +// this.stationName = stationName; +// } +// +// public String getStationName() { +// return stationName; +// } +// +// public void setProcessId(Long processId) { +// this.processId = processId; +// } +// +// public Long getProcessId() { +// return processId; +// } +// +// public void setFloor(Long floor) { +// this.floor = floor; +// } +// +// public Long getFloor() { +// return floor; +// } +// +// public void setProductionTime(Long productionTime) { +// this.productionTime = productionTime; +// } +// +// public Long getProductionTime() { +// return productionTime; +// } +// +// public void setActiveFlag(String activeFlag) { +// this.activeFlag = activeFlag; +// } +// +// public String getActiveFlag() { +// return activeFlag; +// } +// +// @Override +// public String toString() { +// return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) +// .append("stationId", getStationId()) +// .append("stationCode", getStationCode()) +// .append("stationName", getStationName()) +// .append("processId", getProcessId()) +// .append("floor", getFloor()) +// .append("productionTime", getProductionTime()) +// .append("activeFlag", getActiveFlag()) +// .append("remark", getRemark()) +// .append("createBy", getCreateBy()) +// .append("createTime", getCreateTime()) +// .append("updateBy", getUpdateBy()) +// .append("updateTime", getUpdateTime()) +// .toString(); +// } +//} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java index e7e5c1b..004fdc5 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseStationInfoMapper.java @@ -1,19 +1,20 @@ package com.hw.mes.mapper; +import com.hw.mes.api.domain.MesBaseStationInfo; + import java.util.List; -import com.hw.mes.domain.MesBaseStationInfo; /** * 工位信息Mapper接口 - * + * * @author Yinq * @date 2024-01-26 */ -public interface MesBaseStationInfoMapper +public interface MesBaseStationInfoMapper { /** * 查询工位信息 - * + * * @param stationId 工位信息主键 * @return 工位信息 */ @@ -21,7 +22,7 @@ public interface MesBaseStationInfoMapper /** * 查询工位信息列表 - * + * * @param mesBaseStationInfo 工位信息 * @return 工位信息集合 */ @@ -29,7 +30,7 @@ public interface MesBaseStationInfoMapper /** * 新增工位信息 - * + * * @param mesBaseStationInfo 工位信息 * @return 结果 */ @@ -37,7 +38,7 @@ public interface MesBaseStationInfoMapper /** * 修改工位信息 - * + * * @param mesBaseStationInfo 工位信息 * @return 结果 */ @@ -45,7 +46,7 @@ public interface MesBaseStationInfoMapper /** * 删除工位信息 - * + * * @param stationId 工位信息主键 * @return 结果 */ @@ -53,7 +54,7 @@ public interface MesBaseStationInfoMapper /** * 批量删除工位信息 - * + * * @param stationIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java index f474b5c..2cd16ad 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseStationInfoService.java @@ -1,19 +1,20 @@ package com.hw.mes.service; +import com.hw.mes.api.domain.MesBaseStationInfo; + import java.util.List; -import com.hw.mes.domain.MesBaseStationInfo; /** * 工位信息Service接口 - * + * * @author Yinq * @date 2024-01-26 */ -public interface IMesBaseStationInfoService +public interface IMesBaseStationInfoService { /** * 查询工位信息 - * + * * @param stationId 工位信息主键 * @return 工位信息 */ @@ -21,7 +22,7 @@ public interface IMesBaseStationInfoService /** * 查询工位信息列表 - * + * * @param mesBaseStationInfo 工位信息 * @return 工位信息集合 */ @@ -29,7 +30,7 @@ public interface IMesBaseStationInfoService /** * 新增工位信息 - * + * * @param mesBaseStationInfo 工位信息 * @return 结果 */ @@ -37,7 +38,7 @@ public interface IMesBaseStationInfoService /** * 修改工位信息 - * + * * @param mesBaseStationInfo 工位信息 * @return 结果 */ @@ -45,7 +46,7 @@ public interface IMesBaseStationInfoService /** * 批量删除工位信息 - * + * * @param stationIds 需要删除的工位信息主键集合 * @return 结果 */ @@ -53,7 +54,7 @@ public interface IMesBaseStationInfoService /** * 删除工位信息信息 - * + * * @param stationId 工位信息主键 * @return 结果 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java index 888af9c..c6afeaf 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java @@ -3,27 +3,27 @@ package com.hw.mes.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; import com.hw.common.security.utils.SecurityUtils; +import com.hw.mes.api.domain.MesBaseStationInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.mes.mapper.MesBaseStationInfoMapper; -import com.hw.mes.domain.MesBaseStationInfo; import com.hw.mes.service.IMesBaseStationInfoService; /** * 工位信息Service业务层处理 - * + * * @author Yinq * @date 2024-01-26 */ @Service -public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService +public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService { @Autowired private MesBaseStationInfoMapper mesBaseStationInfoMapper; /** * 查询工位信息 - * + * * @param stationId 工位信息主键 * @return 工位信息 */ @@ -35,7 +35,7 @@ public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService /** * 查询工位信息列表 - * + * * @param mesBaseStationInfo 工位信息 * @return 工位信息 */ @@ -47,7 +47,7 @@ public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService /** * 新增工位信息 - * + * * @param mesBaseStationInfo 工位信息 * @return 结果 */ @@ -61,7 +61,7 @@ public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService /** * 修改工位信息 - * + * * @param mesBaseStationInfo 工位信息 * @return 结果 */ @@ -75,7 +75,7 @@ public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService /** * 批量删除工位信息 - * + * * @param stationIds 需要删除的工位信息主键 * @return 结果 */ @@ -87,7 +87,7 @@ public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService /** * 删除工位信息信息 - * + * * @param stationId 工位信息主键 * @return 结果 */