Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-auth
Commits
0ab8addc
Commit
0ab8addc
authored
May 29, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改YYYY为yyyy
parent
d47ce16e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
21 deletions
+17
-21
Constants.java
...th-api/src/main/java/com/gic/auth/constant/Constants.java
+1
-1
MenuController.java
...main/java/com/gic/auth/web/controller/MenuController.java
+16
-20
No files found.
gic-platform-auth-api/src/main/java/com/gic/auth/constant/Constants.java
View file @
0ab8addc
...
...
@@ -9,7 +9,7 @@ public interface Constants {
// String STORE_BATCH_IMPORT_MQ_KEY = "tmpStoreBatchImportTaskMq4.0";
Integer
STORE_BATCH_IMPORT_TASK_TYPE
=
6
;
String
dateformat
=
"
YYYY
-MM-dd HH:mm:ss"
;
String
dateformat
=
"
yyyy
-MM-dd HH:mm:ss"
;
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java
View file @
0ab8addc
package
com
.
gic
.
auth
.
web
.
controller
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
com.gic.auth.constant.MenuProjectConstants
;
import
com.gic.auth.web.utils.EnterpriseBasicAppUtils
;
import
com.gic.enterprise.ano.IgnoreLogin
;
import
com.gic.log.api.dto.LogSearchDTO
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.constant.MenuLevelConstants
;
import
com.gic.auth.constant.MenuTypeEnum
;
import
com.gic.auth.dto.MenuDTO
;
import
com.gic.auth.dto.UserDTO
;
import
com.gic.auth.qo.MenuListQO
;
import
com.gic.auth.service.CollaboratorApiService
;
import
com.gic.auth.service.MenuApiService
;
import
com.gic.auth.service.MenuItemApiService
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.auth.web.utils.EnterpriseBasicAppUtils
;
import
com.gic.auth.web.vo.LogListVO
;
import
com.gic.auth.web.vo.UserOperationItemAuthVO
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.ano.IgnoreLogin
;
import
com.gic.enterprise.qo.PageQO
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetail
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.log.api.dto.LogSearchDTO
;
import
com.gic.log.api.dto.SystemSetLogDTO
;
import
com.gic.log.api.service.LogApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.stream.Collectors
;
@RestController
public
class
MenuController
{
...
...
@@ -282,7 +278,7 @@ public class MenuController {
}
searchParam
.
setRelationIdList
(
relationIdList
);
}
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
YYYY
-MM-dd HH:mm:ss"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
yyyy
-MM-dd HH:mm:ss"
);
if
(
StringUtils
.
isNotBlank
(
startTime
))
{
startTime
=
startTime
+
" 00:00:00"
;
searchParam
.
setLogTimeBegin
(
sdf
.
parse
(
startTime
));
...
...
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