dcs пре 6 месеци
родитељ
комит
9b5272602a

+ 7 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectItemTargetRoomController.java

@@ -181,4 +181,11 @@ public class ProjectItemTargetRoomController {
         return Response.ok(projectItemTargetRoomService.getLevel(projectId));
     }
 
+    @RequestMapping(value = "/open/roomIds/{roomIds}", method = RequestMethod.GET)
+    public Map<Long, String> getRoomIds(@PathVariable String roomIds) {
+        Map<Long, String> map = new HashMap<>();
+        projectItemTargetRoomService.getRoomLevel(map, roomIds);
+        return map;
+    }
+
 }

+ 15 - 0
virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrClient.java

@@ -1,5 +1,7 @@
 package com.bosshand.virgo.core.model;
 
+import java.util.Map;
+
 /**
  * 客户
  */
@@ -90,6 +92,11 @@ public class MgrClient {
      */
     private String firsTimeRoom;
 
+    /**
+     * DTO-房源
+     */
+    private Map<Long, String> roomMap;
+
     private long id;
 
     /**
@@ -238,6 +245,14 @@ public class MgrClient {
         this.firsTimeRoom = firsTimeRoom;
     }
 
+    public Map<Long, String> getRoomMap() {
+        return roomMap;
+    }
+
+    public void setRoomMap(Map<Long, String> roomMap) {
+        this.roomMap = roomMap;
+    }
+
     public long getId() {
         return id;
     }

+ 6 - 0
virgo.manager/src/main/java/com/bosshand/virgo/message/service/ApiClient.java

@@ -1,10 +1,13 @@
 package com.bosshand.virgo.message.service;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.util.Map;
+
 @FeignClient("virgo-api")
 public interface ApiClient {
 
@@ -14,4 +17,7 @@ public interface ApiClient {
     @RequestMapping(value = "/constructionLog/saveNotice", method = RequestMethod.POST)
     public void saveNotice(@RequestBody String data);
 
+    @RequestMapping(value = "/projectItemTargetRoom/open/roomIds/{roomIds}", method = RequestMethod.GET)
+    Map<Long, String> getRoomIds(@PathVariable String roomIds);
+
 }

+ 8 - 1
virgo.manager/src/main/java/com/bosshand/virgo/service/ClientService.java

@@ -2,6 +2,7 @@ package com.bosshand.virgo.service;
 
 import com.bosshand.virgo.core.dao.MgrClientDao;
 import com.bosshand.virgo.core.model.MgrClient;
+import com.bosshand.virgo.message.service.ApiClient;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -21,6 +22,9 @@ public class ClientService {
     @Autowired
     MgrClientDao clientDao;
 
+    @Autowired
+    ApiClient apiClient;
+
     public int insert(MgrClient mgrClient) {
         return clientDao.insert(mgrClient);
     }
@@ -34,7 +38,10 @@ public class ClientService {
     }
 
     public MgrClient get(long id) {
-        return clientDao.get(id);
+        MgrClient mgrClient = clientDao.get(id);
+        Map<Long, String> roomIds = apiClient.getRoomIds(mgrClient.getFirsTimeRoom());
+        mgrClient.setRoomMap(roomIds);
+        return mgrClient;
     }
 
     public int delete(long id) {