From 7f69552f90f1530087605dbcd584a078784a59da Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Fri, 1 Mar 2024 10:52:23 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0=E6=9C=BA=E7=BB=84=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java     | 2 ++
 hzims-service/equipment/src/main/resources/db/2.0.0.sql.1            | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 f5012ba..07ffcff 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
@@ -852,6 +852,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 
 	private void copyDeviceTree(StationEntity station, Long pid, Long definitionId, String modelSignage, List<EmTreeIdsDTO> treeIds) {
 		List<ProjectDTO> projectDTOList = new ArrayList<>();
+		EmDefinitionEntity definition = emDefinitionService.getById(definitionId);
 		LambdaQueryWrapper<EmTreeEntity> wrapper = new LambdaQueryWrapper();
 		wrapper.eq(EmTreeEntity::getDefinitionId, definitionId);
 		List<EmTreeEntity> definitionEmTrees = emTreeService.list(wrapper);
@@ -866,6 +867,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 			emInfo.setId(infoId);
 			emInfo.setGpid(pid);
 			emInfo.setTreeId(emTree.getId());
+			emInfo.setSetCategory(definition.getType());
 			emInfo.setInsLocation(station.getAddress());
 			emInfo.setNumber(number);
 			emInfo.setStationCode(station.getCode());
diff --git a/hzims-service/equipment/src/main/resources/db/2.0.0.sql.1 b/hzims-service/equipment/src/main/resources/db/2.0.0.sql.1
index 132af94..0a632cd 100644
--- a/hzims-service/equipment/src/main/resources/db/2.0.0.sql.1
+++ b/hzims-service/equipment/src/main/resources/db/2.0.0.sql.1
@@ -26,4 +26,7 @@ alter table `HZIMS_PARAM_BACKUPS_DETAIL` add column `model_classify_id` BIGINT(2
 alter table `HZIMS_PARAM_BACKUPS_DETAIL` add column `model_classify_name` BIGINT(20) COMMENT '参数分组名称';
 alter table `HZIMS_PARAM_BACKUPS_DETAIL` modify column `model_classify_name` varchar(100) NULL COMMENT '参数分组名称';
 alter table `HZIMS_PARAM_BACKUPS` add column `em_name` varchar(100) COMMENT '设备名称';
-update HZIMS_PARAM_BACKUPS pb,HZIMS_EM_INFO ei set pb.EM_NAME = ei.`NAME` WHERE pb.EM_CODE = ei.NUMBER;
\ No newline at end of file
+update HZIMS_PARAM_BACKUPS pb,HZIMS_EM_INFO ei set pb.EM_NAME = ei.`NAME` WHERE pb.EM_CODE = ei.NUMBER;
+
+update bladex.blade_dict set dict_key = '2' where id = 1675699613977288706;
+update equipment.hzims_em_definition set type = '2' where type = '0';
\ No newline at end of file