From 413e0ea39cb9ccb88e0cf5d2b6d5730561767744 Mon Sep 17 00:00:00 2001
From: henry <postmaster@ipeace.org.cn>
Date: Fri, 12 Nov 2021 11:14:58 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/manage.go               | 19 +++++++++++++++++++
 app/common/init.go              |  3 ++-
 app/controller/user/instance.go | 15 ++++++++++++---
 app/model/manage_notice.go      | 11 +++++++++++
 cmd/ctl/command/model/model.go  |  2 +-
 router/router.go                |  5 +++++
 6 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 app/model/manage_notice.go

diff --git a/app/api/manage.go b/app/api/manage.go
index 03f7e3a..08c9de6 100644
--- a/app/api/manage.go
+++ b/app/api/manage.go
@@ -442,3 +442,22 @@ func (*Manage) MaterialSupplierDelete(c *gin.Context) {
 	err := manage.NewMaterialSuppler()(getSession()(c).(*service.Session)).Delete(form.Convert())
 	APIResponse(err)(c)
 }
+
+func (*Manage) Notice(c *gin.Context) {
+
+}
+
+func (*Manage) NoticeDetail(c *gin.Context) {
+
+}
+
+func (*Manage) NoticeAdd(c *gin.Context) {
+
+}
+
+func (*Manage) NoticeEdit(c *gin.Context) {
+
+}
+func (*Manage) NoticeDelete(c *gin.Context) {
+
+}
diff --git a/app/common/init.go b/app/common/init.go
index dfc2a40..713d30d 100644
--- a/app/common/init.go
+++ b/app/common/init.go
@@ -53,7 +53,8 @@ func initModel() {
 		&synchronized{iModel: model.NewManageMaterial()}, &synchronized{iModel: model.NewManageMaterialSupplier()},
 		&synchronized{iModel: model.NewManageMaterialPurchase()}, &synchronized{iModel: model.NewManageMaterialWarehouse()},
 		&synchronized{iModel: model.NewWorkInstance()}, &synchronized{iModel: model.NewWorkMaterial()}, &synchronized{iModel: model.NewWorkProgress()},
-		&synchronized{iModel: model.NewWorkSchedule()}, &synchronized{iModel: model.NewWorkRepair()},
+		&synchronized{iModel: model.NewWorkSchedule()},
+		&synchronized{iModel: model.NewWorkRepair()}, &synchronized{iModel: model.NewWorkRepairDetail()},
 	)
 }
 func initCacheMode() {
diff --git a/app/controller/user/instance.go b/app/controller/user/instance.go
index 16e25a1..98a312f 100644
--- a/app/controller/user/instance.go
+++ b/app/controller/user/instance.go
@@ -16,8 +16,9 @@ type InstanceHandle func(session *service.Session) *Instance
 type (
 	// InstanceBasic 基本信息
 	InstanceBasic struct {
-		Name   string `json:"name"`
-		Avatar string `json:"avatar"`
+		Name       string `json:"name"`
+		Avatar     string `json:"avatar"`
+		TenantName string `json:"tenant_name"`
 	}
 	// InstanceInfo 用户信息
 	InstanceInfo struct {
@@ -39,7 +40,15 @@ type (
 
 // Info 基本信息
 func (c *Instance) Info() *InstanceBasic {
-	return &InstanceBasic{Name: c.Name, Avatar: c.Avatar}
+	out := &InstanceBasic{Name: c.Name, Avatar: c.Avatar}
+
+	if c.TenantID > 0 {
+		mSysTenant := model.NewSysTenant()
+		mSysTenant.ID = c.TenantID
+		_, _ = model2.FirstField(mSysTenant.SysTenant, []string{"id", "name"})
+		out.TenantName = mSysTenant.Name
+	}
+	return out
 }
 
 // Select 筛选信息
diff --git a/app/model/manage_notice.go b/app/model/manage_notice.go
new file mode 100644
index 0000000..90b34c4
--- /dev/null
+++ b/app/model/manage_notice.go
@@ -0,0 +1,11 @@
+package model
+
+import "ArmedPolice/app/common/model"
+
+type ManageNotice struct {
+	*model.ManageNotice
+}
+
+func NewManageNotice() *ManageNotice {
+	return &ManageNotice{model.NewManageNotice()}
+}
diff --git a/cmd/ctl/command/model/model.go b/cmd/ctl/command/model/model.go
index 1366e53..abdbbac 100644
--- a/cmd/ctl/command/model/model.go
+++ b/cmd/ctl/command/model/model.go
@@ -42,7 +42,7 @@ func init() {
 
 			dir, err := os.Getwd()
 
-			output := "../..//app/common/model"
+			output := "../../app/common/model"
 
 			output = path.Join(dir, output)
 
diff --git a/router/router.go b/router/router.go
index d539937..f323f02 100644
--- a/router/router.go
+++ b/router/router.go
@@ -156,6 +156,11 @@ func (this *Router) registerAPI() {
 		manageV1.POST("/material/supplier/select", _api.MaterialSupplierSelect)
 		manageV1.POST("/material/supplier/bind", _api.MaterialSupplierBind)
 		manageV1.POST("/material/supplier/delete", _api.MaterialSupplierDelete)
+		manageV1.POST("/notice", _api.Notice)
+		manageV1.POST("/notice/detail", _api.NoticeDetail)
+		manageV1.POST("/notice/add", _api.NoticeAdd)
+		manageV1.POST("/notice/edit", _api.NoticeEdit)
+		manageV1.POST("/notice/delete", _api.NoticeEdit)
 	}
 	// Work 工单管理
 	workV1 := v1.Group("/work")