|
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.ws.rs.QueryParam;
|
|
import javax.ws.rs.QueryParam;
|
|
-import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -103,7 +102,7 @@ public class AdmFloorController {
|
|
// 组装上下文条件
|
|
// 组装上下文条件
|
|
InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
List<AdmFloor> vos = CollUtil.newArrayList(admFloor.getContent());
|
|
List<AdmFloor> vos = CollUtil.newArrayList(admFloor.getContent());
|
|
- vos = service.doUpdate(context, AdmFloor.class, vos);
|
|
|
|
|
|
+ vos = service.doUpdateOutLine(context, AdmFloor.class, vos);
|
|
return AdmResponse.success(vos);
|
|
return AdmResponse.success(vos);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -138,19 +137,7 @@ public class AdmFloorController {
|
|
// 组装上下文条件
|
|
// 组装上下文条件
|
|
InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
request.setName("floor");
|
|
request.setName("floor");
|
|
- request.setProjection(null);
|
|
|
|
- List<String> list = new ArrayList<>();
|
|
|
|
- list.add("id");
|
|
|
|
- list.add("name");
|
|
|
|
- list.add("localId");
|
|
|
|
- list.add("localName");
|
|
|
|
- list.add("outline");
|
|
|
|
- list.add("floorSequenceId");
|
|
|
|
- list.add("modelId");
|
|
|
|
- list.add("infos");
|
|
|
|
- list.add("properties");
|
|
|
|
- request.setProjection(list);
|
|
|
|
- return service.doQuery(context, request, AdmFloor.class);
|
|
|
|
|
|
+ return service.doQueryOutLine(context, request, AdmFloor.class);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|