操作记录完善

app/controller/handleHistoryController.go

@@ -25,11 +25,11 @@ func (c *handleHistoryCtl) List(ctx *gin.Context) {
 	if size <= 0 || size > 100 {
 		size = 10
 	}
-	_, err := service.OperationHisService.List(handleContent, operationType, moduleType, current, size)
+	list, err := service.OperationHisService.List(handleContent, operationType, moduleType, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
 
-	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, list))
 }

app/dao/dict.go

@@ -16,3 +16,7 @@ type Dict struct {
 func (Dict) TableName() string {
 	return "dict"
 }
+
+func (c *Dict) GetByCodeAndKey() error {
+	return GDb.Model(&c).Where("code = ? and dict_key = ?", c.Code, c.DictKey).Find(&c).Error
+}

app/dao/operationHisDao.go

@@ -25,18 +25,18 @@ func (c *OperationHis) Create() error {
 
 func (c OperationHis) GetHistories(offset, limit int) ([]OperationHis, error) {
 	var list []OperationHis
-
 	db := GDb.Model(&c)
-	if c.OperationType != 0 {
+	if c.OperationType > 0 {
 		db = db.Where("operation_type = ?", c.OperationType)
 	}
-	if c.ModuleType != 0 {
+	if c.ModuleType > 0 {
 		db = db.Where("module_type = ?", c.ModuleType)
 	}
 	if c.HandleContent != "" {
 		db = db.Where("handle_content like ?", "%"+c.HandleContent+"%")
 	}
 
-	err := db.Offset(offset).Limit(limit).Find(&list).Error
+	err := GDb.Model(&c).Offset(offset).Limit(limit).Find(&list).Error
+
 	return list, err
 }

app/dao/user.go

@@ -6,7 +6,7 @@ import (
 
 // User 用户
 type User struct {
-	ID                      int       `gorm:"primary_key" json:"id"`                             //编号
+	ID                      int64     `gorm:"primary_key" json:"id"`                             //编号
 	TenantId                string    `gorm:"type:varchar(12);default '000000'" json:"tenantId"` //租户id
 	Code                    string    `gorm:"type:varchar(12)" json:"code"`                      //用户编号
 	Account                 string    `gorm:"type:varchar(12)" json:"account"`                   //账号
@@ -37,7 +37,6 @@ func (User) TableName() string {
 	return "user"
 }
 
-func (c User) Delete() error {
-	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
-		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+func (c *User) GetUser() error {
+	return GDb.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }

app/model/OperationHis.go

@@ -0,0 +1,10 @@
+package model
+
+import "iot_manager_service/app/dao"
+
+type OperationHisDetail struct {
+	dao.OperationHis
+	HandleName        string `json:"handle_name"`       //操作人
+	OperationTypeName string `json:"operationTypeName"` //操作类型
+	ModuleTypeName    string `json:"moduleTypeName"`    //操作模块
+}

app/model/common.go

@@ -87,39 +87,6 @@ const (
 	ModuleTypeWisdomLighting        //智能感应照明系统-灯随车走照明控制
 )
 
-const (
-	OperationLoginStr            = "登录"
-	OperationLogoutStr           = "注销"
-	OperationCreateStr           = "新增"
-	OperationUpdateStr           = "修改"
-	OperationRemoveStr           = "删除"
-	OperationImportStr           = "导入导出"
-	OperationLightStrategyStr    = "开关灯控策略"
-	OperationOrderCreateStr      = "工单发起"
-	OperationOrderChangeStr      = "工单转派"
-	OperationOrderHandleStr      = "工单处理"
-	OperationProgramPublishStr   = "节目发布待审核"
-	OperationProgramResultStr    = "节目处理结果"
-	OperationStrategyRelationStr = "策略关联"
-	OperationControlStr          = "操作"
-	OperationAlarmHandleStr      = "告警处理"
-	OperationOrderFinishStr      = "工单签收(接单)"
-)
-
-const (
-	ModuleTypeDeviceStr         = "设备台账管理"
-	ModuleTypeInfoBarStr        = "信息发布系统"
-	ModuleTypeOrderStr          = "工单运维"
-	ModuleTypeNotificationStr   = "通知公告"
-	ModuleTypeLightStrategyStr  = "照明策略"
-	ModuleTypeLightingStr       = "智慧照明系统-智能照明"
-	ModuleTypeSystemStr         = "系统管理"
-	ModuleTypeAlarmStr          = "告警管理"
-	ModuleTypeOperationStr      = "运营分析"
-	ModuleTypeRecordStr         = "记录处理"
-	ModuleTypeWisdomLightingStr = "智能感应照明系统-灯随车走照明控制"
-)
-
 type AlarmTerminal struct {
 }
 type CaptureUnit struct {

app/service/operationHisService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"iot_manager_service/app/dao"
+	"iot_manager_service/app/model"
 	"iot_manager_service/app/utils"
 	"strconv"
 	"time"
@@ -29,7 +30,7 @@ func (s *operationHisService) Save(handleType, handleModuleType int, handleConte
 }
 
 func (s *operationHisService) List(handleContent, operationType, moduleType string, current,
-	size int) ([]dao.OperationHis, *utils.Errors) {
+	size int) ([]model.OperationHisDetail, *utils.Errors) {
 	his := dao.OperationHis{
 		HandleContent: handleContent,
 	}
@@ -47,9 +48,23 @@ func (s *operationHisService) List(handleContent, operationType, moduleType stri
 		}
 		his.ModuleType = module
 	}
-	list, err := his.GetHistories(current, size)
+
+	offset := (current - 1) * size
+	limit := size
+	list, err := his.GetHistories(offset, limit)
 	if err != nil {
 		return nil, utils.FailResponse(err.Error(), nil)
 	}
-	return list, nil
+	var details []model.OperationHisDetail
+	for _, his := range list {
+		detail := model.OperationHisDetail{
+			OperationHis: his,
+		}
+		uId, _ := strconv.ParseInt(his.HandleUserId, 10, 64)
+		detail.HandleName = utils.GetUserName(uId)
+		detail.OperationTypeName = utils.GetControlType(his.OperationType)
+		detail.ModuleTypeName = utils.GetModuleName(his.ModuleType)
+		details = append(details, detail)
+	}
+	return details, nil
 }

app/utils/redis.go

@@ -1,8 +1,11 @@
 package utils
 
 import (
+	"fmt"
 	"github.com/go-redis/redis"
+	"iot_manager_service/app/dao"
 	"iot_manager_service/config"
+	"strconv"
 	"time"
 )
 
@@ -25,3 +28,60 @@ func InitRedis() error {
 	}
 	return nil
 }
+
+const (
+	UserKey        = "user_%d"
+	ModuleTypeKey  = "module_type_%d"
+	ControlTypeKey = "control_type_%d"
+
+	ControlType = "control_type"
+	ModuleType  = "module_his_type"
+)
+
+func GetUserName(id int64) string {
+	var name string
+	key := fmt.Sprintf(UserKey, id)
+	name, err := Redis.Get(key).Result()
+	if err != nil {
+		user := &dao.User{ID: id}
+		if err := user.GetUser(); err != nil {
+			fmt.Printf("GetUser err = %s \n", err)
+		} else {
+			name = user.Name
+			Redis.Set(key, name, time.Second*10)
+		}
+	}
+	return name
+}
+
+func GetModuleName(id int) string {
+	var name string
+	key := fmt.Sprintf(ModuleTypeKey, id)
+	name, err := Redis.Get(key).Result()
+	if err != nil {
+		dict := &dao.Dict{Code: ModuleType, DictKey: strconv.Itoa(id)}
+		if err := dict.GetByCodeAndKey(); err != nil {
+			fmt.Printf("GetByCodeAndKey err = %d \n", err)
+		} else {
+			name = dict.DictValue
+			Redis.Set(key, name, -1)
+		}
+	}
+	return name
+}
+
+func GetControlType(id int) string {
+	var name string
+	key := fmt.Sprintf(ControlTypeKey, id)
+	name, err := Redis.Get(key).Result()
+	if err != nil {
+		dict := &dao.Dict{Code: ControlType, DictKey: strconv.Itoa(id)}
+		if err := dict.GetByCodeAndKey(); err != nil {
+			fmt.Printf("GetByCodeAndKey err = %d \n", err)
+		} else {
+			name = dict.DictValue
+			Redis.Set(key, name, -1)
+		}
+	}
+	return name
+}

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/jinzhu/gorm v1.9.16
+	github.com/patrickmn/go-cache v2.1.0+incompatible
 	gopkg.in/yaml.v2 v2.4.0
 )
 

go.sum

@@ -99,6 +99,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
 github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=