|
@@ -38,7 +38,7 @@ func init() {
|
|
//标签库列表
|
|
//标签库列表
|
|
func TagData(c *gin.Context) {
|
|
func TagData(c *gin.Context) {
|
|
version, _ := c.GetPostForm("version")
|
|
version, _ := c.GetPostForm("version")
|
|
- data, _ := Mgo.Find("tag", `{"s_version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
|
|
|
|
+ data, _ := Mgo.Find("tag", `{"s_version":"`+version+`","delete":true}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
for _, d := range *data {
|
|
for _, d := range *data {
|
|
timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
|
|
timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
|
|
d["l_intime"] = timeStr
|
|
d["l_intime"] = timeStr
|
|
@@ -52,7 +52,7 @@ func TagSave(c *gin.Context) {
|
|
version, _ := c.GetPostForm("version")
|
|
version, _ := c.GetPostForm("version")
|
|
username, _ := c.GetPostForm("username")
|
|
username, _ := c.GetPostForm("username")
|
|
tp, _ := c.GetPostForm("tp")
|
|
tp, _ := c.GetPostForm("tp")
|
|
- data, _ := Mgo.FindOne("tag", `{"s_tagname":"`+tagname+`","s_version":"`+version+`"}`)
|
|
|
|
|
|
+ data, _ := Mgo.FindOne("tag", `{"s_tagname":"`+tagname+`","s_version":"`+version+`","delete":true}`)
|
|
if len(*data) > 0 { //判重,防止添加name相同的标签
|
|
if len(*data) > 0 { //判重,防止添加name相同的标签
|
|
c.JSON(200, gin.H{"rep": false})
|
|
c.JSON(200, gin.H{"rep": false})
|
|
return
|
|
return
|
|
@@ -63,6 +63,7 @@ func TagSave(c *gin.Context) {
|
|
"s_creater": username,
|
|
"s_creater": username,
|
|
"s_type": tp,
|
|
"s_type": tp,
|
|
"l_intime": time.Now().Unix(),
|
|
"l_intime": time.Now().Unix(),
|
|
|
|
+ "delete": true,
|
|
}
|
|
}
|
|
b := Mgo.Save("tag", save)
|
|
b := Mgo.Save("tag", save)
|
|
if b != "" {
|
|
if b != "" {
|
|
@@ -75,12 +76,17 @@ func TagSave(c *gin.Context) {
|
|
//删除标签
|
|
//删除标签
|
|
func TagDel(c *gin.Context) {
|
|
func TagDel(c *gin.Context) {
|
|
_id, _ := c.GetPostForm("_id")
|
|
_id, _ := c.GetPostForm("_id")
|
|
- b := Mgo.Del("tag", `{"_id":"`+_id+`"}`)
|
|
|
|
|
|
+ b := Mgo.Update("tag", `{"_id":"`+_id+`"}`, map[string]interface{}{
|
|
|
|
+ "$set": map[string]interface{}{"delete": false},
|
|
|
|
+ }, false, false)
|
|
data, _ := Mgo.Find("tagdetailinfo", `{"s_parentid":"`+_id+`"}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
data, _ := Mgo.Find("tagdetailinfo", `{"s_parentid":"`+_id+`"}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
if len(*data) > 0 { //删除父标签下所有详细标签
|
|
if len(*data) > 0 { //删除父标签下所有详细标签
|
|
for _, d := range *data {
|
|
for _, d := range *data {
|
|
cid := d["_id"].(bson.ObjectId).Hex()
|
|
cid := d["_id"].(bson.ObjectId).Hex()
|
|
- Mgo.Del("tagdetailinfo", `{"_id":"`+cid+`"}`)
|
|
|
|
|
|
+ //Mgo.Del("tagdetailinfo", `{"_id":"`+cid+`"}`)
|
|
|
|
+ Mgo.Update("tagdetailinfo", `{"_id":"`+cid+`"}`, map[string]interface{}{
|
|
|
|
+ "$set": map[string]interface{}{"delete": false},
|
|
|
|
+ }, false, false)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if b {
|
|
if b {
|
|
@@ -93,10 +99,8 @@ func TagDel(c *gin.Context) {
|
|
//查找某个tag的信息
|
|
//查找某个tag的信息
|
|
func OneTagData(c *gin.Context) {
|
|
func OneTagData(c *gin.Context) {
|
|
version, _ := c.GetPostForm("version")
|
|
version, _ := c.GetPostForm("version")
|
|
- //tagname, _ := c.GetPostForm("tagname")
|
|
|
|
parentid, _ := c.GetPostForm("parentid")
|
|
parentid, _ := c.GetPostForm("parentid")
|
|
- //data, _ := Mgo.Find("tagdetailinfo", `{"s_version":"`+version+`","s_pratagname":"`+tagname+`","s_parentid":"`+parentid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
|
|
- data, _ := Mgo.Find("tagdetailinfo", `{"s_version":"`+version+`","s_parentid":"`+parentid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
|
|
|
|
+ data, _ := Mgo.Find("tagdetailinfo", `{"s_version":"`+version+`","s_parentid":"`+parentid+`","delete":true}`, `{"_id":-1}`, nil, false, -1, -1)
|
|
for _, d := range *data {
|
|
for _, d := range *data {
|
|
timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
|
|
timeStr := time.Unix(d["l_intime"].(int64), 0).Format(Date_Short_Layout)
|
|
d["l_intime"] = timeStr
|
|
d["l_intime"] = timeStr
|
|
@@ -109,8 +113,7 @@ func OneTagCreate(c *gin.Context) {
|
|
name, _ := c.GetPostForm("name")
|
|
name, _ := c.GetPostForm("name")
|
|
version, _ := c.GetPostForm("version")
|
|
version, _ := c.GetPostForm("version")
|
|
parentid, _ := c.GetPostForm("parentid")
|
|
parentid, _ := c.GetPostForm("parentid")
|
|
- //data, _ := Mgo.FindOne("tagdetailinfo", `{"s_name":"`+name+`","s_pratagname":"`+pratagname+`","s_version":"`+version+`"}`)
|
|
|
|
- data, _ := Mgo.FindOne("tagdetailinfo", `{"s_name":"`+name+`","s_parentid":"`+parentid+`","s_version":"`+version+`"}`)
|
|
|
|
|
|
+ data, _ := Mgo.FindOne("tagdetailinfo", `{"s_name":"`+name+`","s_parentid":"`+parentid+`","s_version":"`+version+`","delete":true}`)
|
|
if len(*data) > 0 { //判重
|
|
if len(*data) > 0 { //判重
|
|
c.JSON(200, gin.H{"rep": false})
|
|
c.JSON(200, gin.H{"rep": false})
|
|
return
|
|
return
|
|
@@ -137,6 +140,7 @@ func OneTagCreate(c *gin.Context) {
|
|
"l_intime": time.Now().Unix(),
|
|
"l_intime": time.Now().Unix(),
|
|
"content": jsondata,
|
|
"content": jsondata,
|
|
"s_parentid": parentid,
|
|
"s_parentid": parentid,
|
|
|
|
+ "delete": true,
|
|
}
|
|
}
|
|
b := Mgo.Save("tagdetailinfo", save)
|
|
b := Mgo.Save("tagdetailinfo", save)
|
|
if b != "" {
|
|
if b != "" {
|
|
@@ -149,7 +153,9 @@ func OneTagCreate(c *gin.Context) {
|
|
//删除某个详细标签
|
|
//删除某个详细标签
|
|
func OneTagDel(c *gin.Context) {
|
|
func OneTagDel(c *gin.Context) {
|
|
_id, _ := c.GetPostForm("_id")
|
|
_id, _ := c.GetPostForm("_id")
|
|
- b := Mgo.Del("tagdetailinfo", `{"_id":"`+_id+`"}`)
|
|
|
|
|
|
+ b := Mgo.Update("tagdetailinfo", `{"_id":"`+_id+`"}`, map[string]interface{}{
|
|
|
|
+ "$set": map[string]interface{}{"delete": false},
|
|
|
|
+ }, false, false)
|
|
if b {
|
|
if b {
|
|
c.JSON(200, gin.H{"rep": true})
|
|
c.JSON(200, gin.H{"rep": true})
|
|
} else {
|
|
} else {
|
|
@@ -161,14 +167,7 @@ func OneTagDel(c *gin.Context) {
|
|
func OneTagEditSave(c *gin.Context) {
|
|
func OneTagEditSave(c *gin.Context) {
|
|
_id, _ := c.GetPostForm("_id")
|
|
_id, _ := c.GetPostForm("_id")
|
|
content, _ := c.GetPostForm("content")
|
|
content, _ := c.GetPostForm("content")
|
|
- //tp, _ := c.GetPostForm("tp")
|
|
|
|
var jsondata interface{}
|
|
var jsondata interface{}
|
|
- // var err error
|
|
|
|
- // if tp == "地区" {
|
|
|
|
- // err = json.Unmarshal([]byte(content), &jsondata)
|
|
|
|
- // } else {
|
|
|
|
- // err = json.Unmarshal([]byte(content), &jsondata)
|
|
|
|
- // }
|
|
|
|
err := json.Unmarshal([]byte(content), &jsondata)
|
|
err := json.Unmarshal([]byte(content), &jsondata)
|
|
if err != nil { //不是json格式
|
|
if err != nil { //不是json格式
|
|
c.JSON(200, gin.H{"rep": false})
|
|
c.JSON(200, gin.H{"rep": false})
|
|
@@ -192,7 +191,5 @@ func OneTagEditSave(c *gin.Context) {
|
|
func OneTagSearch(c *gin.Context) {
|
|
func OneTagSearch(c *gin.Context) {
|
|
_id, _ := c.GetPostForm("_id")
|
|
_id, _ := c.GetPostForm("_id")
|
|
data, _ := Mgo.FindOne("tagdetailinfo", `{"_id":"`+_id+`"}`)
|
|
data, _ := Mgo.FindOne("tagdetailinfo", `{"_id":"`+_id+`"}`)
|
|
- //b, _ := json.Marshal((*data)["content"])
|
|
|
|
- //fmt.Println("data====", string(b))
|
|
|
|
c.JSON(200, gin.H{"data": data})
|
|
c.JSON(200, gin.H{"data": data})
|
|
}
|
|
}
|