From c2d356210f31c5ddcb65fb6c0387a808589b1497 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Mon, 10 Apr 2023 13:57:05 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90=E6=B7=BB=E5=8A=A0=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80=20#=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/equipment/controller/EmInfoController.java | 20 ++++++++++----------
 .../equipment/service/impl/EmInfoServiceImpl.java    |  7 +++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
index d2a1d0a..0f096dc 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
@@ -93,17 +93,17 @@ public class EmInfoController extends BladeController {
 		QueryWrapper<EmInfoEntity> queryWrapper = Condition.getQueryWrapper(em_info, EmInfoEntity.class);
 		queryWrapper.lambda().eq(EmInfoEntity::getGpid, 0);
 		IPage<EmInfoEntity> pages = em_infoService.page(Condition.getPage(query), queryWrapper);
-		if(CollectionUtil.isNotEmpty(pages.getRecords())) {
+		// 获取站点列表 - 填充站点编码、站点类型、站点名称
+		R<List<StationEntity>> stationListR = stationClient.getListAll();
+		if(stationListR.isSuccess() && CollectionUtil.isNotEmpty(stationListR.getData())) {
+			List<StationEntity> stationList = stationListR.getData();
 			pages.getRecords().forEach(emInfoEntity -> {
-				if(Func.isNotEmpty(emInfoEntity.getDepartment())) {
-					StationEntity request = new StationEntity();
-					request.setRefDept(emInfoEntity.getDepartment());
-					R<StationEntity> result = stationClient.getOne(request);
-					if(result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())) {
-						emInfoEntity.setStationCode(result.getData().getCode());
-						emInfoEntity.setStationType(result.getData().getType());
-						emInfoEntity.setStationName(result.getData().getName());
-					}
+				Optional<StationEntity> stationOptional = stationList.stream().filter(station -> station.getRefDept().equals(emInfoEntity.getDepartment())).findAny();
+				if(stationOptional.isPresent()) {
+					StationEntity stationEntity = stationOptional.get();
+					emInfoEntity.setStationCode(stationEntity.getCode());
+					emInfoEntity.setStationType(stationEntity.getType());
+					emInfoEntity.setStationName(stationEntity.getName());
 				}
 			});
 		}
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
index 15c0e39..94de0e7 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
@@ -75,6 +75,9 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 	@Value("${hzims.equipment.emInfo.emInfoList}")
 	public String em_info_list_path;
 
+	@Value("${hzims.equipment.emInfo.code-prefix}")
+	public String emInfoCodePrefix;
+
 	@Override
 	public R<EmInfoEntity> getEmInfoByCode(String emCode) {
 		EmInfoNoScopeMapper mapper = SpringUtil.getBean("emInfoNoScopeMapper");
@@ -108,7 +111,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 		// 验证设备信息
 		this.validEmInfo(em_info);
 		EmInfoEntity infoEntity = em_info.getInfo();
-		infoEntity.setNumber(Long.toString(IdWorker.getId()));
+		infoEntity.setNumber(emInfoCodePrefix + IdWorker.getId());
 		if (this.save(infoEntity)) {
 			this.getStationCodeStoreRedis();
 			Long infoId = em_info.getInfo().getId();
@@ -477,7 +480,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 		// 验证设备序号
 		if(Func.isNotEmpty(em_info.getInfo().getEmIndex())) {
 			List<EmInfoEntity> exist = super.list(Wrappers.<EmInfoEntity>lambdaQuery()
-					.eq(EmInfoEntity::getCreateDept, AuthUtil.getDeptId())
+					.eq(EmInfoEntity::getDepartment, em_info.getInfo().getDepartment())
 					.eq(EmInfoEntity::getEmIndex, em_info.getInfo().getEmIndex())
 			);
 			Assert.isTrue(CollectionUtil.isEmpty(exist),() -> {