From 73500ba39fdc8712910305d8d5870356a250e852 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 17 Nov 2023 17:40:16 +0800 Subject: [PATCH] =?UTF-8?q?del:=20=E5=88=A0=E9=99=A4=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/system/controller/sys_notice.go | 127 -------- src/modules/system/repository/sys_notice.go | 24 -- .../system/repository/sys_notice.impl.go | 297 ------------------ src/modules/system/service/sys_notice.go | 24 -- src/modules/system/service/sys_notice.impl.go | 73 ----- src/modules/system/system.go | 28 -- 6 files changed, 573 deletions(-) delete mode 100644 src/modules/system/controller/sys_notice.go delete mode 100644 src/modules/system/repository/sys_notice.go delete mode 100644 src/modules/system/repository/sys_notice.impl.go delete mode 100644 src/modules/system/service/sys_notice.go delete mode 100644 src/modules/system/service/sys_notice.impl.go diff --git a/src/modules/system/controller/sys_notice.go b/src/modules/system/controller/sys_notice.go deleted file mode 100644 index 00d02664..00000000 --- a/src/modules/system/controller/sys_notice.go +++ /dev/null @@ -1,127 +0,0 @@ -package controller - -import ( - "fmt" - "strings" - - "ems.agt/src/framework/utils/ctx" - "ems.agt/src/framework/utils/parse" - "ems.agt/src/framework/vo/result" - "ems.agt/src/modules/system/model" - "ems.agt/src/modules/system/service" - - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" -) - -// 实例化控制层 SysNoticeController 结构体 -var NewSysNotice = &SysNoticeController{ - sysNoticeService: service.NewSysNoticeImpl, -} - -// 通知公告信息 -// -// PATH /system/notice -type SysNoticeController struct { - // 公告服务 - sysNoticeService service.ISysNotice -} - -// 通知公告列表 -// -// GET /list -func (s *SysNoticeController) List(c *gin.Context) { - querys := ctx.QueryMap(c) - data := s.sysNoticeService.SelectNoticePage(querys) - c.JSON(200, result.Ok(data)) -} - -// 通知公告信息 -// -// GET /:noticeId -func (s *SysNoticeController) Info(c *gin.Context) { - noticeId := c.Param("noticeId") - if noticeId == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) - return - } - data := s.sysNoticeService.SelectNoticeById(noticeId) - if data.NoticeID == noticeId { - c.JSON(200, result.OkData(data)) - return - } - c.JSON(200, result.Err(nil)) -} - -// 通知公告新增 -// -// POST / -func (s *SysNoticeController) Add(c *gin.Context) { - var body model.SysNotice - err := c.ShouldBindBodyWith(&body, binding.JSON) - if err != nil || body.NoticeID != "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) - return - } - - body.CreateBy = ctx.LoginUserToUserName(c) - insertId := s.sysNoticeService.InsertNotice(body) - if insertId != "" { - c.JSON(200, result.Ok(nil)) - return - } - c.JSON(200, result.Err(nil)) -} - -// 通知公告修改 -// -// PUT / -func (s *SysNoticeController) Edit(c *gin.Context) { - var body model.SysNotice - err := c.ShouldBindBodyWith(&body, binding.JSON) - if err != nil || body.NoticeID == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) - return - } - - // 检查是否存在 - notice := s.sysNoticeService.SelectNoticeById(body.NoticeID) - if notice.NoticeID != body.NoticeID { - // 没有可访问公告信息数据！ - c.JSON(200, result.ErrMsg("There is no accessible bulletin information data!")) - return - } - - body.UpdateBy = ctx.LoginUserToUserName(c) - rows := s.sysNoticeService.UpdateNotice(body) - if rows > 0 { - c.JSON(200, result.Ok(nil)) - return - } - c.JSON(200, result.Err(nil)) -} - -// 通知公告删除 -// -// DELETE /:noticeIds -func (s *SysNoticeController) Remove(c *gin.Context) { - noticeIds := c.Param("noticeIds") - if noticeIds == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) - return - } - // 处理字符转id数组后去重 - ids := strings.Split(noticeIds, ",") - uniqueIDs := parse.RemoveDuplicates(ids) - if len(uniqueIDs) <= 0 { - c.JSON(200, result.Err(nil)) - return - } - rows, err := s.sysNoticeService.DeleteNoticeByIds(uniqueIDs) - if err != nil { - c.JSON(200, result.ErrMsg(err.Error())) - return - } - msg := fmt.Sprintf("Deleted successfully: %d", rows) - c.JSON(200, result.OkMsg(msg)) -} diff --git a/src/modules/system/repository/sys_notice.go b/src/modules/system/repository/sys_notice.go deleted file mode 100644 index cacb311c..00000000 --- a/src/modules/system/repository/sys_notice.go +++ /dev/null @@ -1,24 +0,0 @@ -package repository - -import "ems.agt/src/modules/system/model" - -// ISysNotice 通知公告表 数据层接口 -type ISysNotice interface { - // SelectNoticePage 分页查询公告列表 - SelectNoticePage(query map[string]any) map[string]any - - // SelectNoticeList 查询公告列表 - SelectNoticeList(sysNotice model.SysNotice) []model.SysNotice - - // SelectNoticeById 查询公告信息 - SelectNoticeByIds(noticeIds []string) []model.SysNotice - - // InsertNotice 新增公告 - InsertNotice(sysNotice model.SysNotice) string - - // UpdateNotice 修改公告 - UpdateNotice(sysNotice model.SysNotice) int64 - - // DeleteNoticeByIds 批量删除公告信息 - DeleteNoticeByIds(noticeIds []string) int64 -} diff --git a/src/modules/system/repository/sys_notice.impl.go b/src/modules/system/repository/sys_notice.impl.go deleted file mode 100644 index f565ddb8..00000000 --- a/src/modules/system/repository/sys_notice.impl.go +++ /dev/null @@ -1,297 +0,0 @@ -package repository - -import ( - "strings" - "time" - - "ems.agt/src/framework/datasource" - "ems.agt/src/framework/logger" - "ems.agt/src/framework/utils/date" - "ems.agt/src/framework/utils/parse" - "ems.agt/src/framework/utils/repo" - "ems.agt/src/modules/system/model" -) - -// 实例化数据层 SysNoticeImpl 结构体 -var NewSysNoticeImpl = &SysNoticeImpl{ - selectSql: `select - notice_id, notice_title, notice_type, notice_content, status, del_flag, - create_by, create_time, update_by, update_time, remark from sys_notice`, - - resultMap: map[string]string{ - "notice_id": "NoticeID", - "notice_title": "NoticeTitle", - "notice_type": "NoticeType", - "notice_content": "NoticeContent", - "status": "Status", - "del_flag": "DelFlag", - "create_by": "CreateBy", - "create_time": "CreateTime", - "update_by": "UpdateBy", - "update_time": "UpdateTime", - "remark": "Remark", - }, -} - -// SysNoticeImpl 通知公告表 数据层处理 -type SysNoticeImpl struct { - // 查询视图对象SQL - selectSql string - // 结果字段与实体映射 - resultMap map[string]string -} - -// convertResultRows 将结果记录转实体结果组 -func (r *SysNoticeImpl) convertResultRows(rows []map[string]any) []model.SysNotice { - arr := make([]model.SysNotice, 0) - for _, row := range rows { - sysNotice := model.SysNotice{} - for key, value := range row { - if keyMapper, ok := r.resultMap[key]; ok { - repo.SetFieldValue(&sysNotice, keyMapper, value) - } - } - arr = append(arr, sysNotice) - } - return arr -} - -// SelectNoticePage 分页查询公告列表 -func (r *SysNoticeImpl) SelectNoticePage(query map[string]any) map[string]any { - // 查询条件拼接 - var conditions []string - var params []any - if v, ok := query["noticeTitle"]; ok && v != "" { - conditions = append(conditions, "notice_title like concat(?, '%')") - params = append(params, v) - } - if v, ok := query["noticeType"]; ok && v != "" { - conditions = append(conditions, "notice_type = ?") - params = append(params, v) - } - if v, ok := query["createBy"]; ok && v != "" { - conditions = append(conditions, "create_by like concat(?, '%')") - params = append(params, v) - } - if v, ok := query["status"]; ok && v != "" { - conditions = append(conditions, "status = ?") - params = append(params, v) - } - beginTime, ok := query["beginTime"] - if !ok { - beginTime, ok = query["params[beginTime]"] - } - if ok && beginTime != "" { - conditions = append(conditions, "create_time >= ?") - beginDate := date.ParseStrToDate(beginTime.(string), date.YYYY_MM_DD) - params = append(params, beginDate.UnixMilli()) - } - endTime, ok := query["endTime"] - if !ok { - endTime, ok = query["params[endTime]"] - } - if ok && endTime != "" { - conditions = append(conditions, "create_time <= ?") - endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) - params = append(params, endDate.UnixMilli()) - } - - // 构建查询条件语句 - whereSql := " where del_flag = '0' " - if len(conditions) > 0 { - whereSql += " and " + strings.Join(conditions, " and ") - } - - // 查询结果 - result := map[string]any{ - "total": 0, - "rows": []model.SysNotice{}, - } - - // 查询数量 长度为0直接返回 - totalSql := "select count(1) as 'total' from sys_notice" - totalRows, err := datasource.RawDB("", totalSql+whereSql, params) - if err != nil { - logger.Errorf("total err => %v", err) - return result - } - total := parse.Number(totalRows[0]["total"]) - if total == 0 { - return result - } else { - result["total"] = total - } - - // 分页 - pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"]) - pageSql := " limit ?,? " - params = append(params, pageNum*pageSize) - params = append(params, pageSize) - - // 查询数据 - querySql := r.selectSql + whereSql + pageSql - results, err := datasource.RawDB("", querySql, params) - if err != nil { - logger.Errorf("query err => %v", err) - } - - // 转换实体 - result["rows"] = r.convertResultRows(results) - return result -} - -// SelectNoticeList 查询公告列表 -func (r *SysNoticeImpl) SelectNoticeList(sysNotice model.SysNotice) []model.SysNotice { - // 查询条件拼接 - var conditions []string - var params []any - if sysNotice.NoticeTitle != "" { - conditions = append(conditions, "notice_title like concat(?, '%')") - params = append(params, sysNotice.NoticeTitle) - } - if sysNotice.NoticeType != "" { - conditions = append(conditions, "notice_type = ?") - params = append(params, sysNotice.NoticeType) - } - if sysNotice.CreateBy != "" { - conditions = append(conditions, "create_by like concat(?, '%')") - params = append(params, sysNotice.CreateBy) - } - if sysNotice.Status != "" { - conditions = append(conditions, "status = ?") - params = append(params, sysNotice.Status) - } - - // 构建查询条件语句 - whereSql := " where del_flag = '0' " - if len(conditions) > 0 { - whereSql += " and " + strings.Join(conditions, " and ") - } - - // 查询数据 - querySql := r.selectSql + whereSql - results, err := datasource.RawDB("", querySql, params) - if err != nil { - logger.Errorf("query err => %v", err) - return []model.SysNotice{} - } - - // 转换实体 - return r.convertResultRows(results) -} - -// SelectNoticeByIds 查询公告信息 -func (r *SysNoticeImpl) SelectNoticeByIds(noticeIds []string) []model.SysNotice { - placeholder := repo.KeyPlaceholderByQuery(len(noticeIds)) - querySql := r.selectSql + " where notice_id in (" + placeholder + ")" - parameters := repo.ConvertIdsSlice(noticeIds) - results, err := datasource.RawDB("", querySql, parameters) - if err != nil { - logger.Errorf("query err => %v", err) - return []model.SysNotice{} - } - // 转换实体 - return r.convertResultRows(results) -} - -// InsertNotice 新增公告 -func (r *SysNoticeImpl) InsertNotice(sysNotice model.SysNotice) string { - // 参数拼接 - params := make(map[string]any) - if sysNotice.NoticeTitle != "" { - params["notice_title"] = sysNotice.NoticeTitle - } - if sysNotice.NoticeType != "" { - params["notice_type"] = sysNotice.NoticeType - } - if sysNotice.NoticeContent != "" { - params["notice_content"] = sysNotice.NoticeContent - } - if sysNotice.Status != "" { - params["status"] = sysNotice.Status - } - if sysNotice.Remark != "" { - params["remark"] = sysNotice.Remark - } - if sysNotice.CreateBy != "" { - params["create_by"] = sysNotice.CreateBy - params["create_time"] = time.Now().UnixMilli() - } - - // 构建执行语句 - keys, placeholder, values := repo.KeyPlaceholderValueByInsert(params) - sql := "insert into sys_notice (" + strings.Join(keys, ",") + ")values(" + placeholder + ")" - - db := datasource.DefaultDB() - // 开启事务 - tx := db.Begin() - // 执行插入 - err := tx.Exec(sql, values...).Error - if err != nil { - logger.Errorf("insert row : %v", err.Error()) - tx.Rollback() - return "" - } - // 获取生成的自增 ID - var insertedID string - err = tx.Raw("select last_insert_id()").Row().Scan(&insertedID) - if err != nil { - logger.Errorf("insert last id : %v", err.Error()) - tx.Rollback() - return "" - } - // 提交事务 - tx.Commit() - return insertedID -} - -// UpdateNotice 修改公告 -func (r *SysNoticeImpl) UpdateNotice(sysNotice model.SysNotice) int64 { - // 参数拼接 - params := make(map[string]any) - if sysNotice.NoticeTitle != "" { - params["notice_title"] = sysNotice.NoticeTitle - } - if sysNotice.NoticeType != "" { - params["notice_type"] = sysNotice.NoticeType - } - if sysNotice.NoticeContent != "" { - params["notice_content"] = sysNotice.NoticeContent - } - if sysNotice.Status != "" { - params["status"] = sysNotice.Status - } - if sysNotice.Remark != "" { - params["remark"] = sysNotice.Remark - } - if sysNotice.UpdateBy != "" { - params["update_by"] = sysNotice.UpdateBy - params["update_time"] = time.Now().UnixMilli() - } - - // 构建执行语句 - keys, values := repo.KeyValueByUpdate(params) - sql := "update sys_notice set " + strings.Join(keys, ",") + " where notice_id = ?" - - // 执行更新 - values = append(values, sysNotice.NoticeID) - rows, err := datasource.ExecDB("", sql, values) - if err != nil { - logger.Errorf("update row : %v", err.Error()) - return 0 - } - return rows -} - -// DeleteNoticeByIds 批量删除公告信息 -func (r *SysNoticeImpl) DeleteNoticeByIds(noticeIds []string) int64 { - placeholder := repo.KeyPlaceholderByQuery(len(noticeIds)) - sql := "update sys_notice set del_flag = '1' where notice_id in (" + placeholder + ")" - parameters := repo.ConvertIdsSlice(noticeIds) - results, err := datasource.ExecDB("", sql, parameters) - if err != nil { - logger.Errorf("update err => %v", err) - return 0 - } - return results -} diff --git a/src/modules/system/service/sys_notice.go b/src/modules/system/service/sys_notice.go deleted file mode 100644 index 78244f0f..00000000 --- a/src/modules/system/service/sys_notice.go +++ /dev/null @@ -1,24 +0,0 @@ -package service - -import "ems.agt/src/modules/system/model" - -// ISysNotice 公告 服务层接口 -type ISysNotice interface { - // SelectNoticePage 分页查询公告列表 - SelectNoticePage(query map[string]any) map[string]any - - // SelectNoticeList 查询公告列表 - SelectNoticeList(sysNotice model.SysNotice) []model.SysNotice - - // SelectNoticeById 查询公告信息 - SelectNoticeById(noticeId string) model.SysNotice - - // InsertNotice 新增公告 - InsertNotice(sysNotice model.SysNotice) string - - // UpdateNotice 修改公告 - UpdateNotice(sysNotice model.SysNotice) int64 - - // DeleteNoticeByIds 批量删除公告信息 - DeleteNoticeByIds(noticeIds []string) (int64, error) -} diff --git a/src/modules/system/service/sys_notice.impl.go b/src/modules/system/service/sys_notice.impl.go deleted file mode 100644 index 5f8446e4..00000000 --- a/src/modules/system/service/sys_notice.impl.go +++ /dev/null @@ -1,73 +0,0 @@ -package service - -import ( - "fmt" - - "ems.agt/src/modules/system/model" - "ems.agt/src/modules/system/repository" -) - -// 实例化服务层 SysNoticeImpl 结构体 -var NewSysNoticeImpl = &SysNoticeImpl{ - sysNoticeRepository: repository.NewSysNoticeImpl, -} - -// SysNoticeImpl 公告 服务层处理 -type SysNoticeImpl struct { - // 公告服务 - sysNoticeRepository repository.ISysNotice -} - -// SelectNoticePage 分页查询公告列表 -func (r *SysNoticeImpl) SelectNoticePage(query map[string]any) map[string]any { - return r.sysNoticeRepository.SelectNoticePage(query) -} - -// SelectNoticeList 查询公告列表 -func (r *SysNoticeImpl) SelectNoticeList(sysNotice model.SysNotice) []model.SysNotice { - return r.sysNoticeRepository.SelectNoticeList(sysNotice) -} - -// SelectNoticeById 查询公告信息 -func (r *SysNoticeImpl) SelectNoticeById(noticeId string) model.SysNotice { - if noticeId == "" { - return model.SysNotice{} - } - configs := r.sysNoticeRepository.SelectNoticeByIds([]string{noticeId}) - if len(configs) > 0 { - return configs[0] - } - return model.SysNotice{} -} - -// InsertNotice 新增公告 -func (r *SysNoticeImpl) InsertNotice(sysNotice model.SysNotice) string { - return r.sysNoticeRepository.InsertNotice(sysNotice) -} - -// UpdateNotice 修改公告 -func (r *SysNoticeImpl) UpdateNotice(sysNotice model.SysNotice) int64 { - return r.sysNoticeRepository.UpdateNotice(sysNotice) -} - -// DeleteNoticeByIds 批量删除公告信息 -func (r *SysNoticeImpl) DeleteNoticeByIds(noticeIds []string) (int64, error) { - // 检查是否存在 - notices := r.sysNoticeRepository.SelectNoticeByIds(noticeIds) - if len(notices) <= 0 { - return 0, fmt.Errorf("there is no accessible bulletin information data") - } - for _, notice := range notices { - // 检查是否为已删除 - if notice.DelFlag == "1" { - // 【%s】公告信息已经删除！ - return 0, fmt.Errorf("the [%s] announcement message has been deleted", notice.NoticeID) - } - } - if len(notices) == len(noticeIds) { - rows := r.sysNoticeRepository.DeleteNoticeByIds(noticeIds) - return rows, nil - } - // 删除公告信息失败！ - return 0, fmt.Errorf("failed to delete the announcement message") -} diff --git a/src/modules/system/system.go b/src/modules/system/system.go index 43550229..71456c21 100644 --- a/src/modules/system/system.go +++ b/src/modules/system/system.go @@ -218,34 +218,6 @@ func Setup(router *gin.Engine) { ) } - // 通知公告信息 - sysNoticeGroup := router.Group("/system/notice") - { - sysNoticeGroup.GET("/list", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:notice:list"}}), - controller.NewSysNotice.List, - ) - sysNoticeGroup.GET("/:noticeId", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:notice:query"}}), - controller.NewSysNotice.Info, - ) - sysNoticeGroup.POST("", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:notice:add"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Notice", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewSysNotice.Add, - ) - sysNoticeGroup.PUT("", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:notice:edit"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Notice", collectlogs.BUSINESS_TYPE_UPDATE)), - controller.NewSysNotice.Edit, - ) - sysNoticeGroup.DELETE("/:noticeIds", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:notice:remove"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Notice", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewSysNotice.Remove, - ) - } - // 岗位信息 sysPostGroup := router.Group("/system/post") {