From 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:52:30 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 4a9d25f..65ac02d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -5,25 +5,29 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.mdc.dto.EquipmentTemperatureDto;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
-import org.jeecg.modules.mdc.entity.*;
+import org.jeecg.modules.mdc.entity.ControlSystem;
+import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMapper;
-import org.jeecg.modules.mdc.mapper.XYZAliasesMapper;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
-import org.jeecg.modules.mdc.service.*;
+import org.jeecg.modules.mdc.service.IControlSystemService;
+import org.jeecg.modules.mdc.service.IEquipmentWorkLineService;
+import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.FindsEquipmentDepartUtil;
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentProVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
+import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
import org.jeecg.modules.system.entity.MdcEquipmentDepart;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.MdcProductionEquipment;
@@ -70,14 +74,14 @@
private IEquipmentWorkLineService equipmentWorkLineService;
@Resource
private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
- @Resource
- private XYZAliasesMapper xyzAliasesMapper;
- @Resource
- private IEquipmentXYZService equipmentXYZService;
- @Resource
- private IEquipmentBaseInfoService equipmentBaseInfoService;
- @Resource
- private IEquipmentTemperatureService equipmentTemperatureService;
+// @Resource
+// private XYZAliasesMapper xyzAliasesMapper;
+// @Resource
+// private IEquipmentXYZService equipmentXYZService;
+// @Resource
+// private IEquipmentBaseInfoService equipmentBaseInfoService;
+// @Resource
+// private IEquipmentTemperatureService equipmentTemperatureService;
@Override
public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
@@ -349,10 +353,12 @@
mdcEquipmentDto.setDevicePower(mdcEquipment.getDevicePower());
mdcEquipmentDto.setDeviceType(mdcEquipment.getDriveType());
mdcEquipmentDto.setRemark(mdcEquipment.getRemark());
- mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());//璁惧缂栧彿
+ //璁惧缂栧彿
+ mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());
mdcEquipmentDto.setEquipmentName(mdcEquipment.getEquipmentName());
mdcEquipmentDto.setEquipmentIP(mdcEquipment.getEquipmentIp());
- mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());//璁惧鍨嬪彿
+ //璁惧鍨嬪彿
+ mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());
mdcEquipmentDto.setDriveType(mdcEquipment.getDriveType());
mdcEquipmentDto.setDataPort(mdcEquipment.getDataPort());
mdcEquipmentDto.setDataFlag(Integer.parseInt(CommonConstant.STATUS_1));
@@ -694,4 +700,12 @@
return null;
}
+ /**
+ * 鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃
+ */
+ @Override
+ public IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo) {
+ return this.baseMapper.getEquipmentByWorkshopId(page, workshopEquipmentVo);
+ }
+
}
--
Gitblit v1.9.3