Skip to content

W
whatsmars

武汉红喜 / whatsmars

通知 3
Star 0
Fork 1
W
whatsmars

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 5f343808 编写于 作者: 武汉红喜's avatar 武汉红喜
浏览文件
操作

代码优化

上级 90832554
隐藏空白更改
内联 并排
Showing with 20 addition and 361 deletion
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 message;
private String msg;
private T data; // T代替Object的好处是可以限定类型
public Result() {}
public Result(int code, String message) {
public Result(int code, String msg) {
this.code = code;
this.message = message;
this.msg = msg;
}
public Result(int code, String message, T data) {
public Result(int code, String msg, T data) {
this.code = code;
this.message = message;
this.msg = msg;
this.data = data;
}
......@@ -32,12 +32,12 @@ public class Result<T> {
this.code = code;
}
public String getMessage() {
return message;
public String getMsg() {
return msg;
}
public void setMessage(String message) {
this.message = message;
public void setMsg(String msg) {
this.msg = 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.
先完成此消息的编辑！
想要评论请 注册 或