This commit is contained in:
2025-06-30 16:44:06 +08:00
parent 4186cd0caf
commit c8a81d0f49
840 changed files with 1389 additions and 403165 deletions

View File

@@ -5,8 +5,8 @@ import (
"context"
"fmt"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/system/request"
"management/internal/erpserver/repository"
"management/internal/pkg/sqldb"
@@ -55,7 +55,7 @@ func (s *store) BatchCreate(ctx context.Context, objs []*system.AuditLog) error
return sqldb.NamedExecContext(ctx, s.log, s.db.DB(ctx), q, objs)
}
func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error) {
func (s *store) Count(ctx context.Context, filter request.ListAudit) (int64, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -80,7 +80,7 @@ func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error)
return count.Count, nil
}
func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.AuditLog, error) {
func (s *store) List(ctx context.Context, filter request.ListAudit) ([]*system.AuditLog, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -90,8 +90,8 @@ func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Audit
sys_audit_log`
data := map[string]any{
"offset": (filter.Page - 1) * filter.Rows,
"rows_per_page": filter.Rows,
"offset": (filter.PageID - 1) * filter.PageSize,
"rows_per_page": filter.PageSize,
}
buf := bytes.NewBufferString(q)

View File

@@ -4,20 +4,20 @@ import (
"bytes"
"strings"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system/request"
)
func applyFilter(filter dto.SearchDto, data map[string]any, buf *bytes.Buffer) {
func applyFilter(filter request.ListAudit, data map[string]any, buf *bytes.Buffer) {
var wc []string
if filter.SearchTimeBegin != "" && filter.SearchTimeEnd == "" {
data["start_at"] = filter.SearchTimeBegin
data["end_at"] = filter.SearchTimeEnd
if filter.StartTime != "" && filter.EndTime != "" {
data["start_at"] = filter.StartTime
data["end_at"] = filter.EndTime
wc = append(wc, "created_at BETWEEN :start_at AND :end_at")
}
if filter.SearchEmail != "" {
data["email"] = filter.SearchEmail
if filter.Email != "" {
data["email"] = filter.Email
wc = append(wc, "email LIKE :email")
}

View File

@@ -6,8 +6,8 @@ import (
"encoding/json"
"fmt"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/system/request"
"management/internal/erpserver/repository"
"management/internal/pkg/database"
"management/internal/pkg/know/pearadmin"
@@ -117,7 +117,7 @@ func (s *store) GetByKey(ctx context.Context, key string) (*system.Config, error
return &config, nil
}
func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error) {
func (s *store) Count(ctx context.Context, filter request.ListConfig) (int64, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -141,7 +141,7 @@ func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error)
return count.Count, nil
}
func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Config, error) {
func (s *store) List(ctx context.Context, filter request.ListConfig) ([]*system.Config, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -150,8 +150,8 @@ func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Confi
sys_config`
data := map[string]any{
"offset": (filter.Page - 1) * filter.Rows,
"rows_per_page": filter.Rows,
"offset": (filter.PageID - 1) * filter.PageSize,
"rows_per_page": filter.PageSize,
}
buf := bytes.NewBufferString(q)

View File

@@ -4,15 +4,15 @@ import (
"bytes"
"strings"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system/request"
)
func applyFilter(filter dto.SearchDto, data map[string]any, buf *bytes.Buffer) {
func applyFilter(filter request.ListConfig, data map[string]any, buf *bytes.Buffer) {
var wc []string
if filter.SearchTimeBegin != "" && filter.SearchTimeEnd == "" {
data["start_at"] = filter.SearchTimeBegin
data["end_at"] = filter.SearchTimeEnd
if filter.StartTime != "" && filter.EndTime != "" {
data["start_at"] = filter.StartTime
data["end_at"] = filter.EndTime
wc = append(wc, "created_at BETWEEN :start_at AND :end_at")
}

View File

@@ -4,20 +4,20 @@ import (
"bytes"
"strings"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system/request"
)
func applyFilter(filter dto.SearchDto, data map[string]any, buf *bytes.Buffer) {
func applyFilter(filter request.ListLoginLog, data map[string]any, buf *bytes.Buffer) {
var wc []string
if filter.SearchTimeBegin != "" && filter.SearchTimeEnd == "" {
data["start_at"] = filter.SearchTimeBegin
data["end_at"] = filter.SearchTimeEnd
if filter.StartTime != "" && filter.EndTime != "" {
data["start_at"] = filter.StartTime
data["end_at"] = filter.EndTime
wc = append(wc, "created_at BETWEEN :start_at AND :end_at")
}
if filter.SearchEmail != "" {
data["email"] = filter.SearchEmail
if filter.Email != "" {
data["email"] = filter.Email
wc = append(wc, "email LIKE :email")
}

View File

@@ -7,8 +7,8 @@ import (
"strings"
"time"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/system/request"
"management/internal/erpserver/repository"
"management/internal/pkg/sqldb"
@@ -64,7 +64,7 @@ func (s *store) GetLatest(ctx context.Context, email string) ([]*system.LoginLog
return toPointer(logs), nil
}
func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error) {
func (s *store) Count(ctx context.Context, filter request.ListLoginLog) (int64, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -89,7 +89,7 @@ func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error)
return count.Count, nil
}
func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.LoginLog, error) {
func (s *store) List(ctx context.Context, filter request.ListLoginLog) ([]*system.LoginLog, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -98,8 +98,8 @@ func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Login
sys_user_login_log`
data := map[string]any{
"offset": (filter.Page - 1) * filter.Rows,
"rows_per_page": filter.Rows,
"offset": (filter.PageID - 1) * filter.PageSize,
"rows_per_page": filter.PageSize,
}
buf := bytes.NewBufferString(q)

View File

@@ -4,40 +4,35 @@ import (
"bytes"
"strings"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system/request"
)
func applyFilter(filter dto.SearchDto, data map[string]any, buf *bytes.Buffer) {
func applyFilter(filter request.ListRole, data map[string]any, buf *bytes.Buffer) {
var wc []string
if filter.SearchTimeBegin != "" && filter.SearchTimeEnd == "" {
data["start_at"] = filter.SearchTimeBegin
data["end_at"] = filter.SearchTimeEnd
if filter.StartTime != "" && filter.EndTime != "" {
data["start_at"] = filter.StartTime
data["end_at"] = filter.EndTime
wc = append(wc, "created_at BETWEEN :start_at AND :end_at")
}
if filter.SearchEmail != "" {
data["email"] = filter.SearchEmail
wc = append(wc, "email LIKE :email")
}
if filter.SearchID != 0 {
data["id"] = filter.SearchID
if filter.ID != 0 {
data["id"] = filter.ID
wc = append(wc, "id = :id")
}
if filter.SearchParentID != 0 && filter.SearchParentID != 1 {
data["parent_id"] = filter.SearchParentID
if filter.ParentID != 0 && filter.ParentID != 1 {
data["parent_id"] = filter.ParentID
wc = append(wc, "parent_id = :parent_id")
}
if filter.SearchName != "" {
data["name"] = filter.SearchName
if filter.Name != "" {
data["name"] = filter.Name
wc = append(wc, "name LIKE :name")
}
if filter.SearchStatus != 9999 {
data["status"] = filter.SearchStatus
if filter.Status != 9999 {
data["status"] = filter.Status
wc = append(wc, "status = :status")
}

View File

@@ -6,8 +6,8 @@ import (
"fmt"
"time"
"management/internal/erpserver/model/dto"
"management/internal/erpserver/model/system"
"management/internal/erpserver/model/system/request"
"management/internal/erpserver/repository"
"management/internal/pkg/sqldb"
@@ -27,7 +27,7 @@ func NewStore(db *repository.Store, log *logger.Logger) system.RoleRepository {
}
func (s *store) Initialize(ctx context.Context) (*system.Role, error) {
count, err := s.Count(ctx, dto.SearchDto{})
count, err := s.Count(ctx, request.ListRole{})
if err != nil {
return nil, err
}
@@ -157,7 +157,7 @@ func (s *store) All(ctx context.Context) ([]*system.Role, error) {
return toPointer(roles), nil
}
func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error) {
func (s *store) Count(ctx context.Context, filter request.ListRole) (int64, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -182,7 +182,7 @@ func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error)
return count.Count, nil
}
func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Role, error) {
func (s *store) List(ctx context.Context, filter request.ListRole) ([]*system.Role, error) {
//goland:noinspection ALL
const q = `
SELECT
@@ -191,8 +191,8 @@ func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Role,
sys_role`
data := map[string]any{
"offset": (filter.Page - 1) * filter.Rows,
"rows_per_page": filter.Rows,
"offset": (filter.PageID - 1) * filter.PageSize,
"rows_per_page": filter.PageSize,
}
buf := bytes.NewBufferString(q)