Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
64fd58f5
Commit
64fd58f5
authored
5 years ago
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
企业讯息bug优化,项目配置文件jpa自动生成表
parent
ea5e0ba3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
19 additions
and
30 deletions
+19
-30
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
+0
-1
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
+8
-4
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+2
-8
src/main/java/cn/timer/api/dao/yggl/YgCityDtoMapper.java
+0
-1
src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java
+0
-2
src/main/java/cn/timer/api/dto/yggl/YgCityDto.java
+0
-2
src/main/java/cn/timer/api/dto/yggl/YgProDto.java
+0
-2
src/main/java/cn/timer/api/dto/yggl/YgmzDto.java
+0
-1
src/main/resources/application-pro.yml
+9
-9
No files found.
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
View file @
64fd58f5
...
...
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
cn.timer.api.config.swagger.IgnoreSwaggerParameter
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
View file @
64fd58f5
...
...
@@ -293,12 +293,16 @@ public class CmsController {
qyxxQueryDto
.
getTotalPage
()
==
null
?
10
:
qyxxQueryDto
.
getTotalPage
());
QueryWrapper
<
CmsContent
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"status"
,
1
).
eq
(
t
!=
null
&&
t
>
-
1
,
"modularid"
,
t
).
eq
(
r
!=
null
&&
r
>
-
1
,
"releasestate"
,
r
)
.
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"releasetime"
,
queryWrapper
.
eq
(
"organization_id"
,
userBean
.
getOrgCode
())
.
eq
(
"status"
,
1
).
eq
(
t
!=
null
&&
t
>
-
1
,
"modularid"
,
t
)
.
eq
(
r
!=
null
&&
r
>
-
1
,
"releasestate"
,
r
)
.
between
(!
StrUtil
.
hasBlank
(
s
)
&&
!
StrUtil
.
hasBlank
(
e
),
"releasetime"
,
!
StrUtil
.
hasBlank
(
s
)
?
s
:
"1000-01-01 00:00:00"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"userid"
,
q
).
or
().
like
(
"author"
,
q
).
or
().
like
(
"title"
,
q
))
.
orderByDesc
(
"addeddate"
);
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"userid"
,
q
)
.
or
().
like
(
"author"
,
q
).
or
().
like
(
"title"
,
q
))
.
orderByDesc
(
"addeddate"
);
IPage
<
CmsContent
>
cmsContentPage
=
CmsContent
.
builder
().
build
().
selectPage
(
page
,
queryWrapper
);
List
<
CmsContent
>
cmsContents
=
cmsContentPage
.
getRecords
();
cmsContentPage
.
getCurrent
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
64fd58f5
...
...
@@ -18,7 +18,6 @@ import java.util.regex.Pattern;
import
javax.transaction.Transactional
;
import
org.apache.xmlbeans.impl.xb.xsdschema.Public
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.transaction.interceptor.TransactionAspectSupport
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
...
...
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
...
...
@@ -35,8 +33,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper
;
import
com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper
;
import
com.github.pagehelper.util.StringUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.StrUtil
;
...
...
@@ -56,7 +52,6 @@ import cn.timer.api.bean.yggl.YgglAttaZcxxb;
import
cn.timer.api.bean.yggl.YgglAttaZszjb
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainLzb
;
import
cn.timer.api.dto.yggl.YgmzDto
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
...
...
@@ -70,18 +65,17 @@ import cn.timer.api.dao.yggl.YgglMainEmpMapper;
import
cn.timer.api.dao.yggl.YgglMainLzbMapper
;
import
cn.timer.api.dao.zzgl.ZzglBmgwMMapper
;
import
cn.timer.api.dto.yggl.AddygdaDto
;
import
cn.timer.api.dto.yggl.IYgjgDto
;
import
cn.timer.api.dto.yggl.LzbQueryDto
;
import
cn.timer.api.dto.yggl.LzygQueryDto
;
import
cn.timer.api.dto.yggl.PunishFactory
;
import
cn.timer.api.dto.yggl.YgAreaDto
;
import
cn.timer.api.dto.yggl.YgCityDto
;
import
cn.timer.api.dto.yggl.YgDrjqbDto
;
import
cn.timer.api.dto.yggl.YgDrsDto
;
import
cn.timer.api.dto.yggl.YgProDto
;
import
cn.timer.api.dto.yggl.YgQueryDto
;
import
cn.timer.api.dto.yggl.YgglCartogramDto
;
import
cn.timer.api.dto.yggl.YgjgDto
;
import
cn.timer.api.dto.yggl.Yg
Pro
Dto
;
import
cn.timer.api.dto.yggl.Yg
mz
Dto
;
import
cn.timer.api.dto.yggl.YgzzDto
;
import
cn.timer.api.utils.Md5
;
import
cn.timer.api.utils.Result
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/yggl/YgCityDtoMapper.java
View file @
64fd58f5
...
...
@@ -4,7 +4,6 @@ import org.springframework.stereotype.Repository;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
cn.timer.api.dto.yggl.YgCityDto
;
import
cn.timer.api.dto.yggl.YgProDto
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java
View file @
64fd58f5
...
...
@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/YgCityDto.java
View file @
64fd58f5
...
...
@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/YgProDto.java
View file @
64fd58f5
...
...
@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/yggl/YgmzDto.java
View file @
64fd58f5
...
...
@@ -3,7 +3,6 @@ package cn.timer.api.dto.yggl;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-pro.yml
View file @
64fd58f5
...
...
@@ -10,19 +10,19 @@ spring:
multipart
:
max-file-size
:
20MB
max-request-size
:
20MB
#
jpa:
jpa
:
# 配置生成表 存储引擎InnoDB
# database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
# database:
#
open-in-view: false
#naming:
# database:
#
open-in-view: false
#
naming:
# spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
# 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
# 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
#physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
#
hibernate:
#
ddl-auto: update
#
show-sql: true
#
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
hibernate
:
ddl-auto
:
update
show-sql
:
true
datasource
:
username
:
root
password
:
youlingHR73!
...
...
@@ -114,7 +114,7 @@ pagehelper:
#showSql
logging
:
level
:
root
:
debug
root
:
info
cn.timer.api.dao
:
error
pattern
:
console
:
'
--%p--%m%n'
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment