dcs il y a 5 mois
Parent
commit
c89ce57f86

+ 2 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/test/controller/TestCont.java

@@ -397,6 +397,7 @@ public class TestCont {
                 r.setProjectItemName(r.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(r.getProjectItemId()).getName() : null);
                 r.setProjectItemTargetName(r.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(r.getProjectItemTargetId()).getName() : null);
                 r.setProjectItemTargetRoomName(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getName() : null);
+                r.setProjectItemTargetRoomNumber(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getRoomNumber() : null);
             }
         }
         return Response.ok(powerDistributionMachines);
@@ -424,6 +425,7 @@ public class TestCont {
             r.setProjectItemName(r.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(r.getProjectItemId()).getName() : null);
             r.setProjectItemTargetName(r.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(r.getProjectItemTargetId()).getName() : null);
             r.setProjectItemTargetRoomName(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getName() : null);
+            r.setProjectItemTargetRoomNumber(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getRoomNumber() : null);
         }
         return Response.ok(r);
     }

+ 9 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/test/model/PowerDistributionMachine.java

@@ -16,6 +16,7 @@ public class PowerDistributionMachine {
     private String projectItemTargetName;
     private long projectItemTargetRoomId;
     private String projectItemTargetRoomName;
+    private String projectItemTargetRoomNumber;
 
     /**
      * 类型
@@ -117,6 +118,14 @@ public class PowerDistributionMachine {
         this.projectItemTargetRoomName = projectItemTargetRoomName;
     }
 
+    public String getProjectItemTargetRoomNumber() {
+        return projectItemTargetRoomNumber;
+    }
+
+    public void setProjectItemTargetRoomNumber(String projectItemTargetRoomNumber) {
+        this.projectItemTargetRoomNumber = projectItemTargetRoomNumber;
+    }
+
     public int getType() {
         return type;
     }