Quellcode durchsuchen

关系-竖井所在建筑

yucheng vor 3 Jahren
Ursprung
Commit
5c4be6ee2e

+ 1 - 18
src/main/java/com/persagy/proxy/adm/controller/AdmShaftController.java

@@ -152,24 +152,7 @@ public class AdmShaftController {
     @PostMapping("/query")
     public AdmResponse query(@RequestBody AdmQueryCriteria request) throws Exception {      
         request.setName(AdmShaft.OBJ_TYPE);
-        QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
-        ObjectNode criteria = queryCriteria.getCriteria();
-        //查询参数特殊处理 处理成中台可以识别的条件
-        if(!JSONUtil.isNull(criteria)){
-           Map<String, Object> criteriaMap = objectMapper.convertValue(criteria, Map.class);
-           if(CollUtil.isNotEmpty(criteriaMap)){
-               ObjectNode criteriaNew = JsonNodeFactory.instance.objectNode();
-               criteriaMap.keySet().stream().forEach(key -> {
-                   if(key.startsWith("infos.")){
-                        criteriaNew.put(key.substring(6), criteriaMap.get(key).toString());
-                   }else{
-                       criteriaNew.put(key, criteriaMap.get(key).toString());
-                   }
-               });
-               queryCriteria.setCriteria(criteriaNew);
-           }
-        }
-        return service.doQuery(AdmContextUtil.toDmpContext(), queryCriteria, AdmShaft.class);
+        return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmShaft.class);
     }
 
     /**

+ 1 - 1
src/main/java/com/persagy/proxy/adm/model/AdmShaft.java

@@ -49,7 +49,7 @@ public class AdmShaft extends AdmSBaseEntity<AdmShaft>{
     @CascadeColumn(graphCode = "MechInArch", relCode = "Eq2Sh", selectToObj = false)
     private List<AdmEquipment> equipmentList;
     /** 级联-竖井内的建筑 */
-    @CascadeColumn(graphCode = "ArchForArch", relCode = "Sh2Bd")
+    @CascadeColumn(graphCode = "ArchSubset", relCode = "Bd2Sh", selectToObj = false)
     private List<AdmBuilding> buildingList;
     /** 级联-竖井内的系统 */
     @CascadeColumn(graphCode = "MechInArch", relCode = "Sy2Sh", selectToObj = false)

+ 2 - 2
src/main/java/com/persagy/proxy/adm/model/AdmSpace.java

@@ -40,8 +40,8 @@ public class AdmSpace extends AdmSBaseEntity<AdmSpace>{
     private ArrayList<ArrayList<ArrayList<AdmPointPosition>>> outline;
     /** 轮廓线2 未使用*/
     private ArrayList<ArrayList<ArrayList<AdmPointPosition>>> outline2;
-    /** 图片 */
-    private ArrayList<AdmTaskPic> pic;
+    /** 图片 - 信息点里已存在的信息点不应在实体中重复定义为其他格式 */
+//    private ArrayList<AdmTaskPic> pic;
     /** 空间是否受影响 */
     private String state;
     /** 空间常驻人数 */

+ 2 - 0
src/main/java/com/persagy/proxy/adm/utils/AdmQueryCriteriaHelper.java

@@ -221,6 +221,8 @@ public class AdmQueryCriteriaHelper {
      * @param value
      */
     private static void addCondition(String name, ObjectNode criteria, String column, String operator, String value) {
+        // 20211015 移除列名中的infos.
+        column = StrUtil.replaceIgnoreCase(column, "infos.", "");
         // 替换列名
         column = replaceColumns(name, column);
         if("=".equals(operator)) {