diff --git a/admin/src/api/monitor/slow.ts b/admin/src/api/monitor/slow.ts deleted file mode 100644 index 3eb6fe7..0000000 --- a/admin/src/api/monitor/slow.ts +++ /dev/null @@ -1,77 +0,0 @@ -import request from '@/utils/request' -import type { Pages } from '@/utils/request' - -import config from '@/config' -import queryString from 'query-string' -import { getToken } from '@/utils/auth' -import { clearEmpty } from '@/utils/util' - -export type type_monitor_slow = { - Id?: number - ProjectKey?: string - ClientId?: string - UserId?: string - Path?: string - Time?: number - CreateTime?: string -} -// 查询 -export type type_monitor_slow_query = { - ProjectKey?: string - ClientId?: string - UserId?: string - Path?: string - Time?: number - CreateTimeStart?: string - CreateTimeEnd?: string -} -// 添加编辑 -export type type_monitor_slow_edit = { - Id?: number - ProjectKey?: string - ClientId?: string - UserId?: string - Path?: string - Time?: number -} - -// 监控-错误列列表 -export function monitor_slow_list(params?: type_monitor_slow_query) { - return request.get>({ url: '/monitor_slow/list', params: clearEmpty(params) }) -} -// 监控-错误列列表-所有 -export function monitor_slow_list_all(params?: type_monitor_slow_query) { - return request.get({ url: '/monitor_slow/listAll', params: clearEmpty(params) }) -} - -// 监控-错误列详情 -export function monitor_slow_detail(Id: number | string) { - return request.get({ url: '/monitor_slow/detail', params: { Id } }) -} - -// 监控-错误列新增 -export function monitor_slow_add(data: type_monitor_slow_edit) { - return request.post({ url: '/monitor_slow/add', data }) -} - -// 监控-错误列编辑 -export function monitor_slow_edit(data: type_monitor_slow_edit) { - return request.post({ url: '/monitor_slow/edit', data }) -} - -// 监控-错误列删除 -export function monitor_slow_delete(Id: number | string) { - return request.post({ url: '/monitor_slow/del', data: { Id } }) -} -// 监控-错误列删除-批量 -export function monitor_slow_delete_batch(data: { Ids: string }) { - return request.post({ url: '/monitor_slow/delBatch', data }) -} - -// 监控-错误列导入 -export const monitor_slow_import_file = '/monitor_slow/ImportFile' - -// 监控-错误列导出 -export function monitor_slow_export_file(params: any) { - return (window.location.href =`${config.baseUrl}${config.urlPrefix}/monitor_slow/ExportFile?token=${getToken()}&` + queryString.stringify(clearEmpty(params))) -} diff --git a/admin/src/api/setting/dict.ts b/admin/src/api/setting/dict.ts index 10f0690..7f08ae6 100644 --- a/admin/src/api/setting/dict.ts +++ b/admin/src/api/setting/dict.ts @@ -25,13 +25,6 @@ export function dictTypeDelete(data: any) { return request.post({ url: '/setting/dict/type/del', data }) } -// 字典数据列表 -// export function dictDataLists(params: any) { -// return request.get( -// { url: '/setting/dict/data/list', params }, -// ) -// } - // 字典数据列表 export function dictDataAll(params: any) { return request.get({ url: '/setting/dict/data/all', params }) diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue index caf57c7..c30c0ec 100644 --- a/admin/src/layout/default/components/header/index.vue +++ b/admin/src/layout/default/components/header/index.vue @@ -61,7 +61,7 @@ const settingStore = useSettingStore() display: flex; justify-content: center; align-items: center; - background-color: var(--el-bg-color-page); + // background-color: var(--el-bg-color-page); } } diff --git a/admin/src/views/monitor/slow/edit.vue b/admin/src/views/monitor/slow/edit.vue deleted file mode 100644 index 1a50708..0000000 --- a/admin/src/views/monitor/slow/edit.vue +++ /dev/null @@ -1,158 +0,0 @@ - - diff --git a/admin/src/views/monitor/slow/index.vue b/admin/src/views/monitor/slow/index.vue deleted file mode 100644 index e670794..0000000 --- a/admin/src/views/monitor/slow/index.vue +++ /dev/null @@ -1,202 +0,0 @@ - - diff --git a/server/admin/monitor_slow/monitor_slow_ctl.go b/server/admin/monitor_slow/monitor_slow_ctl.go deleted file mode 100644 index 42fa9dc..0000000 --- a/server/admin/monitor_slow/monitor_slow_ctl.go +++ /dev/null @@ -1,220 +0,0 @@ -package monitor_slow - -import ( - "encoding/json" - "net/http" - "net/url" - "strconv" - "strings" - "time" - "x_admin/core/request" - "x_admin/core/response" - "x_admin/util" - "x_admin/util/excel2" - "x_admin/util/img_util" - - "github.com/gin-gonic/gin" - "golang.org/x/sync/singleflight" -) - -type MonitorSlowHandler struct { - requestGroup singleflight.Group -} - -// @Summary 监控-错误列列表 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Param Token header string true "token" -// @Param PageNo query int true "页码" -// @Param PageSize query int true "每页数量" -// @Param ProjectKey query string false "项目key" -// @Param ClientId query string false "sdk生成的客户端id" -// @Param UserId query string false "用户id" -// @Param Path query string false "URL地址" -// @Param Time query number false "时间" -// @Param CreateTimeStart query string false "创建时间" -// @Param CreateTimeEnd query string false "创建时间" -// -// @Success 200 {object} response.Response{ data=response.PageResp{ lists=[]MonitorSlowResp}} "成功" -// @Router /api/admin/monitor_slow/list [get] -func (hd *MonitorSlowHandler) List(c *gin.Context) { - var page request.PageReq - var listReq MonitorSlowListReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { - return - } - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { - return - } - res, err := MonitorSlowService.List(page, listReq) - response.CheckAndRespWithData(c, res, err) -} - -// @Summary 监控-错误列列表-所有 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Param ProjectKey query string false "项目key" -// @Param ClientId query string false "sdk生成的客户端id" -// @Param UserId query string false "用户id" -// @Param Path query string false "URL地址" -// @Param Time query number false "时间" -// @Param CreateTimeStart query string false "创建时间" -// @Param CreateTimeEnd query string false "创建时间" -// @Success 200 {object} response.Response{ data=[]MonitorSlowResp} "成功" -// @Router /api/admin/monitor_slow/listAll [get] -func (hd *MonitorSlowHandler) ListAll(c *gin.Context) { - var listReq MonitorSlowListReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { - return - } - res, err := MonitorSlowService.ListAll(listReq) - response.CheckAndRespWithData(c, res, err) -} - -// @Summary 监控-错误列详情 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Param Token header string true "token" -// @Param Id query number false "错误id" -// @Success 200 {object} response.Response{ data=MonitorSlowResp} "成功" -// @Router /api/admin/monitor_slow/detail [get] -func (hd *MonitorSlowHandler) Detail(c *gin.Context) { - var detailReq MonitorSlowDetailReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { - return - } - res, err, _ := hd.requestGroup.Do("MonitorSlow:Detail:"+strconv.Itoa(detailReq.Id), func() (any, error) { - v, err := MonitorSlowService.Detail(detailReq.Id) - return v, err - }) - - response.CheckAndRespWithData(c, res, err) -} - -// @Summary 监控-错误列新增 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Success 200 {object} response.Response "成功" -// @Router /api/admin/monitor_slow/add [get] -func (hd *MonitorSlowHandler) Add(c *gin.Context) { - data, err := url.QueryUnescape(c.Query("data")) - if err != nil { - c.Data(200, "image/gif", img_util.EmptyGif()) - return - } - - var addReq MonitorSlowAddReq - json.Unmarshal([]byte(data), &addReq) - - MonitorSlowService.Add(addReq) - c.Data(200, "image/gif", img_util.EmptyGif()) -} - -// @Summary 监控-错误列编辑 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Param Token header string true "token" -// @Param Id body number false "错误id" -// @Param ProjectKey body string false "项目key" -// @Param ClientId body string false "sdk生成的客户端id" -// @Param UserId body string false "用户id" -// @Param Path body string false "URL地址" -// @Param Time body number false "时间" -// @Success 200 {object} response.Response "成功" -// @Router /api/admin/monitor_slow/edit [post] -func (hd *MonitorSlowHandler) Edit(c *gin.Context) { - var editReq MonitorSlowEditReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) { - return - } - response.CheckAndRespWithData(c, editReq.Id, MonitorSlowService.Edit(editReq)) -} - -// @Summary 监控-错误列删除 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Param Token header string true "token" -// @Param Id body number false "错误id" -// @Success 200 {object} response.Response "成功" -// @Router /api/admin/monitor_slow/del [post] -func (hd *MonitorSlowHandler) Del(c *gin.Context) { - var delReq MonitorSlowDelReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { - return - } - response.CheckAndResp(c, MonitorSlowService.Del(delReq.Id)) -} - -// @Summary 监控-错误列删除-批量 -// @Tags monitor_slow-监控-错误列 -// -// @Produce json -// @Param Token header string true "token" -// @Param Ids body string false "逗号分割的id" -// @Success 200 {object} response.Response "成功" -// @Router /api/admin/monitor_slow/delBatch [post] -func (hd *MonitorSlowHandler) DelBatch(c *gin.Context) { - var delReq MonitorSlowDelBatchReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { - return - } - if delReq.Ids == "" { - response.FailWithMsg(c, response.SystemError, "请选择要删除的数据") - return - } - var Ids = strings.Split(delReq.Ids, ",") - - response.CheckAndResp(c, MonitorSlowService.DelBatch(Ids)) -} - -// @Summary 监控-错误列导出 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Param Token header string true "token" -// @Param ProjectKey query string false "项目key" -// @Param ClientId query string false "sdk生成的客户端id" -// @Param UserId query string false "用户id" -// @Param Path query string false "URL地址" -// @Param Time query number false "时间" -// @Param CreateTimeStart query string false "创建时间" -// @Param CreateTimeEnd query string false "创建时间" -// @Router /api/admin/monitor_slow/ExportFile [get] -func (hd *MonitorSlowHandler) ExportFile(c *gin.Context) { - var listReq MonitorSlowListReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { - return - } - res, err := MonitorSlowService.ExportFile(listReq) - if err != nil { - response.FailWithMsg(c, response.SystemError, "查询信息失败") - return - } - f, err := excel2.Export(res, MonitorSlowService.GetExcelCol(), "Sheet1", "监控-错误列") - if err != nil { - response.FailWithMsg(c, response.SystemError, "导出失败") - return - } - excel2.DownLoadExcel("监控-错误列"+time.Now().Format("20060102-150405"), c.Writer, f) -} - -// @Summary 监控-错误列导入 -// @Tags monitor_slow-监控-错误列 -// @Produce json -// @Router /api/admin/monitor_slow/ImportFile [post] -func (hd *MonitorSlowHandler) ImportFile(c *gin.Context) { - file, _, err := c.Request.FormFile("file") - if err != nil { - c.String(http.StatusInternalServerError, "文件不存在") - return - } - defer file.Close() - importList := []MonitorSlowResp{} - err = excel2.GetExcelData(file, &importList, MonitorSlowService.GetExcelCol()) - if err != nil { - c.String(http.StatusInternalServerError, err.Error()) - return - } - - err = MonitorSlowService.ImportFile(importList) - response.CheckAndResp(c, err) -} diff --git a/server/admin/monitor_slow/monitor_slow_schema.go b/server/admin/monitor_slow/monitor_slow_schema.go deleted file mode 100644 index 3fc13c9..0000000 --- a/server/admin/monitor_slow/monitor_slow_schema.go +++ /dev/null @@ -1,61 +0,0 @@ -package monitor_slow - -import ( - "x_admin/core" -) - -// MonitorSlowListReq 监控-错误列列表参数 -type MonitorSlowListReq struct { - ProjectKey *string // 项目key - ClientId *string // sdk生成的客户端id - UserId *string // 用户id - Path *string // URL地址 - Time *float64 // 时间 - CreateTimeStart *string // 开始创建时间 - CreateTimeEnd *string // 结束创建时间 -} - -// MonitorSlowAddReq 监控-错误列新增参数 -type MonitorSlowAddReq struct { - ProjectKey *string // 项目key - ClientId *string // sdk生成的客户端id - UserId *string // 用户id - Path *string // URL地址 - Time core.NullFloat // 时间 -} - -// MonitorSlowEditReq 监控-错误列编辑参数 -type MonitorSlowEditReq struct { - Id int // 错误id - ProjectKey *string // 项目key - ClientId *string // sdk生成的客户端id - UserId *string // 用户id - Path *string // URL地址 - Time core.NullFloat // 时间 -} - -// MonitorSlowDetailReq 监控-错误列详情参数 -type MonitorSlowDetailReq struct { - Id int // 错误id -} - -// MonitorSlowDelReq 监控-错误列删除参数 -type MonitorSlowDelReq struct { - Id int // 错误id -} - -// MonitorSlowDelReq 监控-错误列批量删除参数 -type MonitorSlowDelBatchReq struct { - Ids string -} - -// MonitorSlowResp 监控-错误列返回信息 -type MonitorSlowResp struct { - Id int // 错误id - ProjectKey string // 项目key - ClientId string // sdk生成的客户端id - UserId string // 用户id - Path string // URL地址 - Time core.NullFloat // 时间 - CreateTime core.NullTime // 创建时间 -} diff --git a/server/admin/monitor_slow/monitor_slow_service.go b/server/admin/monitor_slow/monitor_slow_service.go deleted file mode 100644 index c6467dc..0000000 --- a/server/admin/monitor_slow/monitor_slow_service.go +++ /dev/null @@ -1,226 +0,0 @@ -package monitor_slow - -import ( - "x_admin/core" - "x_admin/core/request" - "x_admin/core/response" - "x_admin/model" - "x_admin/util" - "x_admin/util/convert_util" - "x_admin/util/excel2" - - "gorm.io/gorm" -) - -var MonitorSlowService = NewMonitorSlowService() -var cacheUtil = util.CacheUtil{ - Name: MonitorSlowService.Name, -} - -// NewMonitorSlowService 初始化 -func NewMonitorSlowService() *monitorSlowService { - return &monitorSlowService{ - db: core.GetDB(), - Name: "monitorSlow", - } -} - -// monitorSlowService 监控-错误列服务实现类 -type monitorSlowService struct { - db *gorm.DB - Name string -} - -// List 监控-错误列列表 -func (service monitorSlowService) GetModel(listReq MonitorSlowListReq) *gorm.DB { - // 查询 - dbModel := service.db.Model(&model.MonitorSlow{}) - if listReq.ProjectKey != nil { - dbModel = dbModel.Where("project_key = ?", *listReq.ProjectKey) - } - if listReq.ClientId != nil { - dbModel = dbModel.Where("client_id = ?", *listReq.ClientId) - } - if listReq.UserId != nil { - dbModel = dbModel.Where("user_id = ?", *listReq.UserId) - } - if listReq.Path != nil { - dbModel = dbModel.Where("path = ?", *listReq.Path) - } - if listReq.Time != nil { - dbModel = dbModel.Where("time = ?", *listReq.Time) - } - if listReq.CreateTimeStart != nil { - dbModel = dbModel.Where("create_time >= ?", *listReq.CreateTimeStart) - } - if listReq.CreateTimeEnd != nil { - dbModel = dbModel.Where("create_time <= ?", *listReq.CreateTimeEnd) - } - return dbModel -} - -// List 监控-错误列列表 -func (service monitorSlowService) List(page request.PageReq, listReq MonitorSlowListReq) (res response.PageResp, e error) { - // 分页信息 - limit := page.PageSize - offset := page.PageSize * (page.PageNo - 1) - dbModel := service.GetModel(listReq) - // 总数 - var count int64 - err := dbModel.Count(&count).Error - if e = response.CheckErr(err, "失败"); e != nil { - return - } - // 数据 - var modelList []model.MonitorSlow - err = dbModel.Limit(limit).Offset(offset).Order("id desc").Find(&modelList).Error - if e = response.CheckErr(err, "查询失败"); e != nil { - return - } - result := []MonitorSlowResp{} - convert_util.Copy(&result, modelList) - return response.PageResp{ - PageNo: page.PageNo, - PageSize: page.PageSize, - Count: count, - Lists: result, - }, nil -} - -// ListAll 监控-错误列列表 -func (service monitorSlowService) ListAll(listReq MonitorSlowListReq) (res []MonitorSlowResp, e error) { - dbModel := service.GetModel(listReq) - - var modelList []model.MonitorSlow - - err := dbModel.Find(&modelList).Error - if e = response.CheckErr(err, "查询全部失败"); e != nil { - return - } - convert_util.Copy(&res, modelList) - return res, nil -} - -// Detail 监控-错误列详情 -func (service monitorSlowService) Detail(Id int) (res MonitorSlowResp, e error) { - var obj = model.MonitorSlow{} - err := cacheUtil.GetCache(Id, &obj) - if err != nil { - err := service.db.Where("id = ?", Id).Limit(1).First(&obj).Error - if e = response.CheckErrDBNotRecord(err, "数据不存在!"); e != nil { - return - } - if e = response.CheckErr(err, "获取详情失败"); e != nil { - return - } - cacheUtil.SetCache(obj.Id, obj) - } - - convert_util.Copy(&res, obj) - return -} - -// Add 监控-错误列新增 -func (service monitorSlowService) Add(addReq MonitorSlowAddReq) (createId int, e error) { - var obj model.MonitorSlow - convert_util.StructToStruct(addReq, &obj) - err := service.db.Create(&obj).Error - e = response.CheckMysqlErr(err) - if e != nil { - return 0, e - } - cacheUtil.SetCache(obj.Id, obj) - createId = obj.Id - return -} - -// Edit 监控-错误列编辑 -func (service monitorSlowService) Edit(editReq MonitorSlowEditReq) (e error) { - var obj model.MonitorSlow - err := service.db.Where("id = ?", editReq.Id).Limit(1).First(&obj).Error - // 校验 - if e = response.CheckErrDBNotRecord(err, "数据不存在!"); e != nil { - return - } - if e = response.CheckErr(err, "查询失败"); e != nil { - return - } - convert_util.Copy(&obj, editReq) - - err = service.db.Model(&obj).Select("*").Updates(obj).Error - if e = response.CheckErr(err, "编辑失败"); e != nil { - return - } - cacheUtil.RemoveCache(obj.Id) - service.Detail(obj.Id) - return -} - -// Del 监控-错误列删除 -func (service monitorSlowService) Del(Id int) (e error) { - var obj model.MonitorSlow - err := service.db.Where("id = ?", Id).Limit(1).First(&obj).Error - // 校验 - if e = response.CheckErrDBNotRecord(err, "数据不存在!"); e != nil { - return - } - if e = response.CheckErr(err, "查询数据失败"); e != nil { - return - } - // 删除 - err = service.db.Delete(&obj).Error - e = response.CheckErr(err, "删除失败") - cacheUtil.RemoveCache(obj.Id) - return -} - -// DelBatch 用户协议-批量删除 -func (service monitorSlowService) DelBatch(Ids []string) (e error) { - var obj model.MonitorSlow - err := service.db.Where("id in (?)", Ids).Delete(&obj).Error - if err != nil { - return err - } - // 删除缓存 - cacheUtil.RemoveCache(Ids) - return nil -} - -// 获取Excel的列 -func (service monitorSlowService) GetExcelCol() []excel2.Col { - var cols = []excel2.Col{ - {Name: "项目key", Key: "ProjectKey", Width: 15}, - {Name: "sdk生成的客户端id", Key: "ClientId", Width: 15}, - {Name: "用户id", Key: "UserId", Width: 15}, - {Name: "URL地址", Key: "Path", Width: 15}, - {Name: "时间", Key: "Time", Width: 15}, - {Name: "创建时间", Key: "CreateTime", Width: 15, Decode: util.NullTimeUtil.DecodeTime}, - } - // 还可以考虑字典,请求下来加上 Replace 实现替换导出 - return cols -} - -// ExportFile 监控-错误列导出 -func (service monitorSlowService) ExportFile(listReq MonitorSlowListReq) (res []MonitorSlowResp, e error) { - // 查询 - dbModel := service.GetModel(listReq) - - // 数据 - var modelList []model.MonitorSlow - err := dbModel.Order("id asc").Find(&modelList).Error - if e = response.CheckErr(err, "查询失败"); e != nil { - return - } - result := []MonitorSlowResp{} - convert_util.Copy(&result, modelList) - return result, nil -} - -// 导入 -func (service monitorSlowService) ImportFile(importReq []MonitorSlowResp) (e error) { - var importData []model.MonitorSlow - convert_util.Copy(&importData, importReq) - err := service.db.Create(&importData).Error - e = response.CheckErr(err, "添加失败") - return e -} diff --git a/server/admin/setting/dict_data/dict_data.go b/server/admin/setting/dict_data/dict_data.go index d73ff3f..5e112ed 100644 --- a/server/admin/setting/dict_data/dict_data.go +++ b/server/admin/setting/dict_data/dict_data.go @@ -1,7 +1,6 @@ package dict_data import ( - "x_admin/core/request" "x_admin/core/response" "x_admin/middleware" "x_admin/util" @@ -22,7 +21,6 @@ func DictDataRoute(rg *gin.RouterGroup) { rg = rg.Group("/setting", middleware.TokenAuth()) rg.GET("/dict/data/all", handle.All) - rg.GET("/dict/data/list", handle.List) rg.GET("/dict/data/detail", handle.Detail) rg.POST("/dict/data/add", handle.Add) rg.POST("/dict/data/edit", handle.Edit) @@ -41,20 +39,6 @@ func (ddh dictDataHandler) All(c *gin.Context) { response.CheckAndRespWithData(c, res, err) } -// list 字典数据列表 -func (ddh dictDataHandler) List(c *gin.Context) { - var page request.PageReq - var listReq SettingDictDataListReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { - return - } - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { - return - } - res, err := Service.List(page, listReq) - response.CheckAndRespWithData(c, res, err) -} - // detail 字典数据详情 func (ddh dictDataHandler) Detail(c *gin.Context) { var detailReq SettingDictDataDetailReq diff --git a/server/admin/setting/dict_data/service.go b/server/admin/setting/dict_data/service.go index 6377e97..5b649e0 100644 --- a/server/admin/setting/dict_data/service.go +++ b/server/admin/setting/dict_data/service.go @@ -2,7 +2,6 @@ package dict_data import ( "x_admin/core" - "x_admin/core/request" "x_admin/core/response" "x_admin/model/setting_model" "x_admin/util" @@ -13,7 +12,7 @@ import ( type ISettingDictDataService interface { All(allReq SettingDictDataListReq) (res []SettingDictDataResp, e error) - List(page request.PageReq, listReq SettingDictDataListReq) (res response.PageResp, e error) + // List(page request.PageReq, listReq SettingDictDataListReq) (res response.PageResp, e error) Detail(id uint) (res SettingDictDataResp, e error) Add(addReq SettingDictDataAddReq) (e error) Edit(editReq SettingDictDataEditReq) (e error) @@ -63,48 +62,6 @@ func (ddSrv settingDictDataService) All(allReq SettingDictDataListReq) (res []Se return } -// List 字典数据列表 -func (ddSrv settingDictDataService) List(page request.PageReq, listReq SettingDictDataListReq) (res response.PageResp, e error) { - limit := page.PageSize - offset := page.PageSize * (page.PageNo - 1) - var dictType setting_model.DictType - err := ddSrv.db.Where("dict_type = ? AND is_delete = ?", listReq.DictType, 0).Limit(1).First(&dictType).Error - if e = response.CheckErrDBNotRecord(err, "该字典类型不存在!"); e != nil { - return - } - if e = response.CheckErr(err, "List First err"); e != nil { - return - } - ddModel := ddSrv.db.Model(&setting_model.DictData{}).Where("type_id = ? AND is_delete = ?", dictType.ID, 0) - if listReq.Name != "" { - ddModel = ddModel.Where("name like ?", "%"+listReq.Name+"%") - } - if listReq.Value != "" { - ddModel = ddModel.Where("value like ?", "%"+listReq.Value+"%") - } - if listReq.Status >= 0 { - ddModel = ddModel.Where("status = ?", listReq.Status) - } - var count int64 - e = ddModel.Count(&count).Error - if e = response.CheckErr(e, "列表总数获取失败"); e != nil { - return - } - var dds []setting_model.DictData - err = ddModel.Limit(limit).Offset(offset).Order("id asc").Find(&dds).Error - if e = response.CheckErr(err, "列表获取失败"); e != nil { - return - } - dtResp := []SettingDictDataResp{} - convert_util.Copy(&dtResp, dds) - return response.PageResp{ - PageNo: page.PageNo, - PageSize: page.PageSize, - Count: count, - Lists: dtResp, - }, nil -} - // Detail 字典数据详情 func (ddSrv settingDictDataService) Detail(id uint) (res SettingDictDataResp, e error) { var dd setting_model.DictData diff --git a/server/router/admin/entry.go b/server/router/admin/entry.go index 3e8da09..6245a0e 100644 --- a/server/router/admin/entry.go +++ b/server/router/admin/entry.go @@ -60,7 +60,6 @@ func RegisterGroup(rg *gin.RouterGroup) { MonitorProjectRoute(rg) MonitorClientRoute(rg) MonitorErrorRoute(rg) - MonitorSlowRoute(rg) UserProtocolRoute(rg) } diff --git a/server/router/admin/monitor_slow_route.go b/server/router/admin/monitor_slow_route.go deleted file mode 100644 index 6a17d9c..0000000 --- a/server/router/admin/monitor_slow_route.go +++ /dev/null @@ -1,59 +0,0 @@ -package admin - -import ( - "x_admin/admin/monitor_slow" - "x_admin/middleware" - - "github.com/gin-gonic/gin" -) - -/** -集成 -1. 导入 -- 请先提交git避免文件覆盖!!! -- 下载并解压压缩包后,直接复制server、admin文件夹到项目根目录即可 - -2. 注册路由 -请在 router/admin/entry.go 文件引入 MonitorSlowRoute 注册路由 - -3. 后台手动添加菜单和按钮 -admin:monitor_slow:add -admin:monitor_slow:edit -admin:monitor_slow:del -admin:monitor_slow:delBatch -admin:monitor_slow:list -admin:monitor_slow:listAll -admin:monitor_slow:detail -admin:monitor_slow:ExportFile -admin:monitor_slow:ImportFile - -// 列表-先添加菜单获取菜单id -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, paths, component, is_cache, is_show, is_disable, create_time, update_time) VALUES (0, 'C', '慢接口', 'monitor/slow/index', 'monitor/slow/index', 0, 1, 0, now(), now()); -按钮-替换pid参数为菜单id - -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口添加','admin:monitor_slow:add', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口编辑','admin:monitor_slow:edit', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口删除','admin:monitor_slow:del', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口删除-批量','admin:monitor_slow:delBatch', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口列表','admin:monitor_slow:list', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口全部列表','admin:monitor_slow:listAll', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口详情','admin:monitor_slow:detail', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口导出excel','admin:monitor_slow:ExportFile', 0, 1, 0, now(), now()); -INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) VALUES (834, 'A', '慢接口导入excel','admin:monitor_slow:ImportFile', 0, 1, 0, now(), now()); -*/ - -// MonitorSlowRoute(rg) -func MonitorSlowRoute(rg *gin.RouterGroup) { - handle := monitor_slow.MonitorSlowHandler{} - rg.GET("/monitor_slow/add", middleware.RecordLog("慢接口新增"), handle.Add) - r := rg.Group("/", middleware.TokenAuth()) - r.GET("/monitor_slow/list", handle.List) - r.GET("/monitor_slow/listAll", handle.ListAll) - r.GET("/monitor_slow/detail", handle.Detail) - - r.POST("/monitor_slow/del", middleware.RecordLog("慢接口删除"), handle.Del) - r.POST("/monitor_slow/delBatch", middleware.RecordLog("慢接口删除-批量"), handle.DelBatch) - - r.GET("/monitor_slow/ExportFile", middleware.RecordLog("慢接口导出"), handle.ExportFile) - // r.POST("/monitor_slow/ImportFile", handle.ImportFile) -}