整合框架Krystina

src/dashoo.cn/backend/api/business/extend/extends.go

@@ -1,26 +0,0 @@
-package extend
-
-import (
-	"time"
-)
-
-type DonorsNoteItem struct {
-	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	AccCode        string    `xorm:"VARCHAR(10)"`
-	GroupName      string    `xorm:"VARCHAR(50)"`
-	Name           string    `xorm:"VARCHAR(100)"`
-	FieldName      string    `xorm:"VARCHAR(100)"`
-	FieldNo        int       `xorm:"INT(11)"`
-	FieldType      string    `xorm:"VARCHAR(100)"`
-	FieldTypeName  string    `xorm:"VARCHAR(100)"`
-	FieldDefault   string    `xorm:"VARCHAR(100)"`
-	FieldContent   string    `xorm:"VARCHAR(100)"`
-	SortCode       int       `xorm:"INT(11)"`
-	CreateOn       time.Time `xorm:"DATETIME created"`
-	CreateUserId   int       `xorm:"INT(10)"`
-	CreateBy       string    `xorm:"VARCHAR(255)"`
-	ModifiedUserId int       `xorm:"INT(10)"`
-	ModifiedBy     string    `xorm:"VARCHAR(255)"`
-	ModifiedOn     time.Time `xorm:"DATETIME updated"`
-	Remark         string    `xorm:"TEXT"`
-}

src/dashoo.cn/backend/api/business/extend/extendsService.go

@@ -1,84 +0,0 @@
-package extend
-
-import (
-	"fmt"
-
-	"dashoo.cn/utils"
-	. "dashoo.cn/utils/db"
-	"github.com/go-xorm/xorm"
-)
-
-type ExtendService struct {
-	ServiceBase
-}
-
-func GetExtendService(xormEngine *xorm.Engine) *ExtendService {
-	s := new(ExtendService)
-	s.DBE = xormEngine
-	return s
-}
-
-func (s *ExtendService) QueryDonorEntity(tablename, where string) (entity DonorsNoteItem) {
-	sql := "select * from " + tablename
-	if where != "" {
-		sql = sql + " where " + where
-	}
-	s.DBE.Sql(sql).Get(&entity)
-	return
-}
-
-//根据AccCode获取全部信息
-func (s *ExtendService) GetInfoByAccCode(where string) []DonorsNoteItem {
-	if where == "" {
-		where = " 1=1 "
-	}
-	var sql string
-	sql = ` select * from DonorsNoteItem where ` + where
-	List := make([]DonorsNoteItem, 0)
-	s.DBE.Sql(sql).Find(&List)
-	return List
-}
-
-//获取样本来源扩展信息分组
-func (s *ExtendService) GetInfoByAccCodeByGroup(where string) []DonorsNoteItem {
-	if where == "" {
-		where = " 1=1 "
-	}
-	var sql string
-	sql = ` select GroupName from DonorsNoteItem where ` + where + ` group by GroupName `
-	List := make([]DonorsNoteItem, 0)
-	utils.DBE.Sql(sql).Find(&List)
-	return List
-}
-
-func (s *ExtendService) QueryDonorsLista(tablename, where string) []DonorsNoteItem {
-	sql := "select * from " + tablename
-	if where != "" {
-		sql = sql + " where " + where
-	}
-	List := make([]DonorsNoteItem, 0)
-	utils.DBE.Sql(sql).Find(&List)
-	return List
-}
-
-func (s *ExtendService) GetDNoteItemList(where string) []DonorsNoteItem {
-	var entitys []DonorsNoteItem
-	sql := `select * from DonorsNoteItem where ` + where + ` order by Id `
-	s.DBE.Sql(sql).Find(&entitys)
-	return entitys
-}
-
-func (s *ExtendService) GetNoteItemFieldNumber(AccCode string) int {
-	var entitys Id_Int
-	sql := "select min(FieldNo) Id from NoteItemField where FieldNo not in (select FieldNo from DonorsNoteItem where FieldNo>10  and AccCode ='" + AccCode + "')"
-	s.DBE.Sql(sql).Get(&entitys)
-	return entitys.Id
-}
-
-func (s *ExtendService) GetNoteCount(acccode string) int {
-	var notecount Id_Int
-	sql := `select count(Id) Id from DonorsNoteItem where AccCode='` + acccode + `' `
-	fmt.Println(sql)
-	s.DBE.Sql(sql).Get(&notecount)
-	return notecount.Id
-}

src/dashoo.cn/backend/api/controllers/district.go

@@ -1,286 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-	//	"fmt"
-
-	"dashoo.cn/business2/district"
-	"dashoo.cn/utils"
-)
-
-// Operations about Users
-type DistrictController struct {
-	BaseController
-}
-
-type DistrictModel struct {
-	Parentid        int    `json:"parentid"`
-	Fullname        string `json:"fullname"`
-	Description     string `json:"description"`
-	HaveChild       int    `json:"havechild"`
-}
-
-// @Title 区域列表
-// @Description 区域列表
-// @Success 200 {object} business.device.DeviceChannels
-// @router /list [get]
-func (this *DistrictController) List() {
-	page := this.GetPageInfoForm()
-	svc := district.GetDistrictService(utils.DBE)
-	where := " CreateUserId=" + this.User.Id + ""
-	keyword := this.GetString("keyword")
-	parentid := this.GetString("parentid")
-	if keyword != "" {
-		where = where + " and FullName like '%" + keyword + "%'"
-	}
-	if parentid != "" && parentid != "-1" {
-		ids := svc.GetAllChildByTopId(parentid, this.User.Id)
-		where = where + " and Id in ( " + ids + " )"
-	}
-	list := make([]district.Base_District, 0)
-	total := svc.GetPagingEntitiesWithSortCode(page.CurrentPage, page.Size, "ParentId, CreateOn desc", &list, where)
-	var datainfo DataInfo
-	datainfo.Items = list
-	datainfo.CurrentItemCount = total
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
-}
-
-// @Title 根据用户AccCode get检验主表 客户原始信息内容
-// @Description get user by token
-// @Success 200 {object} models.Userblood
-// @router /cellsCollectionDetaillist [get]
-func (this *DistrictController) CellsCollectionDetaillist() {
-	svc := district.GetDistrictService(utils.DBE)
-	where := "'" + this.User.AccCode + "'"
-	list := svc.GetCollectionDetailviewlist(where)
-	var datainfo DataInfo
-	datainfo.Items = list
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
-}
-
-// @Title get
-// @Description get SampleType by token
-// @Success 200
-// @router /detailed/:id [get]
-func (this *DistrictController) Detailed() {
-	svc := district.GetDistrictService(utils.DBE)
-	id := this.Ctx.Input.Param(":id")
-	var entity district.Base_District
-	where := " Id=" + id + ""
-	entity = svc.QueryEntity(where)
-	var datainfo DataInfo
-	datainfo.Items = entity
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
-}
-
-// @Title 组织列表带父级名称
-// @Description
-// @Success 200 {object} business.device.DeviceChannels
-// @router /listbandparentname [get]
-func (this *DistrictController) Listbandparentname() {
-	page := this.GetPageInfoForm()
-	svc := district.GetDistrictService(utils.DBE)
-	where := " a.CreateuserId=" + this.User.Id + ""
-	keyword := this.GetString("keyword")
-	parentid := this.GetString("parentid")
-	if keyword != "" {
-		where = where + " and a.FullName like '%" + keyword + "%'"
-	}
-	if parentid != "" && parentid != "-1" {
-		ids := svc.GetAllChildByTopId(parentid, this.User.Id)
-		where = where + " and a.Id in ( " + ids + " )"
-	}
-	total, list := svc.GetListbandparentname(page.CurrentPage, page.Size, "a.ParentId, a.CreateOn desc", where)
-	var datainfo DataInfo
-	datainfo.Items = list
-	datainfo.CurrentItemCount = total
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
-}
-
-// @Title 创建区域
-// @Description 创建区域
-// @Param	body	body	business.device.DeviceChannels
-// @Success	200	{object} controllers.Request
-// @router / [post]
-func (this *DistrictController) AddOrganize() {
-	var model OrganizeModel
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &model)
-	var errinfo ErrorInfo
-	var entity district.Base_District
-	svc := district.GetDistrictService(utils.DBE)
-	// 编辑后添加一条数据
-	entity.FullName = model.Fullname
-	entity.ParentId = model.Parentid
-	entity.Description = model.Description
-	entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	entity.CreateBy = this.User.Realname
-	entity.AccCode = this.GetAccode()
-
-	_, err := svc.InsertEntity(&entity)
-
-	if err == nil {
-		errinfo.Message = "添加区域成功！"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	} else {
-		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-}
-
-// @Title 编辑组织
-// @Description 编辑组织
-// @Param	id	path	string	true		"需要修改的传感器编号"
-// @Param	body	body	business.device.DeviceChannels	"传感器信息"
-// @Success	200	{object} controllers.Request
-// @router /:id [put]
-func (this *DistrictController) EditOrganize() {
-	id := this.Ctx.Input.Param(":id")
-	var errinfo ErrorInfo
-	if id == "" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-	var model OrganizeModel
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &model)
-
-	var entity district.Base_District
-	var entityempty district.Base_District
-	svc := district.GetDistrictService(utils.DBE)
-
-	has := svc.GetEntityById(id, &entity)
-	if has {
-		entity.FullName = model.Fullname
-		entity.ParentId = model.Parentid
-		entity.Description = model.Description
-		entity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-		entity.ModifiedBy = this.User.Realname
-		var cols []string = []string{"FullName", "ParentId", "Description", "ModifiedUserId", "ModifiedBy"}
-		err := svc.UpdateEntityAndBackupByCols(id, &entity, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Realname)
-
-		if err == nil {
-			errinfo.Message = "保存成功！"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-		} else {
-			errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-		}
-	} else {
-		errinfo.Message = "操作失败！操作数据不存在"
-		errinfo.Code = -3
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-}
-
-// @Title 删除组织
-// @Description 删除组织
-// @Param	id		path 	string	true		"需要删除的用户编号"
-// @Success 200 {object} ErrorInfo
-// @Failure 403 :id 为空
-// @router /:id [delete]
-func (this *DistrictController) Delete() {
-	id := this.Ctx.Input.Param(":id")
-	var errinfo ErrorInfo
-	if id == "" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	svc := district.GetDistrictService(utils.DBE)
-	if svc.IsHaveChild(id) {
-		errinfo.Message = "操作失败！请先删除下属组织"
-		errinfo.Code = -3
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	if svc.IsHaveUserUse(id) {
-		errinfo.Message = "操作失败！有用户在使用此组织，请先解除绑定"
-		errinfo.Code = -4
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	if svc.IsHaveEquiUse(id) {
-		errinfo.Message = "操作失败！有设备在使用此组织，请先解除绑定"
-		errinfo.Code = -5
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	var entity district.Base_District
-	var entityempty district.Base_District
-	err := svc.DeleteEntityAndBackup(id, &entity, &entityempty, utils.ToStr(this.User.Id), this.User.Username)
-
-	if err == nil {
-		errinfo.Message = "删除成功"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 获取子集列表
-// @Description 获取子集列表
-// @Success 200 {object} business.device.DeviceChannels
-// @router /childlist/:id [get]
-func (this *DistrictController) ChildList() {
-	id := this.Ctx.Input.Param(":id")
-	svc := district.GetDistrictService(utils.DBE)
-	where := " Createuserid= " + this.User.Id
-	where = where + " and ParentId = " + id + ""
-
-	list := make([]district.Base_District, 0)
-	svc.GetDatasByCols(&list, where, "Sortcode, CreateOn desc", []string{"Id", "ParentId", "Fullname"})
-	var datainfo DataInfo
-	datainfo.Items = list
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
-}
-
-// @Title 获取父集列表
-// @Description 获取父集列表
-// @Success 200 {object} business.device.DeviceChannels
-// @router /parentlist/:id [get]
-func (this *DistrictController) ParentList() {
-	id := this.Ctx.Input.Param(":id")
-	svc := district.GetDistrictService(utils.DBE)
-	var errinfo ErrorInfo
-	errinfo.Message = svc.GetAllParentByTopId(id, this.User.Id)
-	errinfo.Code = 0
-	this.Data["json"] = &errinfo
-	this.ServeJSON()
-}
-
-
-

src/dashoo.cn/backend/api/controllers/document.go → src/dashoo.cn/backend/api/controllers/document/document.go

@@ -1,10 +1,11 @@
-package controllers
+package document
 
 import (
 	"encoding/json"
 	"time"
 
 	"dashoo.cn/backend/api/business/documentmanage"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/equipment.go → src/dashoo.cn/backend/api/controllers/equipment/equipment.go

@@ -1,4 +1,4 @@
-package controllers
+package equipment
 
 import (
 	"encoding/json"
@@ -12,6 +12,7 @@ import (
 	"dashoo.cn/backend/api/business/lastordernum"
 	"dashoo.cn/backend/api/business/role"
 	"dashoo.cn/backend/api/business/shelfset"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/equipmentmodel.go → src/dashoo.cn/backend/api/controllers/equipment/equipmentmodel.go

@@ -1,11 +1,11 @@
-package controllers
+package equipment
 
 import (
 	"encoding/json"
 
-	"dashoo.cn/utils"
-
 	"dashoo.cn/backend/api/business/equipment"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
 )
 
 type EquipmentModelController struct {

src/dashoo.cn/backend/api/controllers/shelfset.go → src/dashoo.cn/backend/api/controllers/equipment/shelfset.go

@@ -1,21 +1,21 @@
-package controllers
-
-//import (
-//	"fmt"
-//	"strings"
-//	"time"
-
-//	"dashoo.cn/backend/api/business/currboxcapacity"
-//	"dashoo.cn/backend/api/business/equipment"
-//	"dashoo.cn/backend/api/business/lastordernum"
-//	"dashoo.cn/backend/api/business/shelfset"
-//	"dashoo.cn/utils"
-//)
-
-//// 冻存架 冻存盒
-//type ShelfSetController struct {
-//	BaseController
-//}
+package equipment
+
+import (
+	//	"fmt"
+	//	"strings"
+	//	"time"
+	. "dashoo.cn/backend/api/controllers"
+	//	"dashoo.cn/backend/api/business/currboxcapacity"
+	//	"dashoo.cn/backend/api/business/equipment"
+	//	"dashoo.cn/backend/api/business/lastordernum"
+	//	"dashoo.cn/backend/api/business/shelfset"
+	//	"dashoo.cn/utils"
+)
+
+// 冻存架 冻存盒
+type ShelfSetController struct {
+	BaseController
+}
 
 //// 冻存盒
 //type BoxData struct {

src/dashoo.cn/backend/api/controllers/extends.go

@@ -1,220 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-
-	"dashoo.cn/backend/api/business/extend"
-	"dashoo.cn/backend/api/business/items"
-	"dashoo.cn/utils"
-)
-
-// 样本来源扩展接口说明
-type ExtendsController struct {
-	BaseController
-}
-
-// @Title 样本来源扩展列表
-// @Description 样本来源扩展列表
-// @Success 200 {object} business.device.DeviceChannels
-// @router /list [get]
-func (this *ExtendsController) List() {
-
-	page := this.GetPageInfoForm()
-	var list []extend.DonorsNoteItem
-	svc := extend.GetExtendService(utils.DBE)
-	keyword := this.GetString("keyword")
-	groupname := this.GetString("groupname")
-	where := " AccCode='" + this.User.AccCode + "'"
-	orderby := "CreateOn desc"
-	Order := this.GetString("Order")
-	Prop := this.GetString("Prop")
-	if Order != "" && Prop != "" {
-		orderby = Prop + " " + Order
-	}
-	if groupname != "" {
-		where = where + " and (GroupName like '%" + groupname + "%')"
-	}
-	if keyword != "" {
-		where = where + " and (Name like '%" + keyword + "%')"
-	}
-
-	total := svc.GetPagingEntitiesWithSortCode(page.CurrentPage, page.Size, orderby, &list, where)
-	var datainfo DataInfo
-	datainfo.Items = list
-	datainfo.CurrentItemCount = total
-	this.Data["json"] = &datainfo
-	this.ServeJSON()
-
-}
-
-// @Title 创建样本来源扩展
-// @Description 创建样本来源扩展
-// @Param	body	body	business.device.DeviceChannels	"报警项目信息"
-// @Success	200	{object} controllers.Request
-// @router / [post]
-func (this *ExtendsController) AddPost() {
-	var donorsNoteItem extend.DonorsNoteItem
-	svc := extend.GetExtendService(utils.DBE)
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &donorsNoteItem)
-	no := svc.GetNoteItemFieldNumber(this.User.AccCode)
-	donorsNoteItem.FieldName = "ZBack" + utils.ToStr(no)
-	donorsNoteItem.FieldNo = no
-	donorsNoteItem.AccCode = this.User.AccCode
-	donorsNoteItem.CreateBy = this.User.Realname
-	donorsNoteItem.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	_, err := svc.InsertEntity(donorsNoteItem)
-	var errinfo ErrorInfo
-	if err == nil {
-		errinfo.Message = utils.AlertProcess("保存成功！")
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = utils.AlertProcess("保存失败！" + err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 报警项目列表
-// @Description 报警项目列表
-// @Success 200 {object} business.device.DeviceChannels
-// @router /getmodel/:id [get]
-func (this *ExtendsController) GetModel() {
-	id := this.Ctx.Input.Param(":id")
-	svc := extend.GetExtendService(utils.DBE)
-	entity := new(extend.DonorsNoteItem)
-	svc.GetEntityById(id, entity)
-	this.Data["json"] = &entity
-	this.ServeJSON()
-}
-
-// @Title 分级扩展字段编辑
-// @Description 创建用户
-// @Param	id	path	string	true		"分级扩展字段编辑"
-// @Param	body	body	business.device.DeviceChannels	分级扩展字段编辑
-// @Success	200	{object} controllers.Request
-// @router /editextends/:id [put]
-func (this *ExtendsController) EditExtends() {
-	id := this.Ctx.Input.Param(":id")
-	var entity extend.DonorsNoteItem
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &entity)
-	var entityempty extend.DonorsNoteItem
-	svc := extend.GetExtendService(utils.DBE)
-	entity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-	entity.ModifiedBy = this.User.Realname
-	opdesc := "编辑样本来源扩展-" + entity.Name
-	var cols []string = []string{"GroupName", "Name", "FieldType", "FieldTypeName", "FieldDefault", "Remark", "FieldContent", "ModifiedUserId", "ModifiedBy"}
-	err := svc.UpdateEntityAndWriteLog(id, &entity, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "样本来源扩展")
-	var errinfo ErrorInfo
-	if err == nil {
-		errinfo.Message = "编辑成功"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "编辑失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 创建用户
-// @Description 创建用户
-// @Param	id	path	string	true		"需要修改的传感器编号"
-// @Param	body	body	business.device.DeviceChannels	"传感器信息"
-// @Success	200	{object} controllers.Request
-// @router /:id [put]
-func (this *ExtendsController) EditPost() {
-	id := this.Ctx.Input.Param(":id")
-	var entity extend.DonorsNoteItem
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &entity)
-	var entityempty extend.DonorsNoteItem
-	svc := extend.GetExtendService(utils.DBE)
-	entity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-	entity.ModifiedBy = this.User.Realname
-	opdesc := "编辑样本来源扩展-" + entity.Name
-	var cols []string = []string{"Name", "FieldType", "FieldTypeName", "FieldDefault", "Remark", "FieldContent", "ModifiedUserId", "ModifiedBy"}
-	err := svc.UpdateEntityAndWriteLog(id, &entity, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "样本来源扩展")
-	var errinfo ErrorInfo
-	if err == nil {
-		errinfo.Message = "编辑成功"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "编辑失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 删除组织
-// @Description 删除组织
-// @Param	id		path 	string	true		"需要删除的用户编号"
-// @Success 200 {object} ErrorInfo
-// @Failure 403 :id 为空
-// @router /:id [delete]
-func (this *ExtendsController) Delete() {
-	id := this.Ctx.Input.Param(":id")
-	var entity extend.DonorsNoteItem
-	var entityempty extend.DonorsNoteItem
-	svc := extend.GetExtendService(utils.DBE)
-	opdesc := "删除样本来源扩展-" + this.GetString("name")
-	err := svc.DeleteEntityAndWriteLog(id, &entity, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "样本来源扩展")
-	var errinfo ErrorInfo
-	if err == nil {
-		errinfo.Message = "删除成功"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
-
-// @Title 获取分组列表
-// @Description get user by token
-// @Success 200 {object} models.User
-// @Failure 403 :uid is empty
-// @router /grouplist [get]
-func (this *ExtendsController) GroupList() {
-	svcType := items.GetItemsService(utils.DBE)
-	var list_sunit []items.KeyValue
-	list_sunit = svcType.GetKeyValueItems("GroupName", this.User.AccCode)
-	this.Data["json"] = list_sunit
-	this.ServeJSON()
-}
-
-// @Title 获取登录人所有扩展信息分组名称
-// @Description 获取登录人所有扩展信息分组名称
-// @Success	200	{object} controllers.Request
-// @router /listbyloginwithgroup [get]
-func (this *ExtendsController) GetlistByloginWithGroup() {
-	svc := extend.GetExtendService(utils.DBE)
-	where := "AccCode = '" + this.User.AccCode + "'"
-	data := svc.GetInfoByAccCodeByGroup(where)
-	this.Data["json"] = data
-	this.ServeJSON()
-}
-
-// @Title 获取登录人所有扩展信息列表
-// @Description 获取登录人所有扩展信息列表
-// @Success	200	{object} controllers.Request
-// @router /listbylogin [get]
-func (this *ExtendsController) GetlistBylogin() {
-	svc := extend.GetExtendService(utils.DBE)
-	where := "AccCode = '" + this.User.AccCode + "'"
-	data := svc.GetInfoByAccCode(where)
-	this.Data["json"] = data
-	this.ServeJSON()
-}

src/dashoo.cn/backend/api/controllers/instrument.go → src/dashoo.cn/backend/api/controllers/instrument/instrument.go

@@ -1,4 +1,4 @@
-package controllers
+package instrument
 
 import (
 	"encoding/json"
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"dashoo.cn/backend/api/business/instrument"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/business2/organize"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
@@ -234,36 +235,36 @@ func (this *InstrumentController) Deleteinstrument() {
 // @Description 每10S获取一次仪器信息
 // @Success	200	{object} controllers.Request
 // @router /updateeveryminute [put]
-func (this *InstrumentController) UpdateInfo() {
-	var model instrument.Instrumenstate
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &model)
-	var errinfo ErrorInfo
-	svc := instrument.GetInstrumentService(utils.DBE)
-	if model.Code == "" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	where := " where Code= '" + model.Code + "'"
-	timeLayout := "2006-01-02 15:04:05"                              //时间转换模板
-	dataTimeStr := time.Unix(model.ReportTime, 0).Format(timeLayout) //格式化时间戳
-	err := svc.UpdateInstrumentdata(accode+InstrumenstateName, accode+InstrumentName, dataTimeStr, where)
+//func (this *InstrumentController) UpdateInfo() {
+//	var model instrument.Instrumenstate
+//	var jsonblob = this.Ctx.Input.RequestBody
+//	json.Unmarshal(jsonblob, &model)
+//	var errinfo ErrorInfo
+//	svc := instrument.GetInstrumentService(utils.DBE)
+//	if model.Code == "" {
+//		errinfo.Message = "操作失败！请求信息不完整"
+//		errinfo.Code = -2
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//		return
+//	}
+//	where := " where Code= '" + model.Code + "'"
+//	timeLayout := "2006-01-02 15:04:05"                              //时间转换模板
+//	dataTimeStr := time.Unix(model.ReportTime, 0).Format(timeLayout) //格式化时间戳
+//	err := svc.UpdateInstrumentdata(accode+InstrumenstateName, accode+InstrumentName, dataTimeStr, where)
 
-	if err == nil {
-		errinfo.Message = "操作成功！"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-}
+//	if err == nil {
+//		errinfo.Message = "操作成功！"
+//		errinfo.Code = 0
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//	} else {
+//		errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
+//		errinfo.Code = -1
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//	}
+//}
 
 // @Title 根据用户AccCode get检验主表 客户原始信息内容
 // @Description get user by token

src/dashoo.cn/backend/api/controllers/authcode.go → src/dashoo.cn/backend/api/controllers/logs/authcode.go

@@ -1,6 +1,7 @@
-package controllers
+package logs
 
 import (
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/backend/api/business/authcode"
 	"dashoo.cn/utils"
 )

src/dashoo.cn/backend/api/controllers/authcodemans.go → src/dashoo.cn/backend/api/controllers/logs/authcodemans.go

@@ -1,10 +1,11 @@
-package controllers
+package logs
 
 import (
 	"encoding/json"
 	"fmt"
 
 	"dashoo.cn/backend/api/business/authcodeman"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/loginfo.go → src/dashoo.cn/backend/api/controllers/logs/loginfo.go

@@ -1,4 +1,4 @@
-package controllers
+package logs
 
 import (
 	"encoding/json"

src/dashoo.cn/backend/api/controllers/loginfos.go → src/dashoo.cn/backend/api/controllers/logs/loginfos.go

@@ -1,4 +1,4 @@
-package controllers
+package logs
 
 import (
 	"encoding/json"
@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"dashoo.cn/backend/api/business/baseUser"
-	"dashoo.cn/backend/api/business/extend"
 	"dashoo.cn/backend/api/business/logsinfo"
 	"dashoo.cn/backend/api/business/operationlog"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 	"dashoo.cn/utils/db"
 )
@@ -614,17 +614,17 @@ func LogcomparefuncByNoteSample(m1, m2 interface{}, map_listpublic, map_listpriv
 //	this.ServeJSON()
 //}
 
-func GetDonorNoteNameMap(acccode string) map[string]string {
-	svcdnote := extend.GetExtendService(utils.DBE)
-	where1 := " AccCode='" + acccode + "' "
-	var DnoteitemList []extend.DonorsNoteItem
-	DnoteitemList = svcdnote.GetDNoteItemList(where1)
-	map_list := make(map[string]string)
-	for i := 0; i < len(DnoteitemList); i++ {
-		map_list[utils.ToStr(DnoteitemList[i].FieldName)] = DnoteitemList[i].Name
-	}
-	return map_list
-}
+//func GetDonorNoteNameMap(acccode string) map[string]string {
+//	svcdnote := extend.GetExtendService(utils.DBE)
+//	where1 := " AccCode='" + acccode + "' "
+//	var DnoteitemList []extend.DonorsNoteItem
+//	DnoteitemList = svcdnote.GetDNoteItemList(where1)
+//	map_list := make(map[string]string)
+//	for i := 0; i < len(DnoteitemList); i++ {
+//		map_list[utils.ToStr(DnoteitemList[i].FieldName)] = DnoteitemList[i].Name
+//	}
+//	return map_list
+//}
 
 func LogcomparefuncByNote(m1, m2 interface{}, map_list map[string]string) []Logcompare {
 	objT1 := reflect.TypeOf(m1).Elem()

src/dashoo.cn/backend/api/controllers/material.go → src/dashoo.cn/backend/api/controllers/material/material.go

@@ -1,4 +1,4 @@
-package controllers
+package material
 
 import (
 	"encoding/json"
@@ -9,6 +9,7 @@ import (
 
 	"dashoo.cn/backend/api/business/material"
 	"dashoo.cn/backend/api/business/materialstorehouse"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 	"github.com/tealeg/xlsx"
 )

src/dashoo.cn/backend/api/controllers/materialstorehouse.go → src/dashoo.cn/backend/api/controllers/material/materialstorehouse.go

@@ -1,9 +1,10 @@
-package controllers
+package material
 
 import (
 	"encoding/json"
 
 	"dashoo.cn/backend/api/business/materialstorehouse"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/monthreports.go → src/dashoo.cn/backend/api/controllers/material/monthreports.go

@@ -1,4 +1,4 @@
-package controllers
+package material
 
 import (
 	"encoding/json"
@@ -8,6 +8,7 @@ import (
 
 	"dashoo.cn/backend/api/business/device"
 	"dashoo.cn/backend/api/business/userchannels"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/labsop"
 	"dashoo.cn/utils"
 	"github.com/signintech/gopdf"

src/dashoo.cn/backend/api/controllers/reports.go

@@ -7,11 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"dashoo.cn/backend/api/business/reports"
-	"dashoo.cn/backend/api/mydb"
-
 	"dashoo.cn/backend/api/business/device"
+	"dashoo.cn/backend/api/business/reports"
 	"dashoo.cn/backend/api/business/userchannels"
+	"dashoo.cn/backend/api/mydb"
 	"dashoo.cn/labsop"
 	"dashoo.cn/utils"
 	"github.com/signintech/gopdf"

src/dashoo.cn/backend/api/controllers/admincoderule.go → src/dashoo.cn/backend/api/controllers/setting/admincoderule.go

@@ -1,10 +1,11 @@
-package controllers
+package setting
 
 import (
 	"encoding/json"
 	"strings"
 
 	"dashoo.cn/backend/api/business/coderule"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/admincoderuledetail.go → src/dashoo.cn/backend/api/controllers/setting/admincoderuledetail.go

@@ -1,9 +1,10 @@
-package controllers
+package setting
 
 import (
 	"encoding/json"
 
 	"dashoo.cn/backend/api/business/coderule"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/items.go → src/dashoo.cn/backend/api/controllers/setting/items.go

@@ -1,10 +1,11 @@
-package controllers
+package setting
 
 import (
 	"encoding/json"
 	"fmt"
 
 	"dashoo.cn/backend/api/business/items"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/itemsdetailadd.go → src/dashoo.cn/backend/api/controllers/setting/itemsdetailadd.go

@@ -1,9 +1,10 @@
-package controllers
+package setting
 
 import (
 	"fmt"
 
 	"dashoo.cn/backend/api/business/items"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/labelprint.go → src/dashoo.cn/backend/api/controllers/setting/labelprint.go

@@ -1,4 +1,8 @@
-package controllers
+package setting
+
+import (
+	. "dashoo.cn/backend/api/controllers"
+)
 
 //"fmt"
 

src/dashoo.cn/backend/api/controllers/paramset.go → src/dashoo.cn/backend/api/controllers/setting/paramset.go

@@ -1,9 +1,10 @@
-package controllers
+package setting
 
 import (
 	"encoding/json"
 	"fmt"
 
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/business2/parameter"
 	"dashoo.cn/utils"
 )

src/dashoo.cn/backend/api/controllers/printscheme.go → src/dashoo.cn/backend/api/controllers/setting/printscheme.go

@@ -1,4 +1,4 @@
-package controllers
+package setting
 
 import (
 	"archive/zip"
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"dashoo.cn/backend/api/business/printscheme"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/channels.go → src/dashoo.cn/backend/api/controllers/system/channels.go

@@ -1,4 +1,4 @@
-package controllers
+package system
 
 import (
 	"encoding/json"
@@ -11,6 +11,7 @@ import (
 	"dashoo.cn/backend/api/business/trigger"
 	"dashoo.cn/backend/api/business/triggerhistory"
 	"dashoo.cn/backend/api/business/userchannels"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/labsop"
 	"dashoo.cn/models"
 	"dashoo.cn/utils"

src/dashoo.cn/backend/api/controllers/codecsequence.go → src/dashoo.cn/backend/api/controllers/system/codecsequence.go

@@ -1,12 +1,13 @@
-package controllers
+package system
 
 import (
-	"dashoo.cn/backend/api/business/codecsequence"
-	"dashoo.cn/utils"
 	"fmt"
 	"strconv"
-)
 
+	"dashoo.cn/backend/api/business/codecsequence"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
 
 type CodecSequenceController struct {
 	BaseController

src/dashoo.cn/backend/api/controllers/dataexports.go → src/dashoo.cn/backend/api/controllers/system/dataexports.go

@@ -1,4 +1,4 @@
-package controllers
+package system
 
 import (
 	"encoding/json"
@@ -7,6 +7,7 @@ import (
 
 	"dashoo.cn/backend/api/business/device"
 	"dashoo.cn/backend/api/business/userchannels"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 	"github.com/signintech/gopdf"
 	"github.com/tealeg/xlsx"

src/dashoo.cn/backend/api/controllers/abnormals.go → src/dashoo.cn/backend/api/controllers/trigger/abnormals.go

@@ -1,4 +1,4 @@
-package controllers
+package trigger
 
 import (
 	"encoding/json"
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"dashoo.cn/backend/api/business/triggerabnormal"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/actions.go → src/dashoo.cn/backend/api/controllers/trigger/actions.go

@@ -1,9 +1,10 @@
-package controllers
+package trigger
 
 import (
 	"encoding/json"
 
 	"dashoo.cn/backend/api/business/actions"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/alerts.go → src/dashoo.cn/backend/api/controllers/trigger/alerts.go

@@ -1,4 +1,4 @@
-package controllers
+package trigger
 
 import (
 	"encoding/json"
@@ -7,8 +7,8 @@ import (
 
 	"dashoo.cn/backend/api/business/actions"
 	"dashoo.cn/backend/api/business/device"
-	"dashoo.cn/backend/api/business/logsinfo"
 	"dashoo.cn/backend/api/business/userchannels"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 
@@ -235,82 +235,82 @@ func (this *AlertsController) GetBindDevices() {
 // @Param	body	body	business.device.DeviceChannels	"报警器信息"
 // @Success	200	{object} ErrorInfo
 // @router /:code [put]
-func (this *AlertsController) EditPost() {
-	code := this.Ctx.Input.Param(":code")
-	var errinfo ErrorInfo
-
-	if code == "" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	code = "c" + code
-	var model AlertModel
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &model)
-	u, p := this.GetuAndp()
-
-	var devices logsinfo.AlertorLog
-
-	svc := device.GetDeviceService(utils.DBE)
-	has := svc.GetEntity(&devices, "Serial='"+model.Serial+"' and DataItem=4")
-	if !has {
-		errinfo.Message = "操作失败！请求数据有误"
-		errinfo.Code = -3
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-
-	deviceLog_Log := Logcompare{Value1: DeviceLog_Log{devices.Id, devices.Serial, devices.Code, devices.Title, devices.Local, devices.About}, Value2: DeviceLog_Log{devices.Id, devices.Serial, model.TagCode, model.Title, devices.Local, devices.About}}
-	svc.InsertUpdateLog(0, &deviceLog_Log, utils.ToStr(this.User.Id), this.User.Realname, AlertorLogTName)
-
-	devices.Code = model.TagCode
-	devices.Title = model.Title
-	devices.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-	devices.ModifiedBy = this.User.Realname
-	var cols []string = []string{"Title", "Code", "ModifiedUserId", "ModifiedBy"}
-	_, err := svc.UpdateEntityByIdCols(devices.Id, &devices, cols)
-
-	if err == nil {
-		strUrl := utils.Cfg.MustValue("server", "apiurl") + "/devices/" + utils.ToStr(devices.Wdid) + "?u=" + u + "&p=" + p
-		Apipost(strUrl, "PUT", devices)
-
-		//绑定设备
-		if len(model.BindDevices) > 0 {
-			bindchannels := "c" + strings.Join(model.BindDevices, ",c")
-			WriteAlertBindValue("alert"+model.Serial, bindchannels)
-		}
-
-		//修改动作
-		svcaction := actions.GetActionsService(utils.DBE)
-		action := svcaction.GetAlertor(devices.Serial)
-		if action.Id > 0 {
-			action.AName = devices.Title
-			var status Status
-			strUrl = utils.Cfg.MustValue("server", "apiurl") + "/actions/" + utils.ToStr(action.Id) + "?u=" + u + "&p=" + p
-			json.Unmarshal(Apipost(strUrl, "PUT", action), &status)
-			if status.Status == 0 {
-				var cols []string = []string{"AName"}
-				svcaction.UpdateEntityByIdCols(action.Id, &action, cols)
-			}
-		}
-
-		errinfo.Message = "保存成功！"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-
-	} else {
-		errinfo.Message = "保存失败！" + utils.AlertProcess(err.Error())
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
-
-}
+//func (this *AlertsController) EditPost() {
+//	code := this.Ctx.Input.Param(":code")
+//	var errinfo ErrorInfo
+
+//	if code == "" {
+//		errinfo.Message = "操作失败！请求信息不完整"
+//		errinfo.Code = -2
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//		return
+//	}
+//	code = "c" + code
+//	var model AlertModel
+//	var jsonblob = this.Ctx.Input.RequestBody
+//	json.Unmarshal(jsonblob, &model)
+//	u, p := this.GetuAndp()
+
+//	var devices logsinfo.AlertorLog
+
+//	svc := device.GetDeviceService(utils.DBE)
+//	has := svc.GetEntity(&devices, "Serial='"+model.Serial+"' and DataItem=4")
+//	if !has {
+//		errinfo.Message = "操作失败！请求数据有误"
+//		errinfo.Code = -3
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//		return
+//	}
+
+//	deviceLog_Log := Logcompare{Value1: DeviceLog_Log{devices.Id, devices.Serial, devices.Code, devices.Title, devices.Local, devices.About}, Value2: DeviceLog_Log{devices.Id, devices.Serial, model.TagCode, model.Title, devices.Local, devices.About}}
+//	svc.InsertUpdateLog(0, &deviceLog_Log, utils.ToStr(this.User.Id), this.User.Realname, AlertorLogTName)
+
+//	devices.Code = model.TagCode
+//	devices.Title = model.Title
+//	devices.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+//	devices.ModifiedBy = this.User.Realname
+//	var cols []string = []string{"Title", "Code", "ModifiedUserId", "ModifiedBy"}
+//	_, err := svc.UpdateEntityByIdCols(devices.Id, &devices, cols)
+
+//	if err == nil {
+//		strUrl := utils.Cfg.MustValue("server", "apiurl") + "/devices/" + utils.ToStr(devices.Wdid) + "?u=" + u + "&p=" + p
+//		Apipost(strUrl, "PUT", devices)
+
+//		//绑定设备
+//		if len(model.BindDevices) > 0 {
+//			bindchannels := "c" + strings.Join(model.BindDevices, ",c")
+//			WriteAlertBindValue("alert"+model.Serial, bindchannels)
+//		}
+
+//		//修改动作
+//		svcaction := actions.GetActionsService(utils.DBE)
+//		action := svcaction.GetAlertor(devices.Serial)
+//		if action.Id > 0 {
+//			action.AName = devices.Title
+//			var status Status
+//			strUrl = utils.Cfg.MustValue("server", "apiurl") + "/actions/" + utils.ToStr(action.Id) + "?u=" + u + "&p=" + p
+//			json.Unmarshal(Apipost(strUrl, "PUT", action), &status)
+//			if status.Status == 0 {
+//				var cols []string = []string{"AName"}
+//				svcaction.UpdateEntityByIdCols(action.Id, &action, cols)
+//			}
+//		}
+
+//		errinfo.Message = "保存成功！"
+//		errinfo.Code = 0
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+
+//	} else {
+//		errinfo.Message = "保存失败！" + utils.AlertProcess(err.Error())
+//		errinfo.Code = -1
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//	}
+
+//}
 
 // @Title 删除报警器
 // @Description 删除报警器

src/dashoo.cn/backend/api/controllers/triggerinfos.go → src/dashoo.cn/backend/api/controllers/trigger/triggerinfos.go

@@ -1,7 +1,8 @@
-package controllers
+package trigger
 
 import (
 	"dashoo.cn/backend/api/business/triggerhistory"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/controllers/triggers.go → src/dashoo.cn/backend/api/controllers/trigger/triggers.go

@@ -1,10 +1,11 @@
-package controllers
+package trigger
 
 import (
 	"encoding/json"
 	"strings"
 
 	"dashoo.cn/backend/api/business/trigger"
+	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 )
 

src/dashoo.cn/backend/api/routers/router.go

@@ -6,6 +6,14 @@ package routers
 import (
 	"dashoo.cn/backend/api/controllers"
 	"dashoo.cn/backend/api/controllers/casbin"
+	"dashoo.cn/backend/api/controllers/document"
+	"dashoo.cn/backend/api/controllers/equipment"
+	"dashoo.cn/backend/api/controllers/instrument"
+	"dashoo.cn/backend/api/controllers/logs"
+	"dashoo.cn/backend/api/controllers/material"
+	"dashoo.cn/backend/api/controllers/setting"
+	"dashoo.cn/backend/api/controllers/system"
+	"dashoo.cn/backend/api/controllers/trigger"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
 )
@@ -51,189 +59,189 @@ func init() {
 			),
 		),
 		//授权码管理
-		beego.NSNamespace("/authcode",
-			beego.NSInclude(
-				&controllers.AuthCodeController{},
-			),
-		),
 		beego.NSNamespace("/channels",
 			beego.NSInclude(
-				&controllers.ChannelsController{},
+				&system.ChannelsController{},
 			),
 		),
-		beego.NSNamespace("/alerts",
+		//序列号
+		beego.NSNamespace("/codesequence",
 			beego.NSInclude(
-				&controllers.AlertsController{},
+				&system.CodecSequenceController{},
 			),
 		),
-		beego.NSNamespace("/actions",
+		//数据导出
+		beego.NSNamespace("/dataexports",
 			beego.NSInclude(
-				&controllers.ActionsController{},
+				&system.DataExportsController{},
 			),
 		),
-		beego.NSNamespace("/triggerinfos",
+		//数据字典
+		beego.NSNamespace("/items",
 			beego.NSInclude(
-				&controllers.TriggerinfosController{},
+				&setting.ItemsController{},
 			),
 		),
-		beego.NSNamespace("/triggers",
+		beego.NSNamespace("/itemsdetailadd",
 			beego.NSInclude(
-				&controllers.TriggersController{},
+				&setting.ItemsdetailaddController{},
 			),
 		),
-		beego.NSNamespace("/reports",
+		//编码规则
+		beego.NSNamespace("/admincoderule",
 			beego.NSInclude(
-				&controllers.ReportsController{},
+				&setting.AdmincoderuleController{},
 			),
 		),
-		beego.NSNamespace("/monthreports",
+		beego.NSNamespace("/admincoderuledetail",
 			beego.NSInclude(
-				&controllers.MonthReportsController{},
+				&setting.AdmincoderuledetailController{},
 			),
 		),
-		beego.NSNamespace("/dataexports",
+		beego.NSNamespace("/printscheme",
 			beego.NSInclude(
-				&controllers.DataExportsController{},
+				&setting.PrintschemeController{},
 			),
 		),
-		beego.NSNamespace("/abnormals",
+		beego.NSNamespace("/labelprint",
 			beego.NSInclude(
-				&controllers.AbnormalsController{},
+				&setting.LabelprintController{},
 			),
 		),
-		beego.NSNamespace("/authcodemans",
+		//参数设置
+		beego.NSNamespace("/paramset",
 			beego.NSInclude(
-				&controllers.AuthcodemansController{},
+				&setting.ParamSetController{},
 			),
 		),
-		beego.NSNamespace("/operationlog",
+		//报警设置
+		beego.NSNamespace("/triggers",
 			beego.NSInclude(
-				&controllers.LoginfosController{},
+				&trigger.TriggersController{},
 			),
 		),
-		beego.NSNamespace("/loginlog",
+		beego.NSNamespace("/triggerinfos",
 			beego.NSInclude(
-				&controllers.LoginfosController{},
+				&trigger.TriggerinfosController{},
 			),
 		),
-		beego.NSNamespace("/loginfos",
+		beego.NSNamespace("/actions",
 			beego.NSInclude(
-				&controllers.LoginfosController{},
+				&trigger.ActionsController{},
 			),
 		),
-		beego.NSNamespace("/permission",
+		beego.NSNamespace("/alerts",
 			beego.NSInclude(
-				&controllers.PermissionController{},
+				&trigger.AlertsController{},
 			),
 		),
-		beego.NSNamespace("/organizes",
+		beego.NSNamespace("/abnormals",
 			beego.NSInclude(
-				&controllers.OrganizesController{},
+				&trigger.AbnormalsController{},
 			),
 		),
-		beego.NSNamespace("/district",
+		//设备管理
+		beego.NSNamespace("/equipment",
 			beego.NSInclude(
-				&controllers.DistrictController{},
+				&equipment.EquipmentController{},
 			),
 		),
-		//数据字典
-		beego.NSNamespace("/items",
+		beego.NSNamespace("/shelfset",
 			beego.NSInclude(
-				&controllers.ItemsController{},
+				&equipment.ShelfSetController{},
 			),
 		),
-		//数据字典
-		beego.NSNamespace("/itemsdetailadd",
+		beego.NSNamespace("/equipmentmodel",
 			beego.NSInclude(
-				&controllers.ItemsdetailaddController{},
+				&equipment.EquipmentModelController{},
 			),
 		),
-		//编码规则
-		beego.NSNamespace("/admincoderule",
+		//仓库管理
+		beego.NSNamespace("/material",
 			beego.NSInclude(
-				&controllers.AdmincoderuleController{},
+				&material.MaterialController{},
 			),
 		),
-		beego.NSNamespace("/admincoderuledetail",
+		beego.NSNamespace("/materialstorehouse",
 			beego.NSInclude(
-				&controllers.AdmincoderuledetailController{},
+				&material.MaterialstorehouseController{},
 			),
 		),
-		beego.NSNamespace("/printscheme",
+		beego.NSNamespace("/monthreports",
 			beego.NSInclude(
-				&controllers.PrintschemeController{},
+				&material.MonthReportsController{},
 			),
 		),
-		beego.NSNamespace("/labelprint",
+		//设备管理
+		beego.NSNamespace("/instrument",
 			beego.NSInclude(
-				&controllers.LabelprintController{},
+				&instrument.InstrumentController{},
 			),
 		),
-		//样本来源扩展
-		beego.NSNamespace("/extends",
+		//文件管理
+		beego.NSNamespace("/document",
 			beego.NSInclude(
-				&controllers.ExtendsController{},
+				&document.DocumentController{},
 			),
 		),
-		//图片，文件上传
-		beego.NSNamespace("/uploads",
+		//日志管理
+		beego.NSNamespace("/loginlog",
 			beego.NSInclude(
-				&controllers.UploadController{},
+				&logs.LoginfosController{},
 			),
 		),
-		//设备管理
-		beego.NSNamespace("/equipment",
+		beego.NSNamespace("/loginfos",
 			beego.NSInclude(
-				&controllers.EquipmentController{},
+				&logs.LoginfosController{},
 			),
 		),
-		//设备型号管理
-		beego.NSNamespace("/equipmentmodel",
+		beego.NSNamespace("/authcode",
 			beego.NSInclude(
-				&controllers.EquipmentModelController{},
+				&logs.AuthCodeController{},
 			),
 		),
-		//参数设置
-		beego.NSNamespace("/paramset",
+		beego.NSNamespace("/authcodemans",
 			beego.NSInclude(
-				&controllers.ParamSetController{},
+				&logs.AuthcodemansController{},
 			),
 		),
-		//角色管理
-		beego.NSNamespace("/role",
+		beego.NSNamespace("/operationlog",
 			beego.NSInclude(
-				&controllers.RoleController{},
+				&logs.LoginfosController{},
 			),
 		),
-		beego.NSNamespace("/material",
+		beego.NSNamespace("/reports",
 			beego.NSInclude(
-				&controllers.MaterialController{},
+				&controllers.ReportsController{},
 			),
 		),
-		beego.NSNamespace("/permissions",
+		//图片，文件上传
+		beego.NSNamespace("/uploads",
 			beego.NSInclude(
-				&controllers.PermissionsController{},
+				&controllers.UploadController{},
 			),
 		),
-		beego.NSNamespace("/instrument",
+
+		beego.NSNamespace("/permission",
 			beego.NSInclude(
-				&controllers.InstrumentController{},
+				&controllers.PermissionController{},
 			),
 		),
-		beego.NSNamespace("/materialstorehouse",
+		beego.NSNamespace("/organizes",
 			beego.NSInclude(
-				&controllers.MaterialstorehouseController{},
+				&controllers.OrganizesController{},
 			),
 		),
-		beego.NSNamespace("/document",
+		//角色管理
+		beego.NSNamespace("/role",
 			beego.NSInclude(
-				&controllers.DocumentController{},
+				&controllers.RoleController{},
 			),
 		),
-		//序列号
-		beego.NSNamespace("/codesequence",
+
+		beego.NSNamespace("/permissions",
 			beego.NSInclude(
-				&controllers.CodecSequenceController{},
+				&controllers.PermissionsController{},
 			),
 		),
 	)