Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
6c31b2c98f

+ 2 - 3
src/main/java/com/persagy/proxy/object/controller/AdmPropertyController.java

@@ -62,7 +62,6 @@ public class AdmPropertyController {
      */
     @PostMapping("/update")
     public AdmResponse update(@RequestBody AdmCreateRequest<AdmProperty> createRequest, @QueryParam("projectId") String projectId) throws Exception {
-        
         List<AdmProperty> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmProperty.class, vos);
         return AdmResponse.success(vos);
@@ -78,7 +77,7 @@ public class AdmPropertyController {
      */
     @PostMapping("/query")
     public AdmResponse query(@RequestBody AdmQueryCriteria request) throws Exception {
-        request.setName("equipment");
+        request.setName(AdmProperty.OBJ_TYPE);
         return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmProperty.class);
     }
 
@@ -92,7 +91,7 @@ public class AdmPropertyController {
      */
     @PostMapping("/count")
     public AdmResponse count(@RequestBody AdmQueryCriteria request) throws Exception {
-        request.setName("equipment");
+        request.setName(AdmProperty.OBJ_TYPE);
         request.setOnlyCount(true);
         return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmProperty.class);
     }

+ 2 - 5
src/main/java/com/persagy/proxy/object/controller/AdmSystemController.java

@@ -168,15 +168,12 @@ public class AdmSystemController {
     /**
      * 系统绑定的动态信息点或静态信息点
      * type: static(静态),iot (动态)
-
-     * @param request
      * @return
      * @throws Exception
      */
     @GetMapping("/export")
-    public AdmResponse exportInfos(@RequestBody AdmQueryCriteria request) {
-        request.setName(AdmSystem.OBJ_TYPE);
-        return service.query(request);
+    public AdmResponse exportInfos(@RequestParam("type") String type,@RequestParam("projectId") String projectId) throws Exception {
+        return null;
     }
 
     /**