Browse Source

时间测试

yq 2 years ago
parent
commit
95d4100b1c

+ 24 - 1
src/main/java/com/usky/dxtop/controller/web/business/DreMenuController.java

@@ -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为自定义日期编辑器
     }
 
 

+ 6 - 5
src/main/java/com/usky/dxtop/model/DreMenu.java

@@ -1,12 +1,13 @@
 package com.usky.dxtop.model;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -55,7 +56,7 @@ public class DreMenu implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 创建人
@@ -65,7 +66,7 @@ public class DreMenu implements Serializable {
     /**
      * 修改时间
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * 修改人

+ 6 - 4
src/main/java/com/usky/dxtop/service/DreMenuService.java

@@ -1,12 +1,12 @@
 package com.usky.dxtop.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.dxtop.common.core.page.CommonPage;
-import com.usky.dxtop.model.Company;
 import com.usky.dxtop.model.DreMenu;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Date;
+
 /**
  * <p>
  *  服务类
@@ -26,5 +26,7 @@ public interface DreMenuService extends IService<DreMenu> {
                              String type,
                              String name,
                              Integer isRecommend,
-                             Integer status);
+                             Integer status,
+                             Date startTime ,
+                             Date endTime);
 }

+ 4 - 1
src/main/java/com/usky/dxtop/service/impl/DreMenuServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,7 +40,8 @@ public class DreMenuServiceImpl extends ServiceImpl<DreMenuMapper, DreMenu> impl
     }
 
     @Override
-    public CommonPage<DreMenu> page(Integer current, Integer size, String type, String name, Integer isRecommend, Integer status) {
+    public CommonPage<DreMenu> page(Integer current, Integer size, String type, String name, Integer isRecommend, Integer status, Date startTime ,
+                                    Date endTime) {
         IPage<DreMenu> page = new Page<>(current, size);
         QueryWrapper<DreMenu> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByAsc(" field(type,'早餐','午餐','晚餐','宵夜')");
@@ -49,6 +51,7 @@ public class DreMenuServiceImpl extends ServiceImpl<DreMenuMapper, DreMenu> impl
                 .like(StringUtils.isNotBlank(name),DreMenu::getName,name)
                 .eq(null != isRecommend,DreMenu::getIsRecommend,isRecommend)
                 .eq(null != status,DreMenu::getStatus,status)
+                .between(null != startTime && null != endTime,DreMenu::getCreateTime,startTime,endTime)
                 .orderByDesc(DreMenu::getId);
         page = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());