Merge remote-tracking branch 'origin/master'

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java

@@ -851,6 +851,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);
@@ -865,6 +866,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());

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;
+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';