Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-twin into develop

lijie 3 years ago
parent
commit
cecda83bbc

+ 3 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/controller/SystemController.java

@@ -64,8 +64,7 @@ public class SystemController {
 
     /**
      * 根据条件查询系统 针对查询条件中有distinct 和 projectiond 的情况
-     * {
-     *     "distinct": true,
+     * {   "distinct": true,
      *     "pageNumber": 1,
      *     "pageSize": 1000,
      *     "projection": [
@@ -77,8 +76,8 @@ public class SystemController {
      * @return
      * @throws IOException
      */
-    @PostMapping("/querySystemListByConditions")
-    public CommonResult<List<ObjectNode>> querySystemListByConditions(@RequestBody RequestData requestData) throws IOException {
+    @PostMapping("/queryObjListByConditions")
+    public CommonResult<List<ObjectNode>> queryObjListByConditions(@RequestBody RequestData requestData) throws IOException {
         // 暂时先拼接query接口参数进行查询,后续视情况再单独写逻辑
         ObjectMapper objectMapper = JsonHelper.objectMapper;
         QueryCriteria queryCriteria = new QueryCriteria();

+ 2 - 2
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/simple/client/DigitalObjectSimpleClient.java

@@ -117,8 +117,8 @@ public interface DigitalObjectSimpleClient {
      * @param requestData: 请求参数
      * @return
      */
-    @PostMapping("custom/system/querySystemListByConditions")
-    CommonResult<List<ObjectNode>> querySystemListByConditions(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
+    @PostMapping("custom/system/queryObjListByConditions")
+    CommonResult<List<ObjectNode>> queryObjListByConditions(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
                                                                @RequestParam("appId") String appId,
                                                                @RequestParam("userId") String userId, @RequestBody RequestData requestData);
     /***

+ 2 - 2
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/simple/client/DigitalObjectSimpleFacade.java

@@ -128,10 +128,10 @@ public class DigitalObjectSimpleFacade {
      * @param requestData: 请求参数
      * @return
      */
-    public static CommonResult<List<ObjectNode>> querySystemListByConditions(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
+    public static CommonResult<List<ObjectNode>> queryObjListByConditions(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
                                                                @RequestParam("appId") String appId,
                                                                @RequestParam("userId") String userId, @RequestBody RequestData requestData){
-        CommonResult<List<ObjectNode>> result = client.querySystemListByConditions(groupCode, projectId,appId, userId, requestData);
+        CommonResult<List<ObjectNode>> result = client.queryObjListByConditions(groupCode, projectId,appId, userId, requestData);
         return result;
     }
     /***