|
@@ -4,12 +4,20 @@ package com.usky.dxtop.controller.web.business;
|
|
|
import com.usky.dxtop.common.annotation.RepeatSubmit;
|
|
|
import com.usky.dxtop.common.core.domain.ApiResult;
|
|
|
import com.usky.dxtop.common.core.page.CommonPage;
|
|
|
+import com.usky.dxtop.common.utils.DateUtils;
|
|
|
import com.usky.dxtop.model.DreMenu;
|
|
|
import com.usky.dxtop.service.DreMenuService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.propertyeditors.CustomDateEditor;
|
|
|
+import org.springframework.web.bind.WebDataBinder;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.context.request.WebRequest;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import java.text.DateFormat;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.Date;
|
|
|
+
|
|
|
/**
|
|
|
* 餐品信息
|
|
|
* @author yq
|
|
@@ -65,7 +73,22 @@ public class DreMenuController {
|
|
|
@RequestParam(required = false) Integer status)
|
|
|
{
|
|
|
|
|
|
- return ApiResult.success(dreMenuService.page(current,size,type,name,isRecommend,status));
|
|
|
+ return ApiResult.success(dreMenuService.page(current,size,type,name,isRecommend,status,null,null));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/mDate")
|
|
|
+ public ApiResult<String> mDate()
|
|
|
+ {
|
|
|
+ return ApiResult.success(DateUtils.format(new Date(),null));
|
|
|
+ }
|
|
|
+
|
|
|
+ @InitBinder
|
|
|
+ public void initBinder(WebDataBinder binder, WebRequest request) {
|
|
|
+ //转换日期 注意这里的转化要和传进来的字符串的格式一直 如2015-9-9 就应该为yyyy-MM-dd
|
|
|
+ DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));// CustomDateEditor为自定义日期编辑器
|
|
|
}
|
|
|
|
|
|
|