fix

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

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping({"tag"})
 @Api(tags = {"标签管理"})
@@ -19,6 +21,10 @@ public class TagController {
     @ApiOperation("保存")
     @RequestMapping(value = "", method = RequestMethod.POST)
     public Response insert(@RequestBody Tag tag) {
+        List<Tag> list = tagService.getList(tag);
+        if (list.size() > 0) {
+            return Response.fail(10001, "标签已存在！");
+        }
         tagService.insert(tag);
         return Response.ok();
     }

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

@@ -8,13 +8,15 @@ public class Tag {
 
     private long id;
 
+    /**
+     * 名称
+     */
     private String  name;
 
-    private long projectId;
-
-    private long projectItemId;
-
-    private long projectItemTargetRoomId;
+    /**
+     * 标签类型 1：项目，2：单位工程，3：房源
+     */
+    private int type;
 
     public long getId() {
         return id;
@@ -32,27 +34,11 @@ public class Tag {
         this.name = name;
     }
 
-    public long getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
-    public long getProjectItemId() {
-        return projectItemId;
-    }
-
-    public void setProjectItemId(long projectItemId) {
-        this.projectItemId = projectItemId;
-    }
-
-    public long getProjectItemTargetRoomId() {
-        return projectItemTargetRoomId;
+    public int getType() {
+        return type;
     }
 
-    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
-        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    public void setType(int type) {
+        this.type = type;
     }
 }

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

@@ -7,9 +7,7 @@
     <resultMap type="com.bosshand.virgo.api.model.Tag" id="tagResult">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
-        <result column="projectId" property="projectId"/>
-        <result column="projectItemId" property="projectItemId"/>
-        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
+        <result column="type" property="type"/>
     </resultMap>
 
     <select id="getList" resultMap="tagResult">
@@ -21,17 +19,14 @@
             <if test="name != null">
                 and name = #{name}
             </if>
-            <if test="projectItemId != 0">
-                and projectItemId = #{projectItemId}
-            </if>
-            <if test="projectItemTargetRoomId != 0">
-                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            <if test="type != 0">
+                and type = #{type}
             </if>
         </where>
     </select>
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO tag (name, projectId, projectItemId, projectItemTargetRoomId) VALUES (#{name}, #{projectId}, #{projectItemId}, #{projectItemTargetRoomId})
+        INSERT INTO tag (name, type) VALUES (#{name}, #{type})
     </insert>
 
     <delete id="delete">
@@ -42,9 +37,7 @@
         UPDATE tag
         <trim prefix="set" suffixOverrides=",">
             <if test="name!=null">name=#{name},</if>
-            <if test="projectId!=0">projectId=#{projectId},</if>
-            <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
-            <if test="projectItemTargetRoomId!=0">projectItemTargetRoomId=#{projectItemTargetRoomId},</if>
+            <if test="type!=0">type=#{type},</if>
         </trim>
         WHERE id=#{id}
     </update>

virgo.manager/src/main/java/com/bosshand/virgo/controller/ResourceController.java

@@ -1,18 +1,16 @@
 package com.bosshand.virgo.controller;
 
-import java.util.List;
-
+import com.bosshand.virgo.core.model.MgrResource;
+import com.bosshand.virgo.core.response.Response;
+import com.bosshand.virgo.service.ResourceService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.bosshand.virgo.core.model.MgrResource;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.service.ResourceService;
-
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
 
 @RestController
 @RequestMapping("resource")
@@ -20,16 +18,23 @@ public class ResourceController {
 	
 	@Autowired
 	ResourceService resourceService;
-	
-	@ApiOperation(value="资源管理", notes="资源列表")
+
+	@ApiOperation("资源新增")
+	@RequestMapping(value = "", method = RequestMethod.POST)
+	public Response insertResource(@RequestBody MgrResource mgrResource) {
+		resourceService.insert(mgrResource);
+		return Response.ok();
+	}
+
+	@ApiOperation("资源列表")
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Response getResourceList() {
 		List<MgrResource> list = resourceService.getList();
 		return Response.ok(list);
 	}
 	
-	@ApiOperation(value="资源管理", notes="资源更新")
-	@RequestMapping(value = "/update", method = RequestMethod.POST)
+	@ApiOperation("资源更新")
+	@RequestMapping(value = "/update", method = RequestMethod.PUT)
 	public Response updateResource(@RequestBody MgrResource mgrResource) {
 		resourceService.update(mgrResource);
 		return Response.ok();

virgo.manager/src/main/java/com/bosshand/virgo/service/ResourceService.java

@@ -1,13 +1,12 @@
 package com.bosshand.virgo.service;
 
-import java.util.List;
-
+import com.bosshand.virgo.core.dao.MgrResourceDao;
+import com.bosshand.virgo.core.model.MgrResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.bosshand.virgo.core.dao.MgrResourceDao;
-import com.bosshand.virgo.core.model.MgrResource;
+import java.util.List;
 
 @Service
 public class ResourceService {
@@ -29,7 +28,6 @@ public class ResourceService {
 	
 	@Transactional
 	public int update(MgrResource MgrResource) {
-		
 		return mgrResourceDao.update(MgrResource);
 	}