dugulp
/
goweb-gin-demo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加搜索功能

master
xiao.ming 2021-11-06 12:59:51 +08:00
parent a491ea8672
commit 591db69a86
13 changed files with 182 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/wt/wt_reports.go
View File

@ -105,17 +105,18 @@ func (wtReportsApi *WtReportsApi) FindWtReports(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /wtReports/getWtReportsList [get] // @Router /wtReports/getWtReportsList [get]
func (wtReportsApi *WtReportsApi) GetWtReportsList(c *gin.Context) { func (wtReportsApi *WtReportsApi) GetWtReportsList(c *gin.Context) {
var pageInfo wtReq.WtReportsSearch var searchInfo wtReq.WtReportsSearch
_ = c.ShouldBindQuery(&pageInfo) _ = c.ShouldBindQuery(&searchInfo)
if err, list, total := wtReportsService.GetWtReportsInfoList(pageInfo); err != nil {
if err, list, total := wtReportsService.GetWtReportsInfoList(searchInfo); err != nil {
global.GLOBAL_LOG.Error("获取失败!", zap.Any("err", err)) global.GLOBAL_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage("获取失败", c) response.FailWithMessage("获取失败", c)
} else { } else {
response.OkWithDetailed(response.PageResult{ response.OkWithDetailed(response.PageResult{
List: list, List: list,
Total: total, Total: total,
Page: pageInfo.Page, Page: searchInfo.Page,
PageSize: pageInfo.PageSize, PageSize: searchInfo.PageSize,
}, "获取成功", c) }, "获取成功", c)
} }
} }

2
config.yaml
View File

@ -30,7 +30,7 @@ casbin:
# system configuration # system configuration
system: system:
env: 'develop' # Change to "develop" to skip authentication for development mode # public env: 'develop' # Change to "develop" to skip authentication for development mode # public
addr: 8889 addr: 8888
db-type: 'mysql' db-type: 'mysql'
oss-type: 'local' # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置 oss-type: 'local' # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
use-multipoint: false use-multipoint: false

40
docs/docs.go
View File

@ -1703,29 +1703,13 @@ var doc = `{
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
"name": "attachments", "example": "xx项目",
"name": "content",
"in": "query" "in": "query"
}, },
{ {
"type": "string", "type": "string",
"name": "contents", "name": "endTime",
"in": "query"
},
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "string",
"name": "header",
"in": "query"
},
{
"type": "integer",
"description": "主键ID",
"name": "id",
"in": "query" "in": "query"
}, },
{ {
@ -1742,23 +1726,13 @@ var doc = `{
}, },
{ {
"type": "string", "type": "string",
"name": "pictures", "example": "2021-11-04 12:36:34",
"name": "startTime",
"in": "query" "in": "query"
}, },
{ {
"type": "string", "type": "integer",
"name": "sendTo", "name": "userId",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "string",
"name": "userName",
"in": "query" "in": "query"
} }
], ],

40
docs/swagger.json
View File

@ -1684,29 +1684,13 @@
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
"name": "attachments", "example": "xx项目",
"name": "content",
"in": "query" "in": "query"
}, },
{ {
"type": "string", "type": "string",
"name": "contents", "name": "endTime",
"in": "query"
},
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "string",
"name": "header",
"in": "query"
},
{
"type": "integer",
"description": "主键ID",
"name": "id",
"in": "query" "in": "query"
}, },
{ {
@ -1723,23 +1707,13 @@
}, },
{ {
"type": "string", "type": "string",
"name": "pictures", "example": "2021-11-04 12:36:34",
"name": "startTime",
"in": "query" "in": "query"
}, },
{ {
"type": "string", "type": "integer",
"name": "sendTo", "name": "userId",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "string",
"name": "userName",
"in": "query" "in": "query"
} }
], ],

30
docs/swagger.yaml
View File

@ -1640,23 +1640,13 @@ paths:
consumes: consumes:
- application/json - application/json
parameters: parameters:
- in: query - example: xx项目
name: attachments
type: string
- in: query
name: contents
type: string
- description: 创建时间
in: query in: query
name: createdAt name: content
type: string type: string
- in: query - in: query
name: header name: endTime
type: string type: string
- description: 主键ID
in: query
name: id
type: integer
- description: 页码 - description: 页码
in: query in: query
name: page name: page
@ -1665,19 +1655,13 @@ paths:
in: query in: query
name: pageSize name: pageSize
type: integer type: integer
- in: query - example: "2021-11-04 12:36:34"
name: pictures
type: string
- in: query
name: sendTo
type: string
- description: 更新时间
in: query in: query
name: updatedAt name: startTime
type: string type: string
- in: query - in: query
name: userName name: userId
type: string type: integer
produces: produces:
- application/json - application/json
responses: responses:

BIN
goweb-gin-demo
View File

Binary file not shown.

2
latest_log
View File

@ -1 +1 @@
log/2021-11-05.log log/2021-11-06.log

47
log/2021-10-29.log
View File

@ -1,47 +0,0 @@
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:12:13.261 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:12:20.858 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:42 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:12:20.859 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:14:17.594 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:14:20.877 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:14:20.878 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:17:06.301 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:17:22.808 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:17:22.809 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:21:09.128 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:22:00.541 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:22:00.542 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:24:23.321 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:24:23.322 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:27:49.768 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:27:52.871 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 09:27:52.872 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:22:58.395 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:22:58.396 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:24:32.438 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:24:39.538 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:24:39.539 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:36:36.866 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:36:36.868 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:37:52.738 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:37:55.725 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:37:55.726 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 10:38:48.587 info /Users/zero/work/mygithub/goweb-gin-demo/service/casbin.go:107 ./resource/rbac_model.conf
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:08:33.915 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:08:39.791 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:08:39.792 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:34:01.181 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:34:06.092 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:34:06.093 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:35:57.123 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:36:02.757 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:36:02.760 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:37:00.250 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:37:00.252 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:44:47.224 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 11:44:47.227 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 14:24:04.838 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 14:24:04.839 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 14:33:20.005 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 14:42:32.682 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:43 router register success
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 14:42:32.683 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[github.com/flipped-aurora/gin-vue-admin/server]2021/10/29 - 17:38:10.636 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection

31
log/2021-11-05.log
View File

@ -27,3 +27,34 @@
[goweb-demo]2021/11/05 - 12:17:41.333 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8889: use of closed network connection [goweb-demo]2021/11/05 - 12:17:41.333 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8889: use of closed network connection
[goweb-demo]2021/11/05 - 12:17:49.963 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success [goweb-demo]2021/11/05 - 12:17:49.963 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 12:17:49.965 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8889"} [goweb-demo]2021/11/05 - 12:17:49.965 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8889"}
[goweb-demo]2021/11/05 - 12:22:44.979 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8889: use of closed network connection
[goweb-demo]2021/11/05 - 15:08:57.085 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 15:08:57.089 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8889"}
[goweb-demo]2021/11/05 - 17:34:08.164 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 17:34:08.168 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 17:36:15.834 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 17:36:15.835 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 17:38:44.867 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 17:38:44.869 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 17:44:10.077 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 17:44:10.079 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 17:46:43.932 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 17:46:43.933 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 17:59:36.263 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 17:59:36.265 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 18:10:46.309 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 18:10:46.310 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 18:32:15.530 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 18:32:15.533 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 18:35:47.064 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 18:35:47.066 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 18:37:00.011 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 18:37:00.013 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 18:38:02.477 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8889: use of closed network connection
[goweb-demo]2021/11/05 - 18:50:26.360 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 18:50:26.362 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 19:00:37.199 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 19:00:37.200 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 19:07:00.924 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/05 - 19:07:00.927 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/05 - 19:18:03.987 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection

34
log/2021-11-06.log Normal file
View File

@ -0,0 +1,34 @@
[goweb-demo]2021/11/06 - 10:11:42.274 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 10:11:42.275 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 10:43:57.249 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[goweb-demo]2021/11/06 - 10:44:05.730 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 10:44:05.732 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 10:45:19.011 error /Users/zero/work/mygithub/goweb-gin-demo/api/wt/wt_reports.go:112 获取失败! {"err": "Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? LIMIT ? OFFSET ?' at line 1; Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? LIMIT ? OFFSET ?' at line 1"}
[goweb-demo]2021/11/06 - 10:47:50.398 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[goweb-demo]2021/11/06 - 10:47:55.698 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 10:47:55.700 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 10:48:48.565 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[goweb-demo]2021/11/06 - 10:48:54.356 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 10:48:54.357 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 10:50:08.751 error /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[goweb-demo]2021/11/06 - 10:50:20.800 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 10:50:20.802 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 11:00:22.638 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 11:00:22.639 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 11:13:24.300 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 11:13:24.301 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 11:16:17.855 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 11:16:17.856 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 11:46:45.341 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 11:46:45.342 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 11:54:38.725 error /Users/zero/work/mygithub/goweb-gin-demo/api/wt/wt_reports.go:112 获取失败! {"err": "Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '01:11:07 and created_at < 2021-11-04 01:11:07 LIMIT ? OFFSET ?' at line 1; Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '01:11:07 and created_at < 2021-11-04 01:11:07 LIMIT ? OFFSET ?' at line 1"}
[goweb-demo]2021/11/06 - 12:07:22.762 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 12:07:22.764 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 12:08:00.945 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 12:08:00.946 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/06 - 12:08:09.023 error /Users/zero/work/mygithub/goweb-gin-demo/api/wt/wt_reports.go:112 获取失败! {"err": "Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1; Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1"}
[goweb-demo]2021/11/06 - 12:08:11.324 error /Users/zero/work/mygithub/goweb-gin-demo/api/wt/wt_reports.go:112 获取失败! {"err": "Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1; Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1"}
[goweb-demo]2021/11/06 - 12:08:12.506 error /Users/zero/work/mygithub/goweb-gin-demo/api/wt/wt_reports.go:112 获取失败! {"err": "Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1; Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1"}
[goweb-demo]2021/11/06 - 12:08:13.597 error /Users/zero/work/mygithub/goweb-gin-demo/api/wt/wt_reports.go:112 获取失败! {"err": "Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1; Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=< '2021-11-04 03:11:08' LIMIT ? OFFSET ?' at line 1"}
[goweb-demo]2021/11/06 - 12:12:50.758 info /Users/zero/work/mygithub/goweb-gin-demo/initialize/router.go:48 router register success
[goweb-demo]2021/11/06 - 12:12:50.759 info /Users/zero/work/mygithub/goweb-gin-demo/core/server.go:31 server run success on {"address": ":8888"}

6
model/wt/request/wt_reports.go
View File

@ -5,8 +5,12 @@ import (
"goweb-gin-demo/model/wt" "goweb-gin-demo/model/wt"
) )
//query参数要用: form, 而不是json
type WtReportsSearch struct{ type WtReportsSearch struct{
wt.WtReports UserId uint `form:"userId"`
StartTime string `form:"startTime" example:"2021-11-04 12:36:34"`
EndTime string `form:"endTime"`
Content string `form:"content" example:"xx项目"`
request.PageInfo request.PageInfo
} }

16
model/wt/response/wt_reports.go
View File

@ -8,6 +8,10 @@ import (
type WtReportsResult struct{ type WtReportsResult struct{
global.GLOBAL_MODEL global.GLOBAL_MODEL
WtReportInfo
}
type WtReportInfo struct {
UserName string `json:"userName"` UserName string `json:"userName"`
SendTo []wt.UserInfo `json:"sendTo"` SendTo []wt.UserInfo `json:"sendTo"`
Header string `json:"header"` Header string `json:"header"`
@ -15,3 +19,15 @@ type WtReportsResult struct{
Pictures []wt.UploadFileJson `json:"pictures"` Pictures []wt.UploadFileJson `json:"pictures"`
Attachments []wt.UploadFileJson `json:"attachments"` Attachments []wt.UploadFileJson `json:"attachments"`
} }
type WtReportsSearchBO struct {
global.GLOBAL_MODEL
wt.WtReports
CommentCount uint `json:"commentCount"`
}
type WtReportsSearchResult struct {
global.GLOBAL_MODEL
WtReportInfo
CommentCount uint `json:"commentCount"`
}

75
service/wt/wt_report.go
View File

@ -7,6 +7,7 @@ import (
"goweb-gin-demo/model/wt" "goweb-gin-demo/model/wt"
wtReq "goweb-gin-demo/model/wt/request" wtReq "goweb-gin-demo/model/wt/request"
wtRes "goweb-gin-demo/model/wt/response" wtRes "goweb-gin-demo/model/wt/response"
"strconv"
) )
type WtReportsService struct { type WtReportsService struct {
@ -45,19 +46,51 @@ func (wtReportsService *WtReportsService) GetWtReports(id uint) (err error, repo
func (wtReportsService *WtReportsService) GetWtReportsInfoList(info wtReq.WtReportsSearch) (err error, list interface{}, total int64) { func (wtReportsService *WtReportsService) GetWtReportsInfoList(info wtReq.WtReportsSearch) (err error, list interface{}, total int64) {
limit := info.PageSize limit := info.PageSize
offset := info.PageSize * (info.Page - 1) offset := info.PageSize * (info.Page - 1)
// 创建db
db := global.GLOBAL_DB.Model(&wt.WtReports{}) reportTable := global.GLOBAL_DB.Table("wt_reports")
var wtReportsList []wt.WtReports
// 如果有条件搜索 下方会自动创建搜索语句 err = reportTable.Count(&total).Error
err = db.Count(&total).Error
if err != nil { if err != nil {
return return
} }
err = db.Limit(limit).Offset(offset).Find(&wtReportsList).Error
reportsVOList := reportsToVOs(wtReportsList)
return err, reportsVOList, total var reportsSearchBOList []wtRes.WtReportsSearchBO
if info.Page == 0 {
limit = int(total)
}
//首选获取周报的ids
var reportIds []uint
reportTable.Select("`id`", offset, limit).Offset(offset).Limit(limit).Scan(&reportIds)
querySql := "SELECT id, user_name, send_to, header, contents, pictures, attachments, created_at, updated_at, cmc.comment_count "+
"FROM wt_reports "+
"left join (SELECT report_id, count(report_id) as comment_count FROM wt_comments WHERE report_id in ? GROUP BY report_id) as cmc "+
"on cmc.report_id = wt_reports.id "+
"WHERE 1=1 "
// 条件高级查询
if info.UserId > 0 {
querySql += " and id = " + strconv.Itoa(int(info.UserId))
}
if len(info.Content) != 0 {
querySql += " and contents LIKE '%" + info.Content + "%'"
}
if len(info.StartTime) != 0 && len(info.EndTime) != 0 {
querySql += " and created_at >= '" + info.StartTime + "' and created_at <= '"+ info.EndTime + "'"
}
querySql += " LIMIT ? OFFSET ? "
err = global.GLOBAL_DB.Raw( querySql, reportIds, limit, offset).Scan(&reportsSearchBOList).Error
reportsSearchResultList := reportsToSearchResult(reportsSearchBOList)
return err, reportsSearchResultList, total
} }
//数据转换一下, 需要把json数据转换为字符串 //数据转换一下, 需要把json数据转换为字符串
@ -79,6 +112,32 @@ func voToRrports(reportsVO wtReq.WtReportsVO) wt.WtReports {
return wtReports return wtReports
} }
// 批量转换 数据转换, 把字符串转换为json
func reportsToSearchResult(wtReportsList []wtRes.WtReportsSearchBO) []wtRes.WtReportsSearchResult {
var reportsSearchResults []wtRes.WtReportsSearchResult
for _, searchBO := range wtReportsList {
reportVO := reportToSearchResult(searchBO)
reportsSearchResults = append(reportsSearchResults, reportVO)
}
return reportsSearchResults
}
//单个转换
func reportToSearchResult(searchBO wtRes.WtReportsSearchBO) wtRes.WtReportsSearchResult {
searchResult := wtRes.WtReportsSearchResult{}
searchResult.GLOBAL_MODEL = searchBO.GLOBAL_MODEL
searchResult.UserName = searchBO.UserName
searchResult.Header = searchBO.Header
searchResult.CommentCount = searchBO.CommentCount
json.Unmarshal([]byte(searchBO.SendTo), &searchResult.SendTo)
json.Unmarshal([]byte(searchBO.Contents), &searchResult.Contents)
json.Unmarshal([]byte(searchBO.Pictures), &searchResult.Pictures)
json.Unmarshal([]byte(searchBO.Attachments), &searchResult.Attachments)
return searchResult
}
// 批量转换 数据转换, 把字符串转换为json // 批量转换 数据转换, 把字符串转换为json
func reportsToVOs(wtReportsList []wt.WtReports) []wtRes.WtReportsResult { func reportsToVOs(wtReportsList []wt.WtReports) []wtRes.WtReportsResult {
var reportsVOList []wtRes.WtReportsResult var reportsVOList []wtRes.WtReportsResult