完善区域管理、区域模板、区域模板明细、用户模板、用户模板明细接口

controllers/partial/SystemController.go

@@ -1311,15 +1311,14 @@ func System_AddArea(c *entitys.CtrlContext) {
 func System_DelArea(c *entitys.CtrlContext) {
 	var err error
 	var bean = &models.SysArea{}
-	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, ",")
+	type Param struct {
+		Id string `json:"id"`
+	}
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
 	}
 	session := c.Db.NewSession()
 	defer session.Close()
@@ -1327,11 +1326,13 @@ func System_DelArea(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 		return
 	}
-	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	_, err = session.Table(bean).Where("del_flag=1").In("id", ids).Delete(bean)
 	if err == nil {
-		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+		_, err = session.Table(bean).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
+	}
+	if err == nil {
+		err = session.Commit()
 	}
-
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -1387,12 +1388,13 @@ 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.Table(&bean).Where("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})
+		return
 	}
 	bean.LastUpdateBy = user_id
 	bean.LastUpdateTime = time.Now().UnixNano()
@@ -1525,12 +1527,13 @@ func System_UpdateAreaTemplate(c *entitys.CtrlContext) {
 	}
 
 	user_id := c.Ctx.GetString("user_id")
-	exist, err := c.Db.SqlMapClient("selectone_sys_area_template", &map[string]interface{}{"id": bean.Id}).Exist()
+	exist, err := c.Db.Table(&bean).Where("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})
+		return
 	}
 	bean.LastUpdateBy = user_id
 	bean.LastUpdateTime = time.Now().UnixNano()
@@ -1552,15 +1555,14 @@ func System_UpdateAreaTemplate(c *entitys.CtrlContext) {
 func System_DelAreaTemplate(c *entitys.CtrlContext) {
 	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, ",")
+	type Param struct {
+		Id string `json:"id"`
+	}
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
 	}
 	session := c.Db.NewSession()
 	defer session.Close()
@@ -1568,11 +1570,13 @@ func System_DelAreaTemplate(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 		return
 	}
-	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	_, err = session.Table(bean).Where("del_flag=1").In("id", ids).Delete(bean)
 	if err == nil {
-		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+		_, err = session.Table(bean).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
+	}
+	if err == nil {
+		err = session.Commit()
 	}
-
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -1704,12 +1708,13 @@ func System_UpdateAreaTemplateDetail(c *entitys.CtrlContext) {
 	}
 
 	user_id := c.Ctx.GetString("user_id")
-	exist, err := c.Db.SqlMapClient("selectone_sys_area_template_detail", &map[string]interface{}{"id": bean.Id}).Exist()
+	exist, err := c.Db.Table(&bean).Where("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})
+		return
 	}
 	bean.LastUpdateBy = user_id
 	bean.LastUpdateTime = time.Now().UnixNano()
@@ -1731,15 +1736,14 @@ func System_UpdateAreaTemplateDetail(c *entitys.CtrlContext) {
 func System_DelAreaTemplateDetail(c *entitys.CtrlContext) {
 	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, ",")
+	type Param struct {
+		Id string `json:"id"`
+	}
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
 	}
 	session := c.Db.NewSession()
 	defer session.Close()
@@ -1747,11 +1751,13 @@ func System_DelAreaTemplateDetail(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 		return
 	}
-	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	_, err = session.Table(bean).Where("del_flag=1").In("id", ids).Delete(bean)
 	if err == nil {
-		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+		_, err = session.Table(bean).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
+	}
+	if err == nil {
+		err = session.Commit()
 	}
-
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -1876,12 +1882,13 @@ func System_UpdateUserTemplate(c *entitys.CtrlContext) {
 	}
 
 	user_id := c.Ctx.GetString("user_id")
-	exist, err := c.Db.SqlMapClient("selectone_sys_user_template", &map[string]interface{}{"id": bean.Id}).Exist()
+	exist, err := c.Db.Table(&bean).Where("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})
+		return
 	}
 	bean.LastUpdateBy = user_id
 	bean.LastUpdateTime = time.Now().UnixNano()
@@ -1903,15 +1910,14 @@ func System_UpdateUserTemplate(c *entitys.CtrlContext) {
 func System_DelUserTemplate(c *entitys.CtrlContext) {
 	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, ",")
+	type Param struct {
+		Id string `json:"id"`
+	}
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
 	}
 	session := c.Db.NewSession()
 	defer session.Close()
@@ -1919,11 +1925,13 @@ func System_DelUserTemplate(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 		return
 	}
-	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	_, err = session.Table(bean).Where("del_flag=1").In("id", ids).Delete(bean)
 	if err == nil {
-		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+		_, err = session.Table(bean).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
+	}
+	if err == nil {
+		err = session.Commit()
 	}
-
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -2055,12 +2063,13 @@ func System_UpdateUserTemplateDetail(c *entitys.CtrlContext) {
 	}
 
 	user_id := c.Ctx.GetString("user_id")
-	exist, err := c.Db.SqlMapClient("selectone_sys_user_template_detail", &map[string]interface{}{"id": bean.Id}).Exist()
+	exist, err := c.Db.Table(&bean).Where("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})
+		return
 	}
 	bean.LastUpdateBy = user_id
 	bean.LastUpdateTime = time.Now().UnixNano()
@@ -2082,15 +2091,14 @@ func System_UpdateUserTemplateDetail(c *entitys.CtrlContext) {
 func System_DelUserTemplateDetail(c *entitys.CtrlContext) {
 	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, ",")
+	type Param struct {
+		Id string `json:"id"`
+	}
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
 	}
 	session := c.Db.NewSession()
 	defer session.Close()
@@ -2098,11 +2106,14 @@ func System_DelUserTemplateDetail(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 		return
 	}
-	_, err = session.Table(bean).Where("del_flag=1").In("id", idArr).Delete(bean)
+	_, err = session.Table(bean).Where("del_flag=1").In("id", ids).Delete(bean)
 	if err == nil {
-		_, err = session.Table(bean).In("id", idArr).Update(map[string]interface{}{"del_flag": 1})
+		_, err = session.Table(bean).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
 	}
 
+	if err == nil {
+		err = session.Commit()
+	}
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {