fix

virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectItemController.java

@@ -1,5 +1,7 @@
 package com.bosshand.virgo.api.controller;
 
+import com.bosshand.virgo.api.model.BimModelTarget;
+import com.bosshand.virgo.api.model.BimType;
 import com.bosshand.virgo.api.model.ProjectItem;
 import com.bosshand.virgo.api.service.ProjectItemService;
 import com.bosshand.virgo.api.service.ProjectItemTargetRoomService;
@@ -71,5 +73,56 @@ public class ProjectItemController {
 		return Response.ok(projectItemService.get(id));
 	}
 
+	//*******************************************************************
+
+	@ApiOperation(value = "bim绑定", notes = "获取")
+	@RequestMapping(value = "/target/{projectItemTargetId}", method = RequestMethod.GET)
+	public Response getBimModelTarget(@PathVariable long projectItemTargetId) {
+		return Response.ok(projectItemService.getBimModelTarget(projectItemTargetId));
+	}
+
+	@ApiOperation(value = "bim绑定", notes = "绑定")
+	@RequestMapping(value = "/target", method = RequestMethod.POST)
+	public Response saveBimModelTarget(@RequestBody BimModelTarget bimModelTarget) {
+		projectItemService.saveBimModelTarget(bimModelTarget);
+		return Response.ok();
+	}
+
+	@ApiOperation(value = "bim绑定", notes = "修改")
+	@RequestMapping(value = "/target", method = RequestMethod.PUT)
+	public Response updateBimModelTarget(@RequestBody BimModelTarget bimModelTarget) {
+		projectItemService.updateBimModelTarget(bimModelTarget);
+		return Response.ok();
+	}
+
+	//*******************************************************************
+
+	@ApiOperation(value = "bim类型列表", notes = "bim类型列表")
+	@RequestMapping(value = "/bimType", method = RequestMethod.GET)
+	public Response getBimTypeList() {
+		return Response.ok(projectItemService.getBimTypeList());
+	}
+
+	@ApiOperation(value = "bim类型保存", notes = "bim类型保存")
+	@RequestMapping(value = "/bimType", method = RequestMethod.POST)
+	public Response saveBimType(@RequestBody BimType bimType) {
+		projectItemService.saveBimType(bimType);
+		return Response.ok();
+	}
+
+	@ApiOperation(value = "bim类型修改", notes = "bim类型修改")
+	@RequestMapping(value = "/bimType", method = RequestMethod.PUT)
+	public Response updateBimType(@RequestBody BimType bimType) {
+		projectItemService.updateBimType(bimType);
+		return Response.ok();
+	}
+
+	@ApiOperation(value = "bim类型删除", notes = "bim类型删除")
+	@RequestMapping(value = "/bimType/{id}", method = RequestMethod.DELETE)
+	public Response deleteBimType(@PathVariable int id) {
+		projectItemService.deleteBimType(id);
+		return Response.ok();
+	}
+
 
 }

virgo.api/src/main/java/com/bosshand/virgo/api/dao/BimModelTargetDao.java

@@ -0,0 +1,19 @@
+package com.bosshand.virgo.api.dao;
+
+import com.bosshand.virgo.api.model.BimModelTarget;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BimModelTargetDao {
+
+	void save(BimModelTarget bimModelTarget);
+
+	void update(BimModelTarget bimModelTarget);
+
+	BimModelTarget getByProjectItemTargetId(long projectItemTargetId);
+
+	List<BimModelTarget> getProjectItemTargetIds(List<Long> ids);
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/dao/BimTypeDao.java

@@ -0,0 +1,19 @@
+package com.bosshand.virgo.api.dao;
+
+import com.bosshand.virgo.api.model.BimType;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BimTypeDao {
+	
+	void delete(int id);
+	
+	void save(BimType bimType);
+
+	void update(BimType bimType);
+	
+	List<BimType> getList();
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/model/BimModelTarget.java

@@ -0,0 +1,38 @@
+package com.bosshand.virgo.api.model;
+
+/**
+ * 绑定模型
+ */
+public class BimModelTarget {
+	
+	private long id;
+	
+	private long projectItemTargetId;
+	
+	private String bims;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public long getProjectItemTargetId() {
+		return projectItemTargetId;
+	}
+
+	public void setProjectItemTargetId(long projectItemTargetId) {
+		this.projectItemTargetId = projectItemTargetId;
+	}
+
+	public String getBims() {
+		return bims;
+	}
+
+	public void setBims(String bims) {
+		this.bims = bims;
+	}
+	
+}

virgo.api/src/main/java/com/bosshand/virgo/api/model/BimType.java

@@ -0,0 +1,28 @@
+package com.bosshand.virgo.api.model;
+
+/**
+ * 模型类型
+ */
+public class BimType {
+	
+	private int id;
+	
+	private String typeName;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/model/ProjectItem.java

@@ -58,6 +58,16 @@ public class ProjectItem {
 	 */
 	private String data;
 
+	/**
+	 * bim集成id
+	 */
+	private String bimIntegrateId;
+
+	/**
+	 * 集成次数
+	 */
+	private int bimIntegrateNumber;
+
 	private List<ProjectItemTarget> projectItemTargetList;
 
 	public long getId() {
@@ -140,6 +150,22 @@ public class ProjectItem {
 		this.data = data;
 	}
 
+	public String getBimIntegrateId() {
+		return bimIntegrateId;
+	}
+
+	public void setBimIntegrateId(String bimIntegrateId) {
+		this.bimIntegrateId = bimIntegrateId;
+	}
+
+	public int getBimIntegrateNumber() {
+		return bimIntegrateNumber;
+	}
+
+	public void setBimIntegrateNumber(int bimIntegrateNumber) {
+		this.bimIntegrateNumber = bimIntegrateNumber;
+	}
+
 	public List<ProjectItemTarget> getProjectItemTargetList() {
 		return projectItemTargetList;
 	}

virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectItemService.java

@@ -1,6 +1,10 @@
 package com.bosshand.virgo.api.service;
 
+import com.bosshand.virgo.api.dao.BimModelTargetDao;
+import com.bosshand.virgo.api.dao.BimTypeDao;
 import com.bosshand.virgo.api.dao.ProjectItemDao;
+import com.bosshand.virgo.api.model.BimModelTarget;
+import com.bosshand.virgo.api.model.BimType;
 import com.bosshand.virgo.api.model.ProjectItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,6 +17,12 @@ public class ProjectItemService {
 	@Autowired
 	private ProjectItemDao projectItemDao;
 
+	@Autowired
+	private BimModelTargetDao bimModelTargetDao;
+
+	@Autowired
+	private BimTypeDao bimTypeDao;
+
 	public int insert(ProjectItem projectItem) {
 		return projectItemDao.insert(projectItem);
 	}
@@ -38,4 +48,34 @@ public class ProjectItemService {
 		return projectItemDao.getLimit(projectItem, currIndex, pageSize);
 	}
 
+	// BimModelTarget
+	public void saveBimModelTarget(BimModelTarget bimModelTarget) {
+		bimModelTargetDao.save(bimModelTarget);
+	}
+
+	public void updateBimModelTarget(BimModelTarget bimModelTarget) {
+		bimModelTargetDao.update(bimModelTarget);
+	}
+
+	public BimModelTarget getBimModelTarget(long projectItemTargetId) {
+		return bimModelTargetDao.getByProjectItemTargetId(projectItemTargetId);
+	}
+
+	// BimType
+	public void saveBimType(BimType bimType) {
+		bimTypeDao.save(bimType);
+	}
+
+	public void updateBimType(BimType bimType) {
+		bimTypeDao.update(bimType);
+	}
+
+	public void deleteBimType(int id) {
+		bimTypeDao.delete(id);
+	}
+
+	public List<BimType> getBimTypeList() {
+		return bimTypeDao.getList();
+	}
+
 }

virgo.api/src/main/resources/mapper/BimModelTargetMapper.xml

@@ -0,0 +1,46 @@
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ 
+<mapper namespace="com.bosshand.virgo.api.dao.BimModelTargetDao">
+
+	<resultMap type="com.bosshand.virgo.api.model.BimModelTarget" id="bimModelTargetResult">
+			<id column="id" property="id"/>
+			<result column="projectItemTargetId" property="projectItemTargetId"/>
+			<result column="bims" property="bims"/>
+	</resultMap>
+
+	<select id="getByProjectItemTargetId" resultMap="bimModelTargetResult">
+		SELECT * FROM project_item_target_bim_model where projectItemTargetId=#{projectItemTargetId}
+	</select>
+	
+	<insert id="save" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO project_item_target_bim_model(projectItemTargetId, bims) VALUES (#{projectItemTargetId}, #{bims})
+	</insert>
+	
+	<update id="update" parameterType="com.bosshand.virgo.api.model.BimModelTarget">
+		UPDATE project_item_target_bim_model
+		<trim prefix="set" suffixOverrides=",">
+			<if test="projectItemTargetId!=-1">projectItemTargetId=#{projectItemTargetId},</if>
+			<if test="bims!=null">bims=#{bims},</if>
+		</trim>
+		WHERE id=#{id}
+	</update>
+	
+	<select id="getProjectItemTargetIds" parameterType="list" resultType="com.bosshand.virgo.api.model.BimModelTarget">
+        select * from project_item_target_bim_model
+        <choose>
+			<when test="list.size > 0">
+				where projectItemTargetId in (
+				<foreach collection="list" item="item" index="index" separator=",">
+					#{item}
+				</foreach>
+				)
+			</when>
+			<otherwise>
+				where 1=0
+			</otherwise>
+	</choose>
+    </select>
+	
+</mapper>

virgo.api/src/main/resources/mapper/BimTypeMapper.xml

@@ -0,0 +1,32 @@
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ 
+<mapper namespace="com.bosshand.virgo.api.dao.BimTypeDao">
+
+	<resultMap type="com.bosshand.virgo.api.model.BimType" id="bimTypeResult">
+			<id column="id" property="id"/>
+			<result column="typeName" property="typeName"/>
+	</resultMap>
+
+	<select id="getList" resultMap="bimTypeResult">
+		SELECT * FROM bim_type
+	</select>
+	
+	<insert id="save" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO bim_type(typeName) VALUES (#{typeName})
+	</insert>
+	
+	<update id="update" parameterType="com.bosshand.virgo.api.model.BimType">
+		UPDATE bim_type
+		<trim prefix="set" suffixOverrides=",">
+			<if test="typeName!=null">typeName=#{typeName},</if>
+		</trim>
+		WHERE id=#{id}
+	</update>
+	
+	<delete id="delete">
+		DELETE FROM bim_type WHERE id=#{id}
+	</delete>
+	
+</mapper>

virgo.api/src/main/resources/mapper/ProjectItemMapper.xml

@@ -15,6 +15,8 @@
 			<result column="propertyCertificateNumber" property="propertyCertificateNumber"/>
 			<result column="tagIds" property="tagIds"/>
 			<result column="data" property="data"/>
+			<result column="bimIntegrateId" property="bimIntegrateId"/>
+			<result column="bimIntegrateNumber" property="bimIntegrateNumber"/>
 	</resultMap>
 
 	<resultMap type="com.bosshand.virgo.api.model.ProjectItem" id="result">
@@ -28,6 +30,8 @@
 		<result column="propertyCertificateNumber" property="propertyCertificateNumber"/>
 		<result column="tagIds" property="tagIds"/>
 		<result column="data" property="data"/>
+		<result column="bimIntegrateId" property="bimIntegrateId"/>
+		<result column="bimIntegrateNumber" property="bimIntegrateNumber"/>
 		<collection property="projectItemTargetList" ofType="com.bosshand.virgo.api.model.ProjectItemTarget" resultMap="com.bosshand.virgo.api.dao.ProjectItemTargetDao.projectItemTargetResult" columnPrefix="projectItemTarget_"/>
 	</resultMap>
 
@@ -115,6 +119,8 @@
 			<if test="propertyCertificateNumber!=null">propertyCertificateNumber=#{propertyCertificateNumber},</if>
 			<if test="tagIds!=null">tagIds=#{tagIds},</if>
 			<if test="data!=null">data=#{data},</if>
+			<if test="bimIntegrateId!=null">bimIntegrateId=#{bimIntegrateId},</if>
+			<if test="bimIntegrateNumber!=0">bimIntegrateNumber=#{bimIntegrateNumber},</if>
 		</trim>
 		WHERE id=#{id}
 	</update>