dcs 11 bulan lalu
induk
melakukan
056a03fede

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

@@ -26,6 +26,18 @@ public class ProjectItemTargetRoomController {
     @ApiOperation("获取")
     @RequestMapping(value = "/{currPage}/{pageSize}", method = RequestMethod.POST)
     public Response list(@RequestBody ProjectItemTargetRoom projectItemTargetRoom, @PathVariable int currPage, @PathVariable int pageSize) {
+        return getResponse(currPage, pageSize, projectItemTargetRoom);
+    }
+
+    @ApiOperation("获取公海房源")
+    @RequestMapping(value = "/open/{currPage}/{pageSize}", method = RequestMethod.GET)
+    public Response listOpen(@PathVariable int currPage, @PathVariable int pageSize) {
+        ProjectItemTargetRoom projectItemTargetRoom = new ProjectItemTargetRoom();
+        projectItemTargetRoom.setOpenState(2);
+        return getResponse(currPage, pageSize, projectItemTargetRoom);
+    }
+
+    private Response getResponse(int currPage, int pageSize, ProjectItemTargetRoom projectItemTargetRoom) {
         int totalCount = projectItemTargetRoomService.getTotalCount(projectItemTargetRoom);
         List<ProjectItemTargetRoom> dataList = projectItemTargetRoomService.getLimit(projectItemTargetRoom, currPage, pageSize);
         List<Tag> tags = new ArrayList<>();

+ 13 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/model/Project.java

@@ -58,6 +58,11 @@ public class Project {
      */
     private String comment;
 
+    /**
+     * 地理坐标
+     */
+    private String coordinates;
+
     /**
      * 自定义字段
      */
@@ -145,6 +150,14 @@ public class Project {
         this.comment = comment;
     }
 
+    public String getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(String coordinates) {
+        this.coordinates = coordinates;
+    }
+
     public String getData() {
         return data;
     }

+ 5 - 2
virgo.api/src/main/resources/mapper/ProjectMapper.xml

@@ -13,6 +13,7 @@
 		<result column="picture" property="picture"/>
 		<result column="tagIds" property="tagIds"/>
 		<result column="comment" property="comment"/>
+		<result column="coordinates" property="coordinates"/>
 		<result column="data" property="data"/>
 	</resultMap>
 
@@ -26,6 +27,7 @@
 		<result column="picture" property="picture"/>
 		<result column="tagIds" property="tagIds"/>
 		<result column="comment" property="comment"/>
+		<result column="coordinates" property="coordinates"/>
 		<result column="data" property="data"/>
 		<collection property="projectItemList" ofType="com.bosshand.virgo.api.model.ProjectItem" resultMap="com.bosshand.virgo.api.dao.ProjectItemDao.projectItemResult" columnPrefix="projectItem_"/>
 	</resultMap>
@@ -68,8 +70,8 @@
 	</select>
 
 	<insert id="insert" parameterType="com.bosshand.virgo.api.model.Project" useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO project(`type`, `name`, `createDate`, `organizationId`, `address`, `picture`, `tagIds`, `comment`, `data`)
-		VALUES (#{type}, #{name}, now(), #{organizationId}, #{address}, #{picture}, #{tagIds}, #{comment}, #{data})
+		INSERT INTO project(`type`, `name`, `createDate`, `organizationId`, `address`, `picture`, `tagIds`, `comment`, `coordinates`, `data`)
+		VALUES (#{type}, #{name}, now(), #{organizationId}, #{address}, #{picture}, #{tagIds}, #{comment}, #{coordinates}, #{data})
 	</insert>
 
 	<update id="delete">
@@ -87,6 +89,7 @@
 			<if test="picture!=null">picture=#{picture},</if>
 			<if test="tagIds!=null">tagIds=#{tagIds},</if>
 			<if test="comment!=null">comment=#{comment},</if>
+			<if test="coordinates!=null">coordinates=#{coordinates},</if>
 			<if test="data!=null">data=#{data},</if>
 		</trim>
 		WHERE id=#{id}

+ 1 - 1
virgo.core/src/main/java/com/bosshand/virgo/core/config/ShiroConfig.java

@@ -63,7 +63,7 @@ public class ShiroConfig {
 
 		filterChainDefinitionMap.put("/client/downloadModel", "anon");
 		filterChainDefinitionMap.put("/project/getProjectName/**", "anon");
-		filterChainDefinitionMap.put("/projectItemFromYui/**", "anon");
+		filterChainDefinitionMap.put("/projectItemTargetRoom/open/**", "anon");
 		filterChainDefinitionMap.put("/flow/projectFromYui/**","anon");
 		filterChainDefinitionMap.put("/flowYuiDataFromYui/**","anon");
 		filterChainDefinitionMap.put("/druid/**","anon");