fix

virgo.api/src/main/java/com/bosshand/virgo/api/test/controller/TestCont.java

@@ -1,5 +1,6 @@
 package com.bosshand.virgo.api.test.controller;
 
+import com.bosshand.virgo.api.service.ProjectItemTargetRoomService;
 import com.bosshand.virgo.api.test.model.*;
 import com.bosshand.virgo.api.test.service.TestService;
 import com.bosshand.virgo.core.response.Response;
@@ -20,6 +21,9 @@ public class TestCont {
     @Autowired
     TestService testService;
 
+    @Autowired
+    ProjectItemTargetRoomService projectItemTargetRoomService;
+
     @ApiOperation("告警检测页面获取")
     @RequestMapping(value = "/callAlarm/get", method = RequestMethod.POST)
     public Response get(@RequestBody CallAlarm data) {
@@ -207,13 +211,27 @@ public class TestCont {
     @ApiOperation("电子巡更-打卡获取")
     @RequestMapping(value = "/clockIn/get", method = RequestMethod.POST)
     public Response get(@RequestBody ClockIn data) {
-        return Response.ok(testService.get(data));
+        List<ClockIn> clockIns = testService.get(data);
+        if (clockIns.size() > 0) {
+            for (ClockIn info : clockIns) {
+                info.setProjectItemName(info.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(info.getProjectItemId()).getName() : null);
+                info.setProjectItemTargetName(info.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(info.getProjectItemTargetId()).getName() : null);
+                info.setProjectItemTargetRoomName(info.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(info.getProjectItemTargetRoomId()).getName() : null);
+            }
+        }
+        return Response.ok(clockIns);
     }
 
     @ApiOperation("电子巡更-打卡详情获取")
     @RequestMapping(value = "/clockIn/get/{id}", method = RequestMethod.GET)
     public Response getInfo(@PathVariable long id) {
-        return Response.ok(testService.getInfo(id));
+        ClockIn info = testService.getInfo(id);
+        if (info != null) {
+            info.setProjectItemName(info.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(info.getProjectItemId()).getName() : null);
+            info.setProjectItemTargetName(info.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(info.getProjectItemTargetId()).getName() : null);
+            info.setProjectItemTargetRoomName(info.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(info.getProjectItemTargetRoomId()).getName() : null);
+        }
+        return Response.ok(info);
     }
 
     @ApiOperation("电子巡更-打卡保存")
@@ -225,7 +243,15 @@ public class TestCont {
     @ApiOperation("电子巡更获取")
     @RequestMapping(value = "/electronicPatrol/get", method = RequestMethod.POST)
     public Response get(@RequestBody ElectronicPatrol data) {
-        return Response.ok(testService.get(data));
+        List<ElectronicPatrol> electronicPatrols = testService.get(data);
+        if (electronicPatrols.size() > 0) {
+            for (ElectronicPatrol r : electronicPatrols) {
+                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);
+            }
+        }
+        return Response.ok(electronicPatrols);
     }
 
     @ApiOperation("电子巡更保存")
@@ -237,7 +263,15 @@ public class TestCont {
     @ApiOperation("电子巡更-路径获取")
     @RequestMapping(value = "/routes/get", method = RequestMethod.POST)
     public Response get(@RequestBody Routes data) {
-        return Response.ok(testService.get(data));
+        List<Routes> routes = testService.get(data);
+        if (routes.size() > 0) {
+            for (Routes r : routes) {
+                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);
+            }
+        }
+        return Response.ok(routes);
     }
 
     @ApiOperation("电子巡更-路径保存")

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/ClockIn.java

@@ -9,8 +9,11 @@ public class ClockIn {
     private long id;
     private long projectId;
     private long projectItemId;
+    private String projectItemName;
     private long projectItemTargetId;
+    private String projectItemTargetName;
     private long projectItemTargetRoomId;
+    private String projectItemTargetRoomName;
     private String name;
     private long userId;
     private String userName;
@@ -52,6 +55,14 @@ public class ClockIn {
         this.projectItemId = projectItemId;
     }
 
+    public String getProjectItemName() {
+        return projectItemName;
+    }
+
+    public void setProjectItemName(String projectItemName) {
+        this.projectItemName = projectItemName;
+    }
+
     public long getProjectItemTargetId() {
         return projectItemTargetId;
     }
@@ -60,6 +71,14 @@ public class ClockIn {
         this.projectItemTargetId = projectItemTargetId;
     }
 
+    public String getProjectItemTargetName() {
+        return projectItemTargetName;
+    }
+
+    public void setProjectItemTargetName(String projectItemTargetName) {
+        this.projectItemTargetName = projectItemTargetName;
+    }
+
     public long getProjectItemTargetRoomId() {
         return projectItemTargetRoomId;
     }
@@ -68,6 +87,14 @@ public class ClockIn {
         this.projectItemTargetRoomId = projectItemTargetRoomId;
     }
 
+    public String getProjectItemTargetRoomName() {
+        return projectItemTargetRoomName;
+    }
+
+    public void setProjectItemTargetRoomName(String projectItemTargetRoomName) {
+        this.projectItemTargetRoomName = projectItemTargetRoomName;
+    }
+
     public String getName() {
         return name;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/ElectronicPatrol.java

@@ -8,8 +8,11 @@ public class ElectronicPatrol {
     private long id;
     private long projectId;
     private long projectItemId;
+    private String projectItemName;
     private long projectItemTargetId;
+    private String projectItemTargetName;
     private long projectItemTargetRoomId;
+    private String projectItemTargetRoomName;
     private String name;
     private String date;
     private long userId;
@@ -40,6 +43,14 @@ public class ElectronicPatrol {
         this.projectItemId = projectItemId;
     }
 
+    public String getProjectItemName() {
+        return projectItemName;
+    }
+
+    public void setProjectItemName(String projectItemName) {
+        this.projectItemName = projectItemName;
+    }
+
     public long getProjectItemTargetId() {
         return projectItemTargetId;
     }
@@ -48,6 +59,14 @@ public class ElectronicPatrol {
         this.projectItemTargetId = projectItemTargetId;
     }
 
+    public String getProjectItemTargetName() {
+        return projectItemTargetName;
+    }
+
+    public void setProjectItemTargetName(String projectItemTargetName) {
+        this.projectItemTargetName = projectItemTargetName;
+    }
+
     public long getProjectItemTargetRoomId() {
         return projectItemTargetRoomId;
     }
@@ -56,6 +75,14 @@ public class ElectronicPatrol {
         this.projectItemTargetRoomId = projectItemTargetRoomId;
     }
 
+    public String getProjectItemTargetRoomName() {
+        return projectItemTargetRoomName;
+    }
+
+    public void setProjectItemTargetRoomName(String projectItemTargetRoomName) {
+        this.projectItemTargetRoomName = projectItemTargetRoomName;
+    }
+
     public String getName() {
         return name;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/Routes.java

@@ -11,8 +11,11 @@ public class Routes {
     private String name;
     private long projectId;
     private long projectItemId;
+    private String projectItemName;
     private long projectItemTargetId;
+    private String projectItemTargetName;
     private long projectItemTargetRoomId;
+    private String projectItemTargetRoomName;
     private String bimId;
     private String content;
     private List<RoutesPoint> points;
@@ -49,6 +52,14 @@ public class Routes {
         this.projectItemId = projectItemId;
     }
 
+    public String getProjectItemName() {
+        return projectItemName;
+    }
+
+    public void setProjectItemName(String projectItemName) {
+        this.projectItemName = projectItemName;
+    }
+
     public long getProjectItemTargetId() {
         return projectItemTargetId;
     }
@@ -57,6 +68,14 @@ public class Routes {
         this.projectItemTargetId = projectItemTargetId;
     }
 
+    public String getProjectItemTargetName() {
+        return projectItemTargetName;
+    }
+
+    public void setProjectItemTargetName(String projectItemTargetName) {
+        this.projectItemTargetName = projectItemTargetName;
+    }
+
     public long getProjectItemTargetRoomId() {
         return projectItemTargetRoomId;
     }
@@ -65,6 +84,14 @@ public class Routes {
         this.projectItemTargetRoomId = projectItemTargetRoomId;
     }
 
+    public String getProjectItemTargetRoomName() {
+        return projectItemTargetRoomName;
+    }
+
+    public void setProjectItemTargetRoomName(String projectItemTargetRoomName) {
+        this.projectItemTargetRoomName = projectItemTargetRoomName;
+    }
+
     public String getBimId() {
         return bimId;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/test/service/TestService.java

@@ -369,7 +369,8 @@ public class TestService {
     }
 
     public List<Routes> get(Routes data) {
-        return routesdao.get(data);
+        List<Routes> routes = routesdao.get(data);
+        return routes;
     }
 
     public Routes save(Routes data) {