创建响应结构退:RsqOperationHisList,修改响应list为响应结构体RsqOperationHisList.将handleHistoryController.go从device.controller移至system.controller

app/multimedia/dao/programDao.go

@@ -12,7 +12,7 @@ type Program struct {
 	FileSize    int64     `gorm:"type:bigint" json:"fileSize"`           //统计文件总大小
 	ImgDuration int       `gorm:"type:int;default 0" json:"imgDuration"` //图片播放时长(毫秒)
 	Remarks     string    `gorm:"type:varchar(4000)" json:"remarks"`     //备注
-	SysType     int       `gorm:"type:int" json:"sysType"`               //系统类型：0-信息发布系统，1-广播系统
+	SysType     int       `gorm:"type:int" json:"sysTrecordype"`         //系统类型：0-信息发布系统，1-广播系统
 	TenantId    int       `gorm:"type:int" json:"tenantId"`              //租户ID
 	CreateTime  time.Time `gorm:"type:datetime" json:"createTime"`       //新增时间
 	CreateUser  int64     `gorm:"type:bigint" json:"createUser"`         //新增记录操作用户ID

app/system/controller/generalLog.go

@@ -0,0 +1,22 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/system/service"
+	"iot_manager_service/util/common"
+	"net/http"
+)
+
+type generalLog struct{}
+
+var GeneralLog = new(generalLog)
+
+// http://localhost/api/blade-log/usual/list?current=1&size=10
+// 获取最新10条日志
+func (g *generalLog) GetGeneLog(ctx *gin.Context) {
+	list, err := service.LogService.GetLogList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, common.FailResponse(err.Error(), nil))
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, list))
+}

app/device/controller/handleHistoryController.go

@@ -3,6 +3,7 @@ package controller
 import (
 	"github.com/gin-gonic/gin"
 	"iot_manager_service/app/middleware"
+	"iot_manager_service/app/system/model"
 	service2 "iot_manager_service/app/system/service"
 	"iot_manager_service/util/common"
 	"net/http"
@@ -35,6 +36,13 @@ func (c *handleHistoryCtl) List(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-
-	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, list))
+	pages := 20 //math.Ceil(float64(len(list)) / float64(size))
+	rsp := model.RsqOperationHisList{
+		Current: current,
+		Size:    size,
+		Total:   100,
+		Pages:   pages,
+		Records: list,
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
 }

app/system/dao/operationHisDao.go

@@ -38,7 +38,7 @@ func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, e
 		db = db.Where("object like ?", "%"+c.Object+"%")
 	}
 
-	err := Db.Debug().Model(&c).Offset(offset).Limit(limit).Find(&list).Error
+	err := db.Offset(offset).Limit(limit).Find(&list).Error
 
 	return list, err
 }

app/system/dao/tenant.go

@@ -1,6 +1,9 @@
 package dao
 
-import "time"
+import (
+	"fmt"
+	"time"
+)
 
 // 租户
 type Tenant struct {
@@ -87,6 +90,7 @@ func (c *Tenant) Update() error {
 func (c *Tenant) GetAll() ([]Tenant, error) {
 	var tenants []Tenant
 	err := Db.Debug().Model(&c).Where("is_deleted = 0").Find(&tenants).Error
+	fmt.Printf("[]Tenant:%v\n", tenants)
 	return tenants, err
 }
 

app/system/model/OperationHis.go

@@ -6,7 +6,16 @@ import (
 
 type OperationHisDetail struct {
 	dao.OperationHistory
-	HandleName        string `json:"handle_name"`       //操作人
+	HandleName        string `json:"handleName"`        //操作人
 	OperationTypeName string `json:"operationTypeName"` //操作类型
 	ModuleTypeName    string `json:"moduleTypeName"`    //操作模块
 }
+
+// 响应结构体
+type RsqOperationHisList struct {
+	Records []OperationHisDetail `json:"records"` //记录列表
+	Current int                  `json:"current"` //当前分页
+	Size    int                  `json:"size"`    //每页数量
+	Pages   int                  `json:"pages"`   //总页数
+	Total   int                  `json:"total"`   //总数
+}

app/system/service/dictService.go

@@ -15,7 +15,8 @@ var DictService = new(dictService)
 type dictService struct{}
 
 const (
-	ControlType    = "control_type"
+	//ControlType    = "control_type" => ControlType    = "operation_his_type" 2022/12/31 17:18
+	ControlType    = "operation_his_type"
 	ModuleType     = "module_his_type"
 	Sex            = "sex"
 	ResolutionType = "resolution_type"

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
 	github.com/minio/minio-go/v7 v7.0.43
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mojocn/base64Captcha v1.3.5
 	github.com/robfig/cron v1.2.0
 	github.com/satori/go.uuid v1.2.0
@@ -44,7 +45,6 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect

router/router.go

@@ -25,7 +25,7 @@ func InitRouter(engine *gin.Engine) {
 	// 操作历史记录
 	handleHistory := engine.Group("/api/longchi/handlehistory")
 	{
-		handleHistory.GET("/list", device.HandleHistory.List)
+		handleHistory.GET("/list", system.HandleHistory.List)
 	}
 
 	// 设备管理
@@ -394,7 +394,7 @@ func InitRouter(engine *gin.Engine) {
 		tenant.GET("/page", system.Tenant.List)
 		tenant.POST("/submit", system.Tenant.Submit)
 		tenant.POST("/remove", system.Tenant.Remove)
-		tenant.POST("/select", system.Tenant.GetList)
+		tenant.GET("/select", system.Tenant.GetList)
 		tenant.GET("/list", system.Tenant.List)
 	}