diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java index fb97d980..9a5e897b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/SarPublicIdeaController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.sys.entity.SarPublicIdeaAll; import com.adc.da.sys.service.impl.SarPublicIdeaServiceImpl; +import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -36,8 +37,23 @@ public class SarPublicIdeaController extends BaseController { @ApiOperation(value = "分页查询") @GetMapping("/SelectAllP") - public ResponseMessage SelectAllP(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size){ - IPage Publiclist =sarPublicIdeaService.SelectAllP(page,size); + public ResponseMessage SelectAllP(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, + String start, String end){ + Date startdate = null; + Date enddate = null; + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (start!=null){ + startdate = formater.parse(start); + } + if (end!=null){ + enddate=formater.parse(DateUtil.addOneDay(end)); + } + } catch (ParseException e) { + e.printStackTrace(); + } + IPage Publiclist =sarPublicIdeaService.SelectAllo(page,size,categorg,cname,startdate,enddate); return Result.success(Publiclist); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java index 7bdbe6f8..df3ff480 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/SarPublicIdea.java @@ -7,11 +7,13 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -43,9 +45,13 @@ public class SarPublicIdea extends BaseEntity { private String cname; @TableField("STARTTIME") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date starttime; @TableField("ENDTIME") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date endtime; @TableField("VALIG_FLAG") diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java index 9fac73ba..86d37a3d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/ISarPublicIdeaService.java @@ -19,6 +19,6 @@ import java.util.Date; public interface ISarPublicIdeaService extends IService { String add(SarPublicIdea sarPublicIdea); - IPage SelectAllP(Integer page,Integer size); +// IPage SelectAllP(Integer page,Integer size); IPage SelectAllo(Integer page, Integer size,String categorg,String cname,Date start,Date end); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java index 42283843..f4c71604 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/SarPublicIdeaServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -45,23 +46,23 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl SelectAllP(Integer p, Integer size) { - QueryWrapper wrapper = new QueryWrapper<>(); - Page page = new Page<>(p, size); - IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); - return userIPage; - } +// @Override +// public IPage SelectAllP(Integer p, Integer size) { +// QueryWrapper wrapper = new QueryWrapper<>(); +// Page page = new Page<>(p, size); +// IPage userIPage = sarPublicIdeaDao.selectPage(page, wrapper); +// System.out.println("总条数"+userIPage.getTotal()); +// System.out.println("总页数"+userIPage.getPages()); +// return userIPage; +// } @Override public IPage SelectAllo(Integer p, Integer size,String categorg,String cname,Date start,Date end) { QueryWrapper list = new QueryWrapper<>(); list.eq(StringUtils.isNotEmpty(categorg),"CATEGORG",categorg) .like(StringUtils.isNotEmpty(cname),"CNAME",cname) - .like(start!=null,"STARTTIME",start) - .like(end!=null,"ENDTIME",end); + .gt(start!=null,"STARTTIME",start). + le(end!=null,"ENDTIME",end); // list.eq(sarPublicIdea.getStarttiml()!=null,"STARTTIML",sarPublicIdea.getStarttiml()); @@ -75,4 +76,5 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl pMSevenLong) { + boo = true; + } + + } catch (ParseException e) { + + } + + + return boo; + } + + public static Integer getMonth(String date) { + + String _M = ""; + try { + _M = new SimpleDateFormat("M").format(new SimpleDateFormat("yyyy-MM-dd").parse(date)); + } catch (ParseException e) { + } + + return Integer.valueOf(_M); + + } + + public static String firstOneDay(String date) { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + String startDate = ""; + try { + today = sdf.parse(date); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(Calendar.MONTH, 0); + theCa.set(Calendar.DAY_OF_MONTH, 1); + Date start = theCa.getTime(); + startDate = sdf.format(start); + } catch (ParseException e) { + } + + + return startDate; + } + + public static String finOneDay(String date) { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + String startDate = ""; + try { + today = sdf.parse(date); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.set(Calendar.DAY_OF_MONTH, 1); + theCa.set(Calendar.DATE, theCa.getActualMaximum(Calendar.DATE)); + Date start = theCa.getTime(); + startDate = sdf.format(start); + } catch (ParseException e) { + } + + + return startDate; + } + + public static String addOneDay(String date) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + String startDate = ""; + try { + today = sdf.parse(date); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(theCa.DATE, +1); + Date start = theCa.getTime(); + startDate = sdf.format(start); + } catch (ParseException e) { + } + return startDate; + } + + public static String addTenDay(Integer dayInt) { + + dayInt = dayInt - 1; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = new Date(); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(theCa.DATE, +dayInt);//最后一个数字30可改，30天的意思 + Date start = theCa.getTime(); + String startDate = sdf.format(start);//三十天之前日期 + + return startDate; + } + + public static String subOneDay(String date) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = null; + String startDate = ""; + try { + today = sdf.parse(date); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(theCa.DATE, -1); + Date start = theCa.getTime(); + startDate = sdf.format(start); + } catch (ParseException e) { + } + return startDate; + } + public static String subTenDay(Integer dayInt) { + + dayInt = dayInt - 1; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date today = new Date(); + String endDate = sdf.format(today);//当前日期 + Calendar theCa = Calendar.getInstance(); + theCa.setTime(today); + theCa.add(theCa.DATE, -dayInt);//最后一个数字30可改，30天的意思 + Date start = theCa.getTime(); + String startDate = sdf.format(start);//三十天之前日期 + + return startDate; + + } + + /** + + * 获取一段时间的列表 + + */ + + public static String getWeekByMap(String week) { + Map map=new HashMap(); + map.put("Monday", "星期一"); + map.put("Tuesday", "星期二"); + map.put("Wednesday", "星期三"); + map.put("Thursday", "星期四"); + map.put("Friday", "星期五"); + map.put("Saturday", "星期六"); + map.put("Sunday", "星期日"); + return map.get(week); + } + + public static Integer getWeekByMapInt(String week) { + Map map=new HashMap(); + map.put("星期一",1); + map.put("星期二",2); + map.put("星期三",3); + map.put("星期四",4); + map.put("星期五",5); + map.put("星期六",6); + map.put("星期日",0); + return map.get(week); + } + + /** + * 页面 有效日期 传参 判断 用 + */ + public static String getWeekByMapWebUse(String week) { + Map map=new HashMap(); + map.put("1", "星期一"); + map.put("2", "星期二"); + map.put("3", "星期三"); + map.put("4", "星期四"); + map.put("5", "星期五"); + map.put("6", "星期六"); + map.put("7", "星期日"); + return map.get(week); + } + + public static String getWeekByMapWebUseLinux(String week) { + Map map=new HashMap(); + map.put("Mon", "星期一"); + map.put("Tue", "星期二"); + map.put("Wed", "星期三"); + map.put("Thu", "星期四"); + map.put("Fri", "星期五"); + map.put("Sat", "星期六"); + map.put("Sun", "星期日"); + return map.get(week); + } + + public static String getChineseWeekDate(String week) { + Date date = null; + try { + date = new SimpleDateFormat("yyyy-MM-dd").parse(week); + } catch (ParseException e) { + e.printStackTrace(); + } + return new SimpleDateFormat("E").format(date); + } + + /** + * 取起始时间到结束时间 所有的时间 + * @param startTime + * @param endTime + * @return + */ + + public static List get_D_Plaus_1List(String startTime, String endTime) { + List list = new ArrayList(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar cal = Calendar.getInstance(); + + try { + cal.setTime(sdf.parse(startTime)); + for (long d = cal.getTimeInMillis(); d <= sdf.parse(endTime).getTime(); d = get_D_Plaus_1(cal)) { + list.add(sdf.format(d)); + } + } catch (ParseException e) { + System.out.println("date change err"); + } + + return list; + } + + public static long get_D_Plaus_1(Calendar c) { + c.set(Calendar.DAY_OF_MONTH, c.get(Calendar.DAY_OF_MONTH) + 1); + return c.getTimeInMillis(); + } + + public static void main(String[] args) { + } +}