Browse Source

楼层:方法调整

lvxianyun 3 years ago
parent
commit
1c4695b82a

+ 24 - 5
src/main/java/com/persagy/proxy/adm/controller/AdmFloorController.java

@@ -11,7 +11,10 @@ import com.persagy.proxy.adm.model.AdmSpace;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.*;
+import com.persagy.proxy.adm.service.IAdmEquipmentService;
+import com.persagy.proxy.adm.service.IAdmFloorService;
+import com.persagy.proxy.adm.service.IAdmISpaceService;
+import com.persagy.proxy.adm.service.IAdmSpaceService;
 import com.persagy.proxy.adm.utils.ObjectNameUtil;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
@@ -203,10 +206,26 @@ public class AdmFloorController {
     @PostMapping("/update-outline")
     public AdmResponse updateOutline(@RequestBody AdmCreateRequest<AdmFloor> admFloor, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
-        List<AdmFloor> vos = CollUtil.newArrayList(admFloor.getContent());
-        vos = service.doUpdateOutLine(context, AdmFloor.class, vos);
-        return AdmResponse.success(vos);
+        AdmResponse admResponse = update(admFloor,projectId);
+        //TODO 处理关系
+        /** 处理关系标记 */
+       /* val listtype = ArrayList<String>()
+        listtype.add("sh2bd")
+        listtype.add("bd2sp")
+        listtype.add("fl2sp")
+        listtype.add("syeq2bd")
+        listtype.add("sy2fl")
+        listtype.add("eq2fl")
+        listtype.add("pe2bd")
+        listtype.add("pe2fl")
+        for (type in listtype){
+            val entity = EquipmentService.relationTypeProjectservice.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("relationType", type)).entity()
+            if (entity!=null){
+                entity.computationalState = 2
+                EquipmentService.relationTypeProjectservice.update(entity)
+            }
+        }*/
+        return admResponse;
     }
 
 

+ 0 - 3
src/main/java/com/persagy/proxy/adm/service/IAdmFloorService.java

@@ -5,8 +5,6 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 
-import java.util.List;
-
 /**
  * ADM 楼层 接口类
  * @author lvxy
@@ -14,7 +12,6 @@ import java.util.List;
  */
 public interface IAdmFloorService extends IAdmBaseService<AdmFloor>{
 
-    public List<AdmFloor> doUpdateOutLine(InstanceUrlParam context, Class<AdmFloor> clazz, List<AdmFloor> voList);
     /**
      * 查询outLine
      * @param request

+ 0 - 24
src/main/java/com/persagy/proxy/adm/service/impl/AdmFloorServiceImpl.java

@@ -17,30 +17,6 @@ import java.util.List;
  */
 @Service
 public class AdmFloorServiceImpl extends AbstractAdmBaseServiceImpl<AdmFloor> implements IAdmFloorService {
-    @Override
-    public List<AdmFloor> doUpdateOutLine(InstanceUrlParam context, Class<AdmFloor> clazz, List<AdmFloor> voList) {
-        //根据楼层id 更新中台的floor中infos.outline中的信息,outline中的id默认为空或者省略,查询需要单独处理
-        //更新outLing信息
-        List<AdmFloor> vList = doUpdate(context, clazz, voList);
-        //修改关系计算相关信息
-       /* List<String> listtype = new ArrayList<String>();
-        listtype.add("Sh2Bd");
-        listtype.add("Bd2Sp");
-        listtype.add("Fl2Sp");
-        listtype.add("Sy2Bd");
-        listtype.add("Sy2Fl");
-        listtype.add("Eq2Fl");
-        listtype.add("Pe2Bd");
-        listtype.add("Pe2Fl");
-        for (String type : listtype){
-            JSONObject entity =  EquipmentService.relationTypeProjectservice.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("relationType", type)).entity()
-            if (entity!=null){
-                entity.computationalState = 2
-                EquipmentService.relationTypeProjectservice.update(entity)
-            }
-        }*/
-        return vList;
-    }
 
     @Override
     public AdmResponse doQueryOutLine(InstanceUrlParam context, AdmQueryCriteria request, Class<AdmFloor> clazz) {