浏览代码

完善接口

wuww 6 年之前
父节点
当前提交
6fa6ef379e
共有 2 个文件被更改,包括 323 次插入127 次删除
  1. 319 123
      controllers/partial/SystemController.go
  2. 4 4
      light-apiengine.xml

+ 319 - 123
controllers/partial/SystemController.go

@@ -1387,7 +1387,7 @@ func System_UpdateArea(c *entitys.CtrlContext) {
 	}
 
 	user_id := c.Ctx.GetString("user_id")
-	exist, err := c.Db.SqlMapClient("selectone_sys_area", map[string]interface{}{"id": bean.Id}).Exist()
+	exist, err := c.Db.SqlMapClient("selectone_sys_area", &map[string]interface{}{"id": bean.Id}).Exist()
 	if !exist && err == nil {
 		err = errors.New("record does not exist")
 	}
@@ -1398,7 +1398,7 @@ func System_UpdateArea(c *entitys.CtrlContext) {
 	bean.LastUpdateTime = time.Now().UnixNano()
 	if bean.Parent != "" {
 		parentNodes := sysmodel.SysArea{}
-		_, err := c.Db.SqlMapClient("selectone_sys_area", map[string]interface{}{"id": bean.Parent}).Get(&parentNodes)
+		_, err := c.Db.SqlMapClient("selectone_sys_area", &map[string]interface{}{"id": bean.Parent}).Get(&parentNodes)
 		if err != nil {
 			c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 			return
@@ -1429,7 +1429,7 @@ func System_GetArea(c *entitys.CtrlContext) {
 	id := c.Ctx.Query("id")
 
 	var area sysmodel.SysArea
-	exist, err := c.Db.SqlMapClient("selectone_sys_area", map[string]interface{}{"id": id}).Get(&area)
+	exist, err := c.Db.SqlMapClient("selectone_sys_area", &map[string]interface{}{"id": id}).Get(&area)
 	if !exist && err == nil {
 		err = errors.New("record does not exist")
 	}
@@ -1464,8 +1464,9 @@ func System_GetAreaTree(c *entitys.CtrlContext) {
 func System_FindAreaTemplatePage(c *entitys.CtrlContext) {
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
-
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
+	del_flag := c.Ctx.Query("del_flag")
+	name := c.Ctx.Query("name")
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "del_flag":del_flag, "name":name}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_area_template_page", "sys_area", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
@@ -1517,14 +1518,14 @@ func System_AddAreaTemplate(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func System_UpdateAreaTemplate(c *entitys.CtrlContext) {
 	var err error
-	var bean sysmodel.SysArea
+	var bean sysmodel.SysAreaTemplate
 	if err = c.Ctx.BindJSON(&bean); err != nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 		return
 	}
 
 	user_id := c.Ctx.GetString("user_id")
-	exist, err := c.Db.SqlMapClient("selectone_sys_area", map[string]interface{}{"id": bean.Id}).Exist()
+	exist, err := c.Db.SqlMapClient("selectone_sys_area_template", &map[string]interface{}{"id": bean.Id}).Exist()
 	if !exist && err == nil {
 		err = errors.New("record does not exist")
 	}
@@ -1549,13 +1550,33 @@ func System_UpdateAreaTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelAreaTemplate(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
+	var err error
+	var bean = &models.SysAreaTemplate{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	session := c.Db.NewSession()
+	defer session.Close()
+	if err := session.Begin(); err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	if err == nil {
+		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+	}
 
-	ret := __none_func_system__(ids)
-	if ret {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1566,13 +1587,23 @@ func System_DelAreaTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_RecoverAreaTemplate(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
-
-	ret := __none_func_system__(ids)
-	if ret {
+	var err error
+	var bean = &models.SysAreaTemplate{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	_, err = c.Db.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 0})
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1585,11 +1616,15 @@ func System_RecoverAreaTemplate(c *entitys.CtrlContext) {
 func System_GetAreaTemplate(c *entitys.CtrlContext) {
 	id := c.Ctx.Query("id")
 
-	ret := __none_func_system__(id)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	var area sysmodel.SysAreaTemplate
+	exist, err := c.Db.SqlMapClient("selectone_sys_area_template", &map[string]interface{}{"id": id}).Get(&area)
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", area})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1599,18 +1634,17 @@ func System_GetAreaTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindAreaTemplateDetailPage(c *entitys.CtrlContext) {
-
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
-
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
+	del_flag := c.Ctx.Query("del_flag")
+	name := c.Ctx.Query("name")
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "del_flag":del_flag, "name":name}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_area_template_detail_page", "sys_area", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
-
 }
 
 // _AddAreaTemplateDetail
@@ -1625,18 +1659,27 @@ func System_FindAreaTemplateDetailPage(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddAreaTemplateDetail(c *entitys.CtrlContext) {
-	temp_id := c.Ctx.Query("temp_id")
-	name := c.Ctx.Query("name")
-	value := c.Ctx.Query("value")
-	_type := c.Ctx.Query("type")
-	priority := c.Ctx.Query("priority")
-	content := c.Ctx.Query("content")
+	var err error
+	var bean sysmodel.SysAreaTemplateDetail
+	if err = c.Ctx.BindJSON(&bean); err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
-	ret := __none_func_system__(temp_id, name, value,		_type, priority, content)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	user_id := c.Ctx.GetString("user_id")
+
+	bean.Id = sysutils.NewUUID()
+	bean.DelFlag = 0
+	bean.CreateBy = user_id
+	bean.LastUpdateBy = user_id
+	bean.CreateTime = sysmodel.NowLocal()
+	bean.LastUpdateTime = time.Now().UnixNano()
+
+	_, err = c.Db.InsertOne(&bean)
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", bean.Id})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1652,18 +1695,29 @@ func System_AddAreaTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateAreaTemplateDetail(c *entitys.CtrlContext) {
-	temp_id := c.Ctx.Query("temp_id")
-	name := c.Ctx.Query("name")
-	value := c.Ctx.Query("value")
-	_type := c.Ctx.Query("type")
-	priority := c.Ctx.Query("priority")
-	content := c.Ctx.Query("content")
+	var err error
+	var bean sysmodel.SysAreaTemplateDetail
+	if err = c.Ctx.BindJSON(&bean); err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
-	ret := __none_func_system__(temp_id, name, value, _type, priority, content)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	user_id := c.Ctx.GetString("user_id")
+	exist, err := c.Db.SqlMapClient("selectone_sys_area_template_detail", &map[string]interface{}{"id": bean.Id}).Exist()
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+	}
+	bean.LastUpdateBy = user_id
+	bean.LastUpdateTime = time.Now().UnixNano()
+
+	_, err = c.Db.AllCols().ID(bean.Id).Update(&bean)
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", bean.Id})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1674,13 +1728,33 @@ func System_UpdateAreaTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelAreaTemplateDetail(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
+	var err error
+	var bean = &models.SysAreaTemplateDetail{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	session := c.Db.NewSession()
+	defer session.Close()
+	if err := session.Begin(); err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	if err == nil {
+		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+	}
 
-	ret := __none_func_system__(ids)
-	if ret {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1691,13 +1765,23 @@ func System_DelAreaTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_RecoverAreaTemplateDetail(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
-
-	ret := __none_func_system__(ids)
-	if ret {
+	var err error
+	var bean = &models.SysAreaTemplateDetail{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	_, err = c.Db.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 0})
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1710,11 +1794,15 @@ func System_RecoverAreaTemplateDetail(c *entitys.CtrlContext) {
 func System_GetAreaTemplateDetail(c *entitys.CtrlContext) {
 	id := c.Ctx.Query("id")
 
-	ret := __none_func_system__(id)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	var area sysmodel.SysAreaTemplateDetail
+	exist, err := c.Db.SqlMapClient("selectone_sys_area_template_detail", &map[string]interface{}{"id": id}).Get(&area)
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", area})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1724,7 +1812,6 @@ func System_GetAreaTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindUserTemplatePage(c *entitys.CtrlContext) {
-
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 
@@ -1735,7 +1822,6 @@ func System_FindUserTemplatePage(c *entitys.CtrlContext) {
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
-
 }
 
 // _AddUserTemplate
@@ -1747,15 +1833,27 @@ func System_FindUserTemplatePage(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddUserTemplate(c *entitys.CtrlContext) {
-	name := c.Ctx.Query("name")
-	_type := c.Ctx.Query("type")
-	def := c.Ctx.Query("default")
+	var err error
+	var bean sysmodel.SysUserTemplate
+	if err = c.Ctx.BindJSON(&bean); err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
-	ret := __none_func_system__(name, _type, def)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	user_id := c.Ctx.GetString("user_id")
+
+	bean.Id = sysutils.NewUUID()
+	bean.DelFlag = 0
+	bean.CreateBy = user_id
+	bean.LastUpdateBy = user_id
+	bean.CreateTime = sysmodel.NowLocal()
+	bean.LastUpdateTime = time.Now().UnixNano()
+
+	_, err = c.Db.InsertOne(&bean)
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", bean.Id})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1768,15 +1866,29 @@ func System_AddUserTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateUserTemplate(c *entitys.CtrlContext) {
-	name := c.Ctx.Query("name")
-	_type := c.Ctx.Query("type")
-	def := c.Ctx.Query("default")
+	var err error
+	var bean sysmodel.SysUserTemplate
+	if err = c.Ctx.BindJSON(&bean); err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
-	ret := __none_func_system__(name, _type, def)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	user_id := c.Ctx.GetString("user_id")
+	exist, err := c.Db.SqlMapClient("selectone_sys_user_template", &map[string]interface{}{"id": bean.Id}).Exist()
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+	}
+	bean.LastUpdateBy = user_id
+	bean.LastUpdateTime = time.Now().UnixNano()
+
+	_, err = c.Db.AllCols().ID(bean.Id).Update(&bean)
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", bean.Id})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1787,13 +1899,33 @@ func System_UpdateUserTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelUserTemplate(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
+	var err error
+	var bean = &models.SysUserTemplate{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	session := c.Db.NewSession()
+	defer session.Close()
+	if err := session.Begin(); err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	if err == nil {
+		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+	}
 
-	ret := __none_func_system__(ids)
-	if ret {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1804,13 +1936,23 @@ func System_DelUserTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_RecoverUserTemplate(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
-
-	ret := __none_func_system__(ids)
-	if ret {
+	var err error
+	var bean = &models.SysUserTemplate{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	_, err = c.Db.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 0})
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1823,11 +1965,15 @@ func System_RecoverUserTemplate(c *entitys.CtrlContext) {
 func System_GetUserTemplate(c *entitys.CtrlContext) {
 	id := c.Ctx.Query("id")
 
-	ret := __none_func_system__(id)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	var area sysmodel.SysUserTemplate
+	exist, err := c.Db.SqlMapClient("selectone_sys_user_template", &map[string]interface{}{"id": id}).Get(&area)
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", area})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1837,7 +1983,6 @@ func System_GetUserTemplate(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindUserTemplateDetailPage(c *entitys.CtrlContext) {
-
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 
@@ -1848,7 +1993,6 @@ func System_FindUserTemplateDetailPage(c *entitys.CtrlContext) {
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
-
 }
 
 // _AddUserTemplateDetail
@@ -1863,19 +2007,27 @@ func System_FindUserTemplateDetailPage(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddUserTemplateDetail(c *entitys.CtrlContext) {
-	temp_id := c.Ctx.Query("temp_id")
-	name := c.Ctx.Query("name")
-	value := c.Ctx.Query("value")
-	_type := c.Ctx.Query("type")
-	priority := c.Ctx.Query("priority")
-	content := c.Ctx.Query("content")
+	var err error
+	var bean sysmodel.SysUserTemplateDetail
+	if err = c.Ctx.BindJSON(&bean); err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
-	ret := __none_func_system__(temp_id, name, value,
-		_type, priority, content)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	user_id := c.Ctx.GetString("user_id")
+
+	bean.Id = sysutils.NewUUID()
+	bean.DelFlag = 0
+	bean.CreateBy = user_id
+	bean.LastUpdateBy = user_id
+	bean.CreateTime = sysmodel.NowLocal()
+	bean.LastUpdateTime = time.Now().UnixNano()
+
+	_, err = c.Db.InsertOne(&bean)
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", bean.Id})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1891,19 +2043,29 @@ func System_AddUserTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateUserTemplateDetail(c *entitys.CtrlContext) {
-	temp_id := c.Ctx.Query("temp_id")
-	name := c.Ctx.Query("name")
-	value := c.Ctx.Query("value")
-	_type := c.Ctx.Query("type")
-	priority := c.Ctx.Query("priority")
-	content := c.Ctx.Query("content")
+	var err error
+	var bean sysmodel.SysUserTemplateDetail
+	if err = c.Ctx.BindJSON(&bean); err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
-	ret := __none_func_system__(temp_id, name, value,
-		_type, priority, content)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	user_id := c.Ctx.GetString("user_id")
+	exist, err := c.Db.SqlMapClient("selectone_sys_user_template_detail", &map[string]interface{}{"id": bean.Id}).Exist()
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+	}
+	bean.LastUpdateBy = user_id
+	bean.LastUpdateTime = time.Now().UnixNano()
+
+	_, err = c.Db.AllCols().ID(bean.Id).Update(&bean)
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", bean.Id})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1914,13 +2076,33 @@ func System_UpdateUserTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelUserTemplateDetail(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
+	var err error
+	var bean = &models.SysUserTemplateDetail{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	session := c.Db.NewSession()
+	defer session.Close()
+	if err := session.Begin(); err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	if err == nil {
+		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+	}
 
-	ret := __none_func_system__(ids)
-	if ret {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1931,13 +2113,23 @@ func System_DelUserTemplateDetail(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_RecoverUserTemplateDetail(c *entitys.CtrlContext) {
-	ids := c.Ctx.Query("ids")
-
-	ret := __none_func_system__(ids)
-	if ret {
+	var err error
+	var bean = &models.SysUserTemplateDetail{}
+	idArr := make([]string, 0)
+	if ids := c.Ctx.Query("ids"); ids == "" {
+		err = c.Ctx.BindJSON(&idArr)
+		if err != nil || len(idArr) <= 0 {
+			c.Ctx.JSON(500, sysmodel.SysReturn{500, "ids is empty", nil})
+			return
+		}
+	} else {
+		idArr = strings.Split(ids, ",")
+	}
+	_, err = c.Db.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 0})
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -1950,11 +2142,15 @@ func System_RecoverUserTemplateDetail(c *entitys.CtrlContext) {
 func System_GetUserTemplateDetail(c *entitys.CtrlContext) {
 	id := c.Ctx.Query("id")
 
-	ret := __none_func_system__(id)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	var area sysmodel.SysUserTemplateDetail
+	exist, err := c.Db.SqlMapClient("selectone_sys_user_template_detail", &map[string]interface{}{"id": id}).Get(&area)
+	if !exist && err == nil {
+		err = errors.New("record does not exist")
+	}
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", area})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 func __none_func_system__(params ...interface{}) bool {

+ 4 - 4
light-apiengine.xml

@@ -60,15 +60,15 @@
             </api>
             <api name="find_user_page" desc="获取用户分页数" function="page" table="sys_user" method="get,post" >
             </api>
-            <api name="find_user_template_page" desc="获取用户信息模板分页数" function="page" table="sys_area" method="get,post" >
+            <api name="find_user_template_page" desc="获取用户信息模板分页数" function="page" table="sys_user_template" method="get,post" >
             </api>
-            <api name="find_user_template_detail_page" desc="获取用户信息模板明细分页数" function="page" table="sys_area" method="get,post" >
+            <api name="find_user_template_detail_page" desc="获取用户信息模板明细分页数" function="page" table="sys_user_template_detail" method="get,post" >
             </api>
             <api name="find_area_page" desc="获取区域管理分页数" function="page" table="sys_area" method="get,post" >
             </api>
-            <api name="find_area_template_page" desc="获取区域模板分页数" function="page" table="sys_area" method="get,post" >
+            <api name="find_area_template_page" desc="获取区域模板分页数" function="page" table="sys_area_template" method="get,post" >
             </api>
-            <api name="find_area_template_detail_page" desc="获取区域模板明细分页数" function="page" table="sys_area" method="get,post" >
+            <api name="find_area_template_detail_page" desc="获取区域模板明细分页数" function="page" table="sys_area_template_detail" method="get,post" >
             </api>
             <api name="get_area_tree" desc="获取区域管理树" function="tree" table="sys_area" method="get,post" >
             </api>