init

service/doc_file_service.go

@@ -10,7 +10,7 @@ import (
 type DocFileService interface {
     GetList(m map[string]interface{}) ([]viewmodels.DocFileInfo, error)
     GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(ocId, docFileId int64) (*viewmodels.DocFileInfo, error)
+    GetById(ocId, fileId int64) (*viewmodels.DocFileInfo, error)
     Create(d *datamodels.DocFile) error
     Update(d *datamodels.DocFile) error
     Delete(m map[string]interface{}) error
@@ -34,8 +34,8 @@ func (s *docFileService) GetPage(m map[string]interface{}) (*viewmodels.PageResu
     return s.repo.GetPage(m)
 }
 
-func (s *docFileService) GetById(ocId, docFileId int64) (*viewmodels.DocFileInfo, error) {
-    return s.repo.GetById(ocId, docFileId)
+func (s *docFileService) GetById(ocId, fileId int64) (*viewmodels.DocFileInfo, error) {
+    return s.repo.GetById(ocId, fileId)
 }
 
 func (s *docFileService) Create(d *datamodels.DocFile) error {

web/controllers/doc_controller.go

@@ -1 +0,0 @@
-package controllers

web/controllers/doc_dir_controller.go

@@ -1 +1,103 @@
 package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
+)
+
+type DocDirController struct {
+    Base
+    Service service.DocDirService
+}
+
+func (c *DocDirController) BeforeActivation(b mvc.BeforeActivation) {
+    b.Handle("GET",     "/",                            "GetList"   )
+    b.Handle("GET",     "/page",                        "GetPage"   )
+    b.Handle("GET",     "/{dirId:int64}",            "GetById"   )
+    b.Handle("POST",    "/add",                         "Create"    )
+    b.Handle("PUT",     "/update",                      "Update"    )
+    b.Handle("DELETE",  "/{dirId:int64}",            "DeleteByID")
+}
+
+func (c *DocDirController) GetList() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *DocDirController) GetPage() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetPage(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *DocDirController) GetById(dirId int64) *JsonResult {
+    ocId := c.GetCurOcId()
+    data, err := c.Service.GetById(ocId, dirId)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *DocDirController) Create() *JsonResult {
+    ocId   := c.GetCurOcId()
+    userId := c.GetCurUserId()
+    
+    docDir := &datamodels.DocDir{}
+    
+    if err := c.Ctx.ReadJSON(docDir); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    docDir.OcId      = ocId
+    docDir.CreatedBy = userId
+    if err := c.Service.Create(docDir); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *DocDirController) Update() *JsonResult {
+    ocId   := c.GetCurOcId()
+    userId := c.GetCurUserId()
+    
+    docDir := &datamodels.DocDir{}
+    if err := c.Ctx.ReadJSON(docDir); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    docDir.OcId      = ocId
+    docDir.UpdatedBy = userId
+    if err := c.Service.Update(docDir); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *DocDirController) DeleteByID(dirId int64) *JsonResult {
+    ocId   := c.GetCurOcId()
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{}, 0)
+    m["ocId"]      = ocId
+    m["dirId"]     = dirId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}

web/controllers/doc_file_controller.go

@@ -0,0 +1,103 @@
+package controllers
+
+import (
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
+)
+
+type DocFileController struct {
+    Base
+    Service service.DocFileService
+}
+
+func (c *DocFileController) BeforeActivation(b mvc.BeforeActivation) {
+    b.Handle("GET",     "/",                            "GetList"   )
+    b.Handle("GET",     "/page",                        "GetPage"   )
+    b.Handle("GET",     "/{fileId:int64}",            "GetById"   )
+    b.Handle("POST",    "/add",                         "Create"    )
+    b.Handle("PUT",     "/update",                      "Update"    )
+    b.Handle("DELETE",  "/{fileId:int64}",            "DeleteByID")
+}
+
+func (c *DocFileController) GetList() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetList(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *DocFileController) GetPage() *JsonResult {
+    params    := c.buildParams()
+    data, err := c.Service.GetPage(params)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *DocFileController) GetById(fileId int64) *JsonResult {
+    ocId := c.GetCurOcId()
+    data, err := c.Service.GetById(ocId, fileId)
+    if err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("获取成功", data)
+    }
+}
+
+func (c *DocFileController) Create() *JsonResult {
+    ocId   := c.GetCurOcId()
+    userId := c.GetCurUserId()
+    
+    file := &datamodels.DocFile{}
+    
+    if err := c.Ctx.ReadJSON(file); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    file.OcId      = ocId
+    file.CreatedBy = userId
+    if err := c.Service.Create(file); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("新增成功", nil)
+    }
+}
+
+func (c *DocFileController) Update() *JsonResult {
+    ocId   := c.GetCurOcId()
+    userId := c.GetCurUserId()
+    
+    file := &datamodels.DocFile{}
+    if err := c.Ctx.ReadJSON(file); err != nil {
+        return ResultErr("读取数据失败", nil)
+    }
+    
+    file.OcId      = ocId
+    file.UpdatedBy = userId
+    if err := c.Service.Update(file); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("更新成功", nil)
+    }
+}
+
+func (c *DocFileController) DeleteByID(fileId int64) *JsonResult {
+    ocId   := c.GetCurOcId()
+    userId := c.GetCurUserId()
+    
+    m := make(map[string]interface{})
+    m["ocId"]      = ocId
+    m["fileId"]    = fileId
+    m["deletedBy"] = userId
+    if err := c.Service.Delete(m); err != nil {
+        return ResultErr(err.Error(), nil)
+    } else {
+        return ResultOk("删除成功", nil)
+    }
+}