操作记录、用户和字典

app/controller/handleHistoryController.go

@@ -0,0 +1,35 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/service"
+	"iot_manager_service/app/utils"
+	"net/http"
+	"strconv"
+)
+
+// 一键报警服务表管理对象
+var HandleHistory = new(handleHistoryCtl)
+
+type handleHistoryCtl struct{}
+
+func (c *handleHistoryCtl) List(ctx *gin.Context) {
+	handleContent := ctx.Query("handleContent")
+	operationType := ctx.Query("operationType")
+	moduleType := ctx.Query("moduleType")
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+	_, 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))
+}

app/controller/lampPoleGroupController.go

@@ -80,7 +80,7 @@ func (c *lampPoleGroupCtl) Remove(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
-	err := service.LampPoleGroupService.Remove(req.IDs)
+	err := service.LampPoleGroupService.Remove(req.IDs, req.Name)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/dao/common.go

@@ -22,6 +22,8 @@ func InitDB() {
 		GDb.DB().SetMaxIdleConns(5)
 		GDb.LogMode(false)
 		err = GDb.AutoMigrate(
+			&User{},
+			&Dict{},
 			&LampPoleGroup{},
 			&LampPole{},
 			&Gateway{},

app/dao/dict.go

@@ -0,0 +1,18 @@
+package dao
+
+// User 字典
+type Dict struct {
+	ID        int64  `gorm:"primary_key" json:"id"`                 //主键
+	ParentId  int64  `gorm:"type:bigint;default 0" json:"parentId"` //父主键
+	Code      string `gorm:"type:varchar(255)" json:"code"`         //字典码
+	DictKey   string `gorm:"type:varchar(255)" json:"dictKey"`      //字典值
+	DictValue string `gorm:"type:varchar(255)" json:"dictValue"`    //字典名称
+	Sort      int    `gorm:"type:int" json:"sort"`                  //排序
+	Remark    string `gorm:"type:varchar(255)" json:"remark"`       //字典备注
+	IsSealed  int    `gorm:"type:int;default 0" json:"isSealed"`    //是否已封存
+	IsDeleted int    `gorm:"type:int;default 0" json:"isDeleted"`   //是否已删除
+}
+
+func (Dict) TableName() string {
+	return "dict"
+}

app/dao/operationHisDao.go

@@ -18,3 +18,25 @@ type OperationHis struct {
 func (OperationHis) TableName() string {
 	return "t_sys_handle_his"
 }
+
+func (c *OperationHis) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c OperationHis) GetHistories(offset, limit int) ([]OperationHis, error) {
+	var list []OperationHis
+
+	db := GDb.Model(&c)
+	if c.OperationType != 0 {
+		db = db.Where("operation_type = ?", c.OperationType)
+	}
+	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
+	return list, err
+}

app/dao/user.go

@@ -0,0 +1,43 @@
+package dao
+
+import (
+	"time"
+)
+
+// User 用户
+type User struct {
+	ID                      int       `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"`                   //账号
+	Password                string    `gorm:"type:varchar(12)" json:"password"`                  //密码
+	Name                    string    `gorm:"type:varchar(12)" json:"name"`                      //昵称
+	RealName                string    `gorm:"type:varchar(12)" json:"real_name"`                 //真名
+	Avatar                  string    `gorm:"type:varchar(12)" json:"avatar"`                    //头像
+	Email                   string    `gorm:"type:varchar(12)" json:"email"`                     //邮箱
+	Phone                   string    `gorm:"type:varchar(12)" json:"phone"`                     //手机
+	Birthday                string    `gorm:"type:datetime" json:"birthday"`                     //生日
+	Sex                     int       `gorm:"type:smallint" json:"sex"`                          //生日
+	RoleId                  string    `gorm:"type:varchar(1000)" json:"role_id"`                 //角色id
+	DeptId                  string    `gorm:"type:varchar(1000)" json:"dept_id"`                 //部门id
+	PostId                  string    `gorm:"type:varchar(1000)" json:"post_id"`                 //岗位id
+	CreateUser              int64     `gorm:"type:bigint" json:"createUser"`                     //创建人
+	CreateDept              int64     `gorm:"type:bigint" json:"createDept"`                     //创建部门
+	CreateTime              time.Time `gorm:"type:datetime" json:"createTime"`                   //新增时间
+	UpdateUser              int64     `gorm:"type:bigint" json:"updateUser"`                     //修改人
+	UpdateTime              time.Time `gorm:"type:datetime" json:"updateTime"`                   //修改时间
+	Status                  int       `gorm:"type:int  " json:"status"`                          //状态
+	IsDeleted               int       `gorm:"type:int" json:"isDeleted"`                         //是否删除 0=未删除,1=删除
+	GroupId                 int       `gorm:"type:int" json:"groupId"`                           //用户分组id
+	BigScreenIndexCameraIds string    `gorm:"type:varchar(255)" json:"bigScreenIndexCameraIds"`  //数据大屏中摄像头保存位置
+	SecuritySixScreen       string    `gorm:"type:varchar(255)" json:"security_six_screen"`      //安防页面六分屏
+}
+
+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
+}

app/model/common.go

@@ -87,6 +87,39 @@ 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/model/lampPoleGroup.go

@@ -22,5 +22,6 @@ type RspLampPoleGroupList struct {
 }
 
 type ReqLampPoleGroupRemove struct {
-	IDs int `json:"ids"` //分组编码
+	IDs  int    `json:"ids"`  //分组编码
+	Name string `json:"name"` //分组名
 }

app/service/lampPoleGroupService.go

@@ -5,6 +5,7 @@ import (
 	"iot_manager_service/app/dao"
 	"iot_manager_service/app/model"
 	"iot_manager_service/app/utils"
+	"strings"
 	"time"
 )
 
@@ -26,6 +27,8 @@ func (s *lampPoleGroupService) Get(id int) (*dao.LampPoleGroup, *utils.Errors) {
 }
 
 func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Errors {
+	var build strings.Builder
+
 	device := req
 	if device.TenantId == "" {
 		device.TenantId = "000000" // todo: 使用登录态
@@ -36,15 +39,19 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 	if req.ID == 0 {
 		device.CreateTime = time.Now()
 		device.CreateUser = "TODO" // todo: 使用登录态
-
+		build.WriteString("新增(灯杆分组)【" + device.PoleGroupName + "】")
 		if device.IsExistedByName() {
 			fmt.Printf("Create IsExistedByName \n")
 			return utils.ParamsInvalidResponse(model.RepeatedName, nil)
 		}
 		if err := device.Create(); err != nil {
 			fmt.Printf("Create err = %s \n", err.Error())
+			build.WriteString("失败")
+			OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 			return utils.FailResponse(err.Error(), nil)
 		}
+		build.WriteString("成功")
+		OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 		return utils.SuccessResponse(utils.Succeeded, nil)
 	}
 
@@ -53,10 +60,18 @@ func (s *lampPoleGroupService) CreateOrUpdate(req *dao.LampPoleGroup) *utils.Err
 		return utils.ParamsInvalidResponse(model.RepeatedName, nil)
 	}
 
+	build.WriteString("修改(灯杆分组)【" + device.PoleGroupName + "】")
 	if err := device.Update(); err != nil {
 		fmt.Printf("Update err = %s \n", err.Error())
+		build.WriteString("失败")
+
+		OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
+
 		return utils.FailResponse(err.Error(), nil)
 	}
+	build.WriteString("成功")
+
+	OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 
 	//todo operation record
 	return utils.SuccessResponse(utils.Succeeded, nil)
@@ -77,8 +92,9 @@ func (s *lampPoleGroupService) List(poleGroupName string, current, size int) ([]
 	return devices, nil
 }
 
-func (s *lampPoleGroupService) Remove(id int) *utils.Errors {
-	// 创建查询实例
+func (s *lampPoleGroupService) Remove(id int, name string) *utils.Errors {
+	var build strings.Builder
+
 	device := &dao.LampPoleGroup{
 		ID:         id,
 		IsDeleted:  1,
@@ -88,13 +104,15 @@ func (s *lampPoleGroupService) Remove(id int) *utils.Errors {
 
 	//todo
 	// service.lampPoleService.CountRelation()
-
-	//todo operation record
+	build.WriteString("删除(灯杆分组)【" + name + "】")
 	err := device.Delete()
 	if err != nil {
+		build.WriteString("失败")
+		OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 		return utils.FailResponse(err.Error(), nil)
 	}
-	OperationHisService.Save()
+	build.WriteString("成功")
+	OperationHisService.Save(model.OperationRemove, model.ModuleTypeDevice, build.String())
 	return nil
 }
 

app/service/operationHisService.go

@@ -1,10 +1,55 @@
 package service
 
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/utils"
+	"strconv"
+	"time"
+)
+
 // 操作记录服务
 var OperationHisService = new(operationHisService)
 
 type operationHisService struct{}
 
-func (s *operationHisService) Save() {
+func (s *operationHisService) Save(handleType, handleModuleType int, handleContent string) {
+	operation := dao.OperationHis{
+		OperationType: handleType,
+		ModuleType:    handleModuleType,
+		HandleContent: handleContent,
+		HandleUserId:  "TODO", //todo 使用登录态
+		HandleTime:    time.Now(),
+		TenantId:      "000000", //todo 使用登录态
+	}
+	err := operation.Create()
+	if err != nil {
+		fmt.Printf("Operation save err =%v \n", err)
+	}
+}
 
+func (s *operationHisService) List(handleContent, operationType, moduleType string, current,
+	size int) ([]dao.OperationHis, *utils.Errors) {
+	his := dao.OperationHis{
+		HandleContent: handleContent,
+	}
+	if operationType != "" {
+		operation, err := strconv.Atoi(operationType)
+		if err != nil {
+			return nil, utils.FailResponse(err.Error(), nil)
+		}
+		his.OperationType = operation
+	}
+	if moduleType != "" {
+		module, err := strconv.Atoi(moduleType)
+		if err != nil {
+			return nil, utils.FailResponse(err.Error(), nil)
+		}
+		his.ModuleType = module
+	}
+	list, err := his.GetHistories(current, size)
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return list, nil
 }

router/router.go

@@ -17,6 +17,12 @@ func InitRouter(engine *gin.Engine) {
 	// 设备管理
 	device := engine.Group("/api/longchi/device/")
 
+	// 设备管理
+	handleHistory := engine.Group("/api/longchi/handlehistory")
+	{
+		handleHistory.GET("/list", controller.HandleHistory.List)
+	}
+
 	//桥梁
 	bridge := device.Group("bridge")
 	{
@@ -94,15 +100,6 @@ func InitRouter(engine *gin.Engine) {
 		garbageWayGroup.GET("/getList", controller.GarbageWay.GetList)
 	}
 
-	//灯随车走灯杆关联分组 控制器
-	groupRelevanceLampPole := device.Group("group-relevance-lamppole")
-	{
-		groupRelevanceLampPole.GET("/detail", controller.GroupRelevanceLampPole.Detail)
-		groupRelevanceLampPole.GET("/list", controller.GroupRelevanceLampPole.List)
-		groupRelevanceLampPole.POST("/setting", controller.GroupRelevanceLampPole.Setting)
-		groupRelevanceLampPole.POST("/remove", controller.GroupRelevanceLampPole.Remove)
-	}
-
 	//信息屏基本信息 控制器
 	infoBoard := device.Group("infoboard")
 	{