Skip to content

G
guns-vip
Commit 5d44f693 by fengshuonan
Options

修改日期为laydate

parent ff5969b2
Showing with 99 additions and 81 deletions
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java
......@@ -210,14 +210,17 @@ public class UserMgrController extends BaseController {
if (result.hasErrors()) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
User oldUser = userService.selectById(user.getId());
if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
this.userService.updateById(UserFactory.createUser(user));
this.userService.updateById(UserFactory.editUser(user, oldUser));
return SUCCESS_TIP;
} else {
assertAuth(user.getId());
ShiroUser shiroUser = ShiroKit.getUser();
if (shiroUser.getId().equals(user.getId())) {
this.userService.updateById(UserFactory.createUser(user));
this.userService.updateById(UserFactory.editUser(user, oldUser));
return SUCCESS_TIP;
} else {
throw new GunsException(BizExceptionEnum.NO_PERMITION);
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java
package com.stylefeng.guns.modular.system.factory;
import com.stylefeng.guns.modular.system.transfer.UserDto;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.transfer.UserDto;
import org.springframework.beans.BeanUtils;
/**
......@@ -12,13 +13,42 @@ import org.springframework.beans.BeanUtils;
*/
public class UserFactory {
public static User createUser(UserDto userDto){
if(userDto == null){
public static User createUser(UserDto userDto) {
if (userDto == null) {
return null;
}else{
} else {
User user = new User();
BeanUtils.copyProperties(userDto,user);
BeanUtils.copyProperties(userDto, user);
return user;
}
}
public static User editUser(UserDto newUser, User oldUser) {
if (newUser == null || oldUser == null) {
return oldUser;
} else {
if (ToolUtil.isNotEmpty(newUser.getAvatar())) {
oldUser.setAvatar(newUser.getAvatar());
}
if (ToolUtil.isNotEmpty(newUser.getName())) {
oldUser.setName(newUser.getName());
}
if (ToolUtil.isNotEmpty(newUser.getBirthday())) {
oldUser.setBirthday(newUser.getBirthday());
}
if (ToolUtil.isNotEmpty(newUser.getDeptid())) {
oldUser.setDeptid(newUser.getDeptid());
}
if (ToolUtil.isNotEmpty(newUser.getSex())) {
oldUser.setSex(newUser.getSex());
}
if (ToolUtil.isNotEmpty(newUser.getEmail())) {
oldUser.setEmail(newUser.getEmail());
}
if (ToolUtil.isNotEmpty(newUser.getPhone())) {
oldUser.setPhone(newUser.getPhone());
}
return oldUser;
}
}
}
guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html
......@@ -22,8 +22,7 @@
<div id="driverInfoContent">
<#input id="name" name="姓名" underline="true"/>
<#input id="birthday" name="出生日期" underline="true" type="date"
clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
<#input id="birthday" name="出生日期" underline="true" type="text"/>
<#input id="rePassword" name="确认密码" type="password" underline="true"/>
......@@ -53,4 +52,9 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
laydate.render({
elem: '#birthday'
});
</script>
@}
guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html
......@@ -19,9 +19,8 @@
<div id="driverInfoContent">
<#input id="name" name="姓名" underline="true" value="${user.name}"/>
<#input id="birthday" name="出生日期" underline="true" type="date"
value="${user.birthday}"
clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})" />
<#input id="birthday" name="出生日期" underline="true" type="text"
value="${user.birthday}"/>
<#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
......@@ -49,4 +48,9 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
laydate.render({
elem: '#birthday'
});
</script>
@}
guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html
......@@ -31,9 +31,8 @@
<div id="driverInfoContent">
<#input id="name" name="姓名" underline="true" value="${user.name}"/>
<#input id="birthday" name="出生日期" underline="true"
value="${user.birthday}"
clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
<#input id="birthday" name="出生日期" underline="true" type="text"
value="${user.birthday}"/>
<#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
hidden="deptid" hiddenValue="${user.deptid}"
......@@ -65,4 +64,9 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
laydate.render({
elem: '#birthday'
});
</script>
@}
guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultWebConfig.java
package com.stylefeng.guns.core.config;
import com.stylefeng.guns.core.base.controller.GunsErrorView;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.exception.GunsExceptionEnum;
import com.stylefeng.guns.core.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
......@@ -13,6 +15,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.regex.Pattern;
@Configuration
public class DefaultWebConfig extends WebMvcConfigurationSupport {
......@@ -36,7 +39,25 @@ public class DefaultWebConfig extends WebMvcConfigurationSupport {
@Override
public Date convert(String dateString) {
String patternDate = "\\d{4}-\\d{1,2}-\\d{1,2}";
String patternTimeMinutes = "\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}";
String patternTimeSeconds = "\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}";
boolean dateFlag = Pattern.matches(patternDate, dateString);
boolean timeMinutesFlag = Pattern.matches(patternTimeMinutes, dateString);
boolean timeSecondsFlag = Pattern.matches(patternTimeSeconds, dateString);
if (dateFlag) {
return DateUtil.parseDate(dateString);
} else if (timeMinutesFlag) {
return DateUtil.parseTimeMinutes(dateString);
} else if (timeSecondsFlag) {
return DateUtil.parseTime(dateString);
} else {
throw new GunsException(GunsExceptionEnum.INVLIDE_DATE_STRING);
}
}
}
}
......
guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsExceptionEnum.java
......@@ -6,18 +6,23 @@ package com.stylefeng.guns.core.exception;
* @author fengshuonan
* @Date 2017/12/28 下午10:33
*/
public enum GunsExceptionEnum implements ServiceExceptionEnum{
public enum GunsExceptionEnum implements ServiceExceptionEnum {
/**
* 其他
*/
WRITE_ERROR(500,"渲染界面错误"),
INVLIDE_DATE_STRING(400, "输入日期格式不对"),
/**
* 其他
*/
WRITE_ERROR(500, "渲染界面错误"),
/**
* 文件上传
*/
FILE_READING_ERROR(400,"FILE_READING_ERROR!"),
FILE_NOT_FOUND(400,"FILE_NOT_FOUND!"),
FILE_READING_ERROR(400, "FILE_READING_ERROR!"),
FILE_NOT_FOUND(400, "FILE_NOT_FOUND!"),
/**
* 错误的请求
......
guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
......@@ -28,11 +28,8 @@ import java.util.Date;
public class DateUtil {
/**
* 获取YYYY格式
*
* @return
*/
public static String getYear() {
return formatDate(new Date(), "yyyy");
......@@ -40,8 +37,6 @@ public class DateUtil {
/**
* 获取YYYY格式
*
* @return
*/
public static String getYear(Date date) {
return formatDate(date, "yyyy");
......@@ -49,8 +44,6 @@ public class DateUtil {
/**
* 获取YYYY-MM-DD格式
*
* @return
*/
public static String getDay() {
return formatDate(new Date(), "yyyy-MM-dd");
......@@ -58,8 +51,6 @@ public class DateUtil {
/**
* 获取YYYY-MM-DD格式
*
* @return
*/
public static String getDay(Date date) {
return formatDate(date, "yyyy-MM-dd");
......@@ -67,8 +58,6 @@ public class DateUtil {
/**
* 获取YYYYMMDD格式
*
* @return
*/
public static String getDays() {
return formatDate(new Date(), "yyyyMMdd");
......@@ -76,8 +65,6 @@ public class DateUtil {
/**
* 获取YYYYMMDD格式
*
* @return
*/
public static String getDays(Date date) {
return formatDate(date, "yyyyMMdd");
......@@ -85,8 +72,6 @@ public class DateUtil {
/**
* 获取YYYY-MM-DD HH:mm:ss格式
*
* @return
*/
public static String getTime() {
return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
......@@ -94,8 +79,6 @@ public class DateUtil {
/**
* 获取YYYY-MM-DD HH:mm:ss.SSS格式
*
* @return
*/
public static String getMsTime() {
return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
......@@ -103,8 +86,6 @@ public class DateUtil {
/**
* 获取YYYYMMDDHHmmss格式
*
* @return
*/
public static String getAllTime() {
return formatDate(new Date(), "yyyyMMddHHmmss");
......@@ -112,8 +93,6 @@ public class DateUtil {
/**
* 获取YYYY-MM-DD HH:mm:ss格式
*
* @return
*/
public static String getTime(Date date) {
return formatDate(date, "yyyy-MM-dd HH:mm:ss");
......@@ -130,12 +109,8 @@ public class DateUtil {
}
/**
* @Title: compareDate
* @Description:(日期比较，如果s>=e 返回true 否则返回false)
* @param s
* @param e
* @return boolean
* @throws
* 日期比较，如果s>=e 返回true 否则返回false)
*
* @author luguosui
*/
public static boolean compareDate(String s, String e) {
......@@ -147,8 +122,6 @@ public class DateUtil {
/**
* 格式化日期
*
* @return
*/
public static Date parseDate(String date) {
return parse(date, "yyyy-MM-dd");
......@@ -156,8 +129,13 @@ public class DateUtil {
/**
* 格式化日期
*
* @return
*/
public static Date parseTimeMinutes(String date) {
return parse(date, "yyyy-MM-dd HH:mm");
}
/**
* 格式化日期
*/
public static Date parseTime(String date) {
return parse(date, "yyyy-MM-dd HH:mm:ss");
......@@ -165,8 +143,6 @@ public class DateUtil {
/**
* 格式化日期
*
* @return
*/
public static Date parse(String date, String pattern) {
try {
......@@ -177,14 +153,8 @@ public class DateUtil {
}
}
/**
* 格式化日期
*
* @return
*/
public static String format(Date date, String pattern) {
return DateFormatUtils.format(date, pattern);
......@@ -192,9 +162,6 @@ public class DateUtil {
/**
* 把日期转换为Timestamp
*
* @param date
* @return
*/
public static Timestamp format(Date date) {
return new Timestamp(date.getTime());
......@@ -202,8 +169,6 @@ public class DateUtil {
/**
* 校验日期是否合法
*
* @return
*/
public static boolean isValidDate(String s) {
return parse(s, "yyyy-MM-dd HH:mm:ss") != null;
......@@ -211,8 +176,6 @@ public class DateUtil {
/**
* 校验日期是否合法
*
* @return
*/
public static boolean isValidDate(String s, String pattern) {
return parse(s, pattern) != null;
......@@ -232,11 +195,6 @@ public class DateUtil {
/**
* <li>功能描述：时间相减得到天数
*
* @param beginDateStr
* @param endDateStr
* @return long
* @author Administrator
*/
public static long getDaySub(String beginDateStr, String endDateStr) {
long day = 0;
......@@ -259,9 +217,6 @@ public class DateUtil {
/**
* 得到n天之后的日期
*
* @param days
* @return
*/
public static String getAfterDayDate(String days) {
int daysInt = Integer.parseInt(days);
......@@ -278,9 +233,6 @@ public class DateUtil {
/**
* 得到n天之后是周几
*
* @param days
* @return
*/
public static String getAfterDayWeek(String days) {
int daysInt = Integer.parseInt(days);
......@@ -295,9 +247,4 @@ public class DateUtil {
return dateStr;
}
public static void main(String[] args) {
System.out.println(getTime(new Date()));
System.out.println(getAfterDayWeek("3"));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment