自测模型解析的bug

adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/constant/AdmModelFileStatusEnum.java

@@ -6,23 +6,23 @@ package com.persagy.adm.server.algorithm.constant;
  */
 public enum AdmModelFileStatusEnum {
     /**上传完成*/
-    UPLOAD_COMPLETED("1", "上传完成"),
+    UPLOAD_COMPLETED(1, "上传完成"),
     /**模型初步检查完成*/
-    FIRST_CHECK_COMPLETED("2", "模型初步检查完成"),
+    FIRST_CHECK_COMPLETED(2, "模型初步检查完成"),
     /**同步数据完成*/
-    SYNC_DATA_COMPLETED("3", "同步数据完成"),
+    SYNC_DATA_COMPLETED(3, "同步数据完成"),
     /**模型正常结束*/
-    NORMAL_COMPLETED("4", "模型正常结束");
+    NORMAL_COMPLETED(4, "模型正常结束");
 
-    private String value;
+    private Integer value;
     private String desc;
 
-    AdmModelFileStatusEnum(String value, String desc) {
+    AdmModelFileStatusEnum(Integer value, String desc) {
         this.value = value;
         this.desc = desc;
     }
 
-    public String getValue() {
+    public Integer getValue() {
         return value;
     }
 

adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmModelFileService.java

@@ -20,5 +20,5 @@ public interface AdmModelFileService extends IService<AdmModelFile> {
      * @author : lijie
      * Update By 2022/1/17 10:52
      */
-    List<AdmModelFile> listByStatus(String status);
+    List<AdmModelFile> listByStatus(Integer status);
 }

adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelFileServiceImpl.java

@@ -24,7 +24,7 @@ public class AdmModelFileServiceImpl extends ServiceImpl<AdmModelFileMapper, Adm
      * Update By 2022/1/17 10:52
      */
     @Override
-    public List<AdmModelFile> listByStatus(String status) {
+    public List<AdmModelFile> listByStatus(Integer status) {
         LambdaQueryWrapper<AdmModelFile> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AdmModelFile::getStatus,status);
         queryWrapper.eq(AdmModelFile::getRemoved,"0");

adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelServiceImpl.java

@@ -183,7 +183,7 @@ public class AdmModelServiceImpl implements AdmModelService {
         objectNode.put(ObjectDigital.PROP_VALID,Boolean.TRUE);
         ObjectNode bimIdPreObj = objectMapper.createObjectNode();
         bimIdPreObj.put(QueryOperator.LIKE_RIGHT.getIndex(),bimIdPre);
-        objectNode.put(AdmServerConstant.BIM_ID,bimIdPre);
+        objectNode.put(AdmServerConstant.BIM_ID,bimIdPreObj);
         objectNode.put(CommonConstant.QUERY_GROUPCODE,groupCode);
         queryCriteria.setCriteria(objectNode);
         queryCriteria.setSize(-1L);

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AbstractDataHandler.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -25,6 +24,7 @@ import com.persagy.dmp.common.constant.GraphCodeEnum;
 import com.persagy.dmp.common.constant.RelCodeEnum;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import lombok.extern.slf4j.Slf4j;
 
@@ -113,7 +113,7 @@ public abstract class AbstractDataHandler implements DataHandlerService {
                 continue;
             }
             // 1.特殊字段特殊处理
-            ObjectNode objectNode = handleSpecificField(element,objectNodeMap,currentModelFile,objectMapper);
+            ObjectNode objectNode = handleSpecificField(element,objectNodeMap,currentModelFile,objectMapper,relClassCode,relObjectType);
             // 2.移除不需要的字段
             removeUnnecessaryField(element);
             // 3.剩余字段的处理
@@ -182,7 +182,7 @@ public abstract class AbstractDataHandler implements DataHandlerService {
      * @author : lijie
      * Update By 2022/1/22 15:56
      */
-    protected String generateCadid(String localId, String localName){
+    protected String generateCadId(String localId, String localName){
         return Stream.of(localId,localName).filter(ObjectUtil::isNotNull).collect(joining(StrUtil.COLON));
     }
 
@@ -205,7 +205,7 @@ public abstract class AbstractDataHandler implements DataHandlerService {
      * Update By 2022/1/22 15:54
      */
     protected String generateBimLocation(Location location){
-        if (CollUtil.isEmpty(location.getPoints())){
+        if (null==location || CollUtil.isEmpty(location.getPoints())){
             return null;
         }
         Point point = location.getPoints().get(0);
@@ -250,10 +250,13 @@ public abstract class AbstractDataHandler implements DataHandlerService {
      * @author : lijie
      * Update By 2022/1/22 15:14
      */
-    protected String generateLocalName(JSONArray parameters, String name, JsonNode localName){
+    protected String generateLocalName(JSONArray parameters, String name, JsonNode localName,String sourceId){
         if (null!=localName && localName.isTextual()){
             return localName.asText();
         }
+        if (null==parameters || parameters.size()<=0){
+            return Stream.of(name,sourceId).filter(ObjectUtil::isNotNull).collect(joining(StrUtil.DASHED));
+        }
         List<Parameter> list = parameters.toJavaList(Parameter.class);
         Optional<Parameter> nameParam = list.stream().filter(parameter -> NAME_VALUE.equals(parameter.getName())).findFirst();
         Optional<Parameter> codeParam = list.stream().filter(parameter -> CODE_VALUE.equals(parameter.getName())).findFirst();
@@ -295,28 +298,31 @@ public abstract class AbstractDataHandler implements DataHandlerService {
      * Update By 2022/1/22 18:29
      */
     private ObjectNode handleSpecificField(JSONObject element, Map<String, ObjectNode> objectNodeMap,
-                                           AdmModelFile currentModelFile, ObjectMapper objectMapper){
+                                           AdmModelFile currentModelFile, ObjectMapper objectMapper,
+                                           String classCode,String objType){
         String sourceId = element.getString(SOURCE_ID);
         String bimId = generateBimId(currentModelFile.getProjectId(),currentModelFile.getFloorId(),sourceId);
-        ObjectNode objectNode = objectNodeMap.getOrDefault(bimId, objectMapper.createObjectNode());
+        ObjectNode objectNode = objectNodeMap.getOrDefault(bimId+StrUtil.UNDERLINE+classCode, objectMapper.createObjectNode());
         JSONArray parameters = element.getJSONArray(PARAMETERS);
         Location location = element.getObject(LOCATION, Location.class);
         JSONArray srcOutline = element.getJSONArray(OUTLINE);
         String objName = element.getString(NAME);
-        String localName = generateLocalName(parameters,objName,objectNode.get(AdmServerConstant.LOCAL_NAME));
+        String localName = generateLocalName(parameters,objName,objectNode.get(AdmServerConstant.LOCAL_NAME),sourceId);
         String localId = generateLocalId(sourceId,objectNode.get(AdmServerConstant.LOCAL_ID));
         String bimLocation = generateBimLocation(location);
         JSONArray outline = generateOutline(srcOutline);
-        String cadId = generateCadid(localId,localName);
+        String cadId = generateCadId(localId,localName);
         objectNode.put(AdmServerConstant.BIM_ID,bimId);
         objectNode.put(AdmServerConstant.NAME,objName);
         objectNode.put(AdmServerConstant.LOCAL_ID,localId);
         objectNode.put(AdmServerConstant.LOCAL_NAME,localName);
         objectNode.put(AdmServerConstant.BIM_LOCATION,bimLocation);
-        objectNode.putPOJO(AdmServerConstant.OUTLINE,outline);
+        objectNode.putPOJO(AdmServerConstant.OUTLINE,null!=outline?outline.toJSONString():null);
         objectNode.put(AdmServerConstant.CAD_ID,cadId);
         objectNode.put(AdmServerConstant.FLOOR_ID,currentModelFile.getFloorId());
         objectNode.put(AdmServerConstant.BUILDING_ID,currentModelFile.getBuildingId());
+        objectNode.put(ObjectDigital.CLASS_CODE_HUM,classCode);
+        objectNode.put(ObjectDigital.OBJ_TYPE_HUM,objType);
         return objectNode;
     }
     /**
@@ -396,6 +402,7 @@ public abstract class AbstractDataHandler implements DataHandlerService {
         ObjectRelation objectRelation = new ObjectRelation();
         objectRelation.setObjFrom(objFrom);
         objectRelation.setObjTo(objTo);
+        objectRelation.setGraphCode(graphCode);
         objectRelation.setGraphId(StrUtil.format("Gt{}001",graphCode));
         objectRelation.setGroupCode(groupCode);
         objectRelation.setProjectId(projectId);

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AdmAnalysisFacade.java

@@ -25,7 +25,6 @@ public class AdmAnalysisFacade {
         admPreFloorService.setNext(admUnzipFileService);
         AdmAnalyseService dataHandleService = SpringHelper.getBean(AdmDataHandleServiceImpl.class);
         admUnzipFileService.setNext(dataHandleService);
-
     }
 
     /**

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AdmAnalysisServiceBase.java

@@ -25,7 +25,7 @@ public abstract class AdmAnalysisServiceBase implements AdmAnalyseService {
      * @author : lijie
      * Update By 2022/1/21 10:59
      */
-//    @PostConstruct
+    @PostConstruct
     @Override
     public final synchronized void init() throws BusinessException {
         // 1.是否需要打印日志
@@ -42,7 +42,7 @@ public abstract class AdmAnalysisServiceBase implements AdmAnalyseService {
      * @author : lijie
      * Update By 2022/1/21 10:50
      */
-//    @PreDestroy
+    @PreDestroy
     @Override
     public final synchronized void destroy() throws BusinessException {
         // 1.是否需要打印日志
@@ -67,7 +67,7 @@ public abstract class AdmAnalysisServiceBase implements AdmAnalyseService {
             // 调具体实现类的方法，完成自身的初始化
             analysisInternal(model);
         }catch (Exception e){
-            log.warn("解析模型数据失败:{},错误信息:{}", JSONObject.toJSONString(model.getCurrentModelFile()),e.getMessage());
+            log.warn("解析模型数据失败:{},错误信息:{}", JSONObject.toJSONString(model.getCurrentModelFile()),e);
             afterAnalysisException(model,e.getMessage());
         }finally {
             afterAnalysis(model);

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AdmDataHandleServiceImpl.java

@@ -89,14 +89,14 @@ public class AdmDataHandleServiceImpl extends AdmAnalysisServiceBase {
             QueryCriteria criteria = new QueryCriteria();
             ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
             ObjectNode objectNode = objectMapper.createObjectNode();
-            objectNode.putPOJO(ObjectRelation.OBJ_FROM_HUM,needDeleteObjectIds);
+            objectNode.putPOJO(ObjectRelation.OBJ_FROM_HUM,needDeleteRelationObjIds);
             objectNode.putPOJO(ObjectRelation.GRAPH_CODE_HUM,model.getNeedDeleteRelationGraphCodes());
             objectNode.putPOJO(ObjectRelation.REL_CODE_HUM,model.getNeedDeleteRelationRelCodes());
             criteria.setCriteria(objectNode);
             DigitalRelationFacade.deleteByCriteria(currentModelFile.getGroupCode(),currentModelFile.getProjectId(),
                     CommonConstant.DEFAULT_ID,CommonConstant.DEFAULT_ID,criteria);
             objectNode.remove(ObjectRelation.OBJ_FROM_HUM);
-            objectNode.putPOJO(ObjectRelation.OBJ_TO_HUM,needDeleteObjectIds);
+            objectNode.putPOJO(ObjectRelation.OBJ_TO_HUM,needDeleteRelationObjIds);
             DigitalRelationFacade.deleteByCriteria(currentModelFile.getGroupCode(),currentModelFile.getProjectId(),
                     CommonConstant.DEFAULT_ID,CommonConstant.DEFAULT_ID,criteria);
         }

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AdmPreFileServiceImpl.java

@@ -35,6 +35,10 @@ public class AdmPreFileServiceImpl extends AdmAnalysisServiceBase {
         this.getNext().analysis(model);
     }
 
-
-
+    @Override
+    protected void afterAnalysis(AdmAnalysisModel model) {
+        if (CollUtil.isNotEmpty(model.getAdmModelFiles())){
+            admModelFileService.updateBatchById(model.getAdmModelFiles());
+        }
+    }
 }

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/AdmUnzipFileServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.persagy.adm.server.algorithm.constant.AdmModelFileStatusEnum;
 import com.persagy.adm.server.algorithm.entity.AdmModelFile;
 import com.persagy.adm.server.backstage.domain.AdmAnalysisModel;
 import com.persagy.dmp.file.utils.FileStorageHelper;
@@ -49,6 +50,7 @@ public class AdmUnzipFileServiceImpl extends AdmAnalysisServiceBase {
             model.setCurrentModelFile(admModelFile);
             model.setCurrentFloor(model.getFloorMap().get(admModelFile.getFloorId()));
             getNext().analysis(model);
+            admModelFile.setStatus(AdmModelFileStatusEnum.NORMAL_COMPLETED.getValue());
         }
     }
 

adm-business/adm-server/src/main/java/com/persagy/adm/server/backstage/service/impl/SpaceDataHandler.java

@@ -1,7 +1,9 @@
 package com.persagy.adm.server.backstage.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.persagy.dmp.common.constant.DigitalObjectType;
 import com.persagy.dmp.digital.entity.ObjectDigital;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -38,4 +40,11 @@ public class SpaceDataHandler extends AbstractDataHandler {
         // 物业分区类型
         return "GeneralZone";
     }
+
+    @Override
+    protected JSONArray generateOutline(JSONArray srcOutline) {
+        JSONArray array = new JSONArray();
+        array.add(srcOutline);
+        return array;
+    }
 }

adm-comp/adm-steward-starter/src/main/java/com/persagy/adm/steward/basic/config/StewardEncodeInterceptor.java

@@ -18,8 +18,13 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 public class StewardEncodeInterceptor implements RequestInterceptor {
 
+    private static final String ENCRYPTION_RSA="encryption-rsa";
+
     @Override
     public void apply(RequestTemplate template) {
+        if (!template.headers().containsKey(ENCRYPTION_RSA)){
+            return;
+        }
         // 更改请求体中的content的值
         Request.Body body = template.requestBody();
         JSONObject temp = JSONObject.parseObject(body.asString());

adm-comp/adm-steward-starter/src/main/java/com/persagy/adm/steward/basic/config/StewardFeignConfig.java

@@ -22,7 +22,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT
  * @author Charlie Yu
  * @date 2021-05-15
  */
-@EnableFeignClients(basePackages="com.persagy.**.client")
+@EnableFeignClients(basePackages="com.persagy.adm.steward.**.client")
 @Configuration
 public class StewardFeignConfig {
 
@@ -42,7 +42,7 @@ public class StewardFeignConfig {
     }
 
     @Bean
-    @ConditionalOnMissingBean({RequestInterceptor.class})
+    @ConditionalOnMissingBean({StewardEncodeInterceptor.class})
     RequestInterceptor stewardEncryptInterceptor(){
         return new StewardEncodeInterceptor();
     }