Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
武汉红喜
whatsmars
提交
5f343808
W
whatsmars
项目概览
武汉红喜
/
whatsmars
通知
3
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
whatsmars
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5f343808
编写于
9月 02, 2018
作者:
武汉红喜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
代码优化
上级
90832554
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
20 addition
and
361 deletion
+20
-361
whatsmars-common/src/main/java/org/hongxi/whatsmars/common/result/Result.java
.../main/java/org/hongxi/whatsmars/common/result/Result.java
+9
-9
whatsmars-spring-boot/pom.xml
whatsmars-spring-boot/pom.xml
+6
-0
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/common/DateUtils.java
...va/org/hongxi/whatsmars/spring/boot/common/DateUtils.java
+0
-263
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/common/result/Result.java
...rg/hongxi/whatsmars/spring/boot/common/result/Result.java
+0
-50
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/common/result/ResultHelper.java
...gxi/whatsmars/spring/boot/common/result/ResultHelper.java
+0
-34
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/controller/UserController.java
...ngxi/whatsmars/spring/boot/controller/UserController.java
+2
-2
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/converter/StringToDateConverter.java
...hatsmars/spring/boot/converter/StringToDateConverter.java
+1
-1
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/exception/AppException.java
.../hongxi/whatsmars/spring/boot/exception/AppException.java
+1
-1
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/exception/AppExceptionHandler.java
.../whatsmars/spring/boot/exception/AppExceptionHandler.java
+1
-1
未找到文件。
whatsmars-common/src/main/java/org/hongxi/whatsmars/common/result/Result.java
浏览文件 @
5f343808
...
...
@@ -7,20 +7,20 @@ public class Result<T> {
private
int
code
;
private
String
m
essage
;
private
String
m
sg
;
private
T
data
;
// T代替Object的好处是可以限定类型
public
Result
()
{}
public
Result
(
int
code
,
String
m
essage
)
{
public
Result
(
int
code
,
String
m
sg
)
{
this
.
code
=
code
;
this
.
m
essage
=
message
;
this
.
m
sg
=
msg
;
}
public
Result
(
int
code
,
String
m
essage
,
T
data
)
{
public
Result
(
int
code
,
String
m
sg
,
T
data
)
{
this
.
code
=
code
;
this
.
m
essage
=
message
;
this
.
m
sg
=
msg
;
this
.
data
=
data
;
}
...
...
@@ -32,12 +32,12 @@ public class Result<T> {
this
.
code
=
code
;
}
public
String
getM
essage
()
{
return
m
essage
;
public
String
getM
sg
()
{
return
m
sg
;
}
public
void
setM
essage
(
String
message
)
{
this
.
m
essage
=
message
;
public
void
setM
sg
(
String
msg
)
{
this
.
m
sg
=
msg
;
}
public
Object
getData
()
{
...
...
whatsmars-spring-boot/pom.xml
浏览文件 @
5f343808
...
...
@@ -94,6 +94,12 @@
<groupId>
com.google.code.gson
</groupId>
<artifactId>
gson
</artifactId>
</dependency>
<dependency>
<groupId>
org.hongxi
</groupId>
<artifactId>
whatsmars-common
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependencies>
<build>
...
...
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/common/DateUtils.java
已删除
100644 → 0
浏览文件 @
90832554
package
org.hongxi.whatsmars.spring.boot.common
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.util.StringUtils
;
import
java.text.DateFormat
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.List
;
public
class
DateUtils
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
DateUtils
.
class
);
/**
* 日期格式 yyyy-MM-dd
*/
public
final
static
String
DATEFORMAT
=
"yyyy-MM-dd"
;
/**
* 日期格式 yyyyMMdd
*/
public
final
static
String
DATEFORMAT2
=
"yyyyMMdd"
;
/**
* 日期格式 yyyy/MM/dd
*/
public
final
static
String
DATEFORMAT3
=
"yyyy/MM/dd"
;
/**
* 时间格式 HH:mm:ss
*/
public
final
static
String
TIMEFORMAT
=
"HH:mm:ss"
;
/**
* 日期时间格式 yyyy-MM-dd HH:mm:ss
*/
public
final
static
String
DATETIMEFORMAT
=
"yyyy-MM-dd HH:mm:ss"
;
/**
* yyyy-MM
*/
public
final
static
String
DATE_SHORT_FORMAT
=
"yyyy-MM"
;
/**
* yyyyMM
*/
public
final
static
String
DATE_SHORT_FORMAT2
=
"yyyyMM"
;
public
static
String
DATETIME_FORMAT_REGEX
=
"\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}"
;
//yyyy-MM-dd HH:mm:ss
public
static
String
DATE_FORMAT_REGEX
=
"\\d{4}-\\d{2}-\\d{2}"
;
//yyyy-MM-dd
public
static
String
SHORTDATE_FORMAT_REGEX
=
"\\d{4}-\\d{2}"
;
//yyyy-MM
public
static
String
DATE_FORMAT2_REGEX
=
"\\d{4}\\d{2}\\d{2}"
;
//yyyyMMdd
public
static
String
SHORTDATE_FORMAT2_REGEX
=
"\\d{4}\\d{2}"
;
//yyyyMM
/**
* 获取时间日期格式化dateformat
*
* @param pattern 格式
* @return
*/
public
static
DateFormat
getFormat
(
String
pattern
)
{
if
(
StringUtils
.
isEmpty
(
pattern
))
{
logger
.
info
(
"格式错误pattern: {}"
,
pattern
);
return
null
;
}
return
new
SimpleDateFormat
(
pattern
);
}
/**
* 将string类型date格式化为date类型
*
* @param dateString string类型date
* @param pattern 格式
* @return
*/
public
static
Date
getDateFormat
(
String
dateString
,
String
pattern
)
{
if
(
StringUtils
.
isEmpty
(
dateString
))
{
logger
.
info
(
"格式化日期时间dateString: {}错误"
,
dateString
);
return
null
;
}
try
{
return
getFormat
(
pattern
).
parse
(
dateString
);
}
catch
(
ParseException
e
)
{
logger
.
error
(
"格式化日期异常:{}"
,
e
.
getMessage
());
e
.
printStackTrace
();
return
null
;
}
}
public
static
String
getStringFormat
(
Date
date
,
String
pattern
)
{
if
(
null
==
date
)
{
logger
.
info
(
"格式化日期时间date: {}错误"
,
date
);
return
null
;
}
return
getFormat
(
pattern
).
format
(
date
);
}
/**
* 将string类型date重新格式化为string类型
*
* @param dateString
* @param srcPattern
* @param targetPattern
* @return
*/
public
static
String
getStringReformat
(
String
dateString
,
String
srcPattern
,
String
targetPattern
)
{
Date
date
=
getDateFormat
(
dateString
,
srcPattern
);
return
getStringFormat
(
date
,
targetPattern
);
}
/**
* 获取当前时间的前一天
*
* @return
*/
public
static
Date
getYesterday
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
add
(
Calendar
.
DATE
,
-
1
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
calendar
.
getTime
();
}
/**
* 获取本月的第一天
*
* @return
*/
public
static
Date
getFirstDayByMonth
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
calendar
.
getTime
();
}
/**
* 获取上一个月的第一天
*
* @return
*/
public
static
Date
getFirstDayByLastMonth
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
set
(
Calendar
.
MONTH
,
calendar
.
get
(
Calendar
.
MONTH
)
-
1
);
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
calendar
.
getTime
();
}
/**
* 根据月份获取当月第一天
*
* @param month
* @return
*/
public
static
Date
getFirstDayByMonth
(
int
month
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
set
(
Calendar
.
MONTH
,
month
);
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
calendar
.
getTime
();
}
/**
* 获取某个月份的第一天
*
* @param month
* @return
*/
public
static
Date
getFirstDayByMonth
(
Date
date
,
int
month
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
date
);
calendar
.
set
(
Calendar
.
MONTH
,
month
);
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
calendar
.
getTime
();
}
/**
* 计算两个日期之间相隔的月份
*
* @param startDate
* @param endDate
* @return
*/
public
static
List
<
String
>
intervalMonths
(
Date
startDate
,
Date
endDate
)
{
List
<
String
>
monthList
=
new
ArrayList
<
String
>();
Calendar
tmp
=
Calendar
.
getInstance
();
tmp
.
setTime
(
startDate
);
tmp
.
set
(
Calendar
.
DAY_OF_MONTH
,
tmp
.
getActualMaximum
(
Calendar
.
DAY_OF_MONTH
)
-
1
);
Calendar
start
=
Calendar
.
getInstance
();
start
.
setTime
(
startDate
);
start
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
Calendar
end
=
Calendar
.
getInstance
();
end
.
setTime
(
endDate
);
end
.
set
(
Calendar
.
DAY_OF_MONTH
,
end
.
getActualMaximum
(
Calendar
.
DAY_OF_MONTH
));
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
DATE_SHORT_FORMAT
);
for
(;
tmp
.
after
(
start
)
&&
tmp
.
before
(
end
);
tmp
.
add
(
Calendar
.
MONTH
,
1
),
tmp
.
set
(
Calendar
.
DAY_OF_MONTH
,
tmp
.
getActualMaximum
(
Calendar
.
DAY_OF_MONTH
)
-
1
))
{
monthList
.
add
(
sdf
.
format
(
tmp
.
getTime
()));
}
return
monthList
;
}
/**
* 传入时间和当前时间比较最大获取上个月,返回虽然Date,实际时间是yyyyMM01 00:00:00.0
*
* @param date
* @return
*/
public
static
Date
maxLastMonth
(
Date
date
)
{
Date
thisMonth
=
DateUtils
.
getDateFormat
(
DateUtils
.
getStringFormat
(
new
Date
(),
DateUtils
.
DATE_SHORT_FORMAT
),
DateUtils
.
DATE_SHORT_FORMAT
);
if
(
thisMonth
.
compareTo
(
date
)
<=
0
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
thisMonth
);
calendar
.
add
(
Calendar
.
MONTH
,
-
1
);
return
calendar
.
getTime
();
}
return
date
;
}
public
static
Date
getMonth
(
Date
date
,
int
month
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
date
);
calendar
.
set
(
Calendar
.
MONTH
,
calendar
.
get
(
Calendar
.
MONTH
)
+
month
);
return
calendar
.
getTime
();
}
public
static
Date
getFirstDayByMonth
(
Date
date
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
date
);
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
calendar
.
getTime
();
}
public
static
int
betweenDays
(
Date
beforeDate
,
Date
afterDate
)
{
if
(
null
==
beforeDate
||
null
==
afterDate
)
{
throw
new
NullPointerException
(
"date can't be null"
);
}
if
(
beforeDate
.
after
(
afterDate
))
{
return
0
;
}
return
(
int
)
((
afterDate
.
getTime
()
-
beforeDate
.
getTime
())
/
(
1000
*
3600
*
24
));
}
/*public static void main(String[] args) {
System.out.println(getStringFormat(getFirstDayByMonth(), "yyyy-MM-dd HH:mm:ss"));
}*/
}
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/common/result/Result.java
已删除
100644 → 0
浏览文件 @
90832554
package
org.hongxi.whatsmars.spring.boot.common.result
;
/**
* Created by shenhongxi on 2018/5/18.
*/
public
class
Result
<
T
>
{
private
int
code
;
private
String
message
;
private
T
data
;
// T代替Object的好处是可以限定类型
public
Result
()
{}
public
Result
(
int
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
public
Result
(
int
code
,
String
message
,
T
data
)
{
this
.
code
=
code
;
this
.
message
=
message
;
this
.
data
=
data
;
}
public
int
getCode
()
{
return
code
;
}
public
void
setCode
(
int
code
)
{
this
.
code
=
code
;
}
public
String
getMessage
()
{
return
message
;
}
public
void
setMessage
(
String
message
)
{
this
.
message
=
message
;
}
public
Object
getData
()
{
return
data
;
}
public
void
setData
(
T
data
)
{
this
.
data
=
data
;
}
}
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/common/result/ResultHelper.java
已删除
100644 → 0
浏览文件 @
90832554
package
org.hongxi.whatsmars.spring.boot.common.result
;
/**
* Created by shenhongxi on 2018/5/18.
*/
public
class
ResultHelper
{
public
static
Result
newSuccessResult
()
{
return
newResult
(
true
);
}
public
static
<
T
>
Result
newSuccessResult
(
T
data
)
{
Result
result
=
newSuccessResult
();
result
.
setData
(
data
);
return
result
;
}
public
static
Result
newErrorResult
()
{
return
newResult
(
false
);
}
public
static
Result
newResult
(
boolean
success
)
{
return
newResult
(
success
,
null
);
}
public
static
Result
newResult
(
boolean
success
,
String
message
)
{
if
(
success
)
{
return
new
Result
(
200
,
message
==
null
?
"操作成功"
:
message
);
}
else
{
return
new
Result
(
500
,
message
==
null
?
"系统繁忙,请稍后再试"
:
message
);
}
}
}
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/controller/UserController.java
浏览文件 @
5f343808
...
...
@@ -2,10 +2,10 @@ package org.hongxi.whatsmars.spring.boot.controller;
import
com.github.pagehelper.Page
;
import
org.apache.logging.log4j.LogManager
;
import
org.hongxi.whatsmars.common.result.Result
;
import
org.hongxi.whatsmars.common.result.ResultHelper
;
import
org.hongxi.whatsmars.spring.boot.common.ReturnItemUtils
;
import
org.hongxi.whatsmars.spring.boot.common.pojo.ReturnItems
;
import
org.hongxi.whatsmars.spring.boot.common.result.Result
;
import
org.hongxi.whatsmars.spring.boot.common.result.ResultHelper
;
import
org.hongxi.whatsmars.spring.boot.exception.AppException
;
import
org.hongxi.whatsmars.spring.boot.model.User
;
import
org.hongxi.whatsmars.spring.boot.service.UserService
;
...
...
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/converter/StringToDateConverter.java
浏览文件 @
5f343808
package
org.hongxi.whatsmars.spring.boot.converter
;
import
org.hongxi.whatsmars.
spring.boot.common
.DateUtils
;
import
org.hongxi.whatsmars.
common.util
.DateUtils
;
import
org.springframework.core.convert.converter.Converter
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.StringUtils
;
...
...
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/exception/AppException.java
浏览文件 @
5f343808
package
org.hongxi.whatsmars.spring.boot.exception
;
import
org.hongxi.whatsmars.
spring.boot.
common.result.Result
;
import
org.hongxi.whatsmars.common.result.Result
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.validation.ObjectError
;
...
...
whatsmars-spring-boot/src/main/java/org/hongxi/whatsmars/spring/boot/exception/AppExceptionHandler.java
浏览文件 @
5f343808
...
...
@@ -2,8 +2,8 @@ package org.hongxi.whatsmars.spring.boot.exception;
import
com.alibaba.fastjson.JSON
;
import
com.google.common.collect.Maps
;
import
org.hongxi.whatsmars.common.result.Result
;
import
org.hongxi.whatsmars.spring.boot.common.ProfileUtils
;
import
org.hongxi.whatsmars.spring.boot.common.result.Result
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.boot.logging.LogLevel
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录