From 4e6adecc1f8a663a2016672d1db08f9bd3810776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Sat, 12 May 2018 10:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=A6=96=E9=A1=B5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=89=8D=E4=B8=80=E5=A4=A9=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E6=89=80=E6=9C=89=E8=A6=81=E6=8F=90=E4=BA=A4=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=B3=95=E7=9A=84=E5=91=BD=E5=90=8D=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fjy/spring/controller/DataController.java | 13 ++++- .../java/com/fjy/spring/domain/VHomework.java | 10 ++-- .../repository/VHomeworkRepository.java | 8 +++ .../repository/WorkDetailRepository.java | 8 +++ .../fjy/spring/service/HomeworkService.java | 4 ++ .../fjy/spring/service/WorkDetailService.java | 4 ++ src/main/resources/application.yml | 2 +- src/main/resources/logback-spring.xml | 22 ++++----- .../spring/service/HomeworkServiceTest.java | 49 +++++++++++++++++++ 9 files changed, 102 insertions(+), 18 deletions(-) create mode 100644 src/test/java/com/fjy/spring/service/HomeworkServiceTest.java diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java index d5615e5..468bedb 100644 --- a/src/main/java/com/fjy/spring/controller/DataController.java +++ b/src/main/java/com/fjy/spring/controller/DataController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigInteger; +import java.text.Format; import java.text.SimpleDateFormat; import java.util.*; @@ -54,7 +55,17 @@ public class DataController { @GetMapping("/home/findAllHomework") public List findAllHomework() { - List homeworks = workDetailService.findAll(); + Format f = new SimpleDateFormat("yyyy-MM-dd"); + Date today = new Date(); + + Calendar c = Calendar.getInstance(); + c.setTime(today); + // 今天-1天 + c.add(Calendar.DAY_OF_MONTH, -1); + + Date tomorrow = c.getTime(); + + List homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(tomorrow)); if (homeworks != null) { return homeworks; } diff --git a/src/main/java/com/fjy/spring/domain/VHomework.java b/src/main/java/com/fjy/spring/domain/VHomework.java index dfc7e9b..d34f5c7 100644 --- a/src/main/java/com/fjy/spring/domain/VHomework.java +++ b/src/main/java/com/fjy/spring/domain/VHomework.java @@ -13,24 +13,24 @@ import javax.persistence.*; public class VHomework { @Id @Column(name = "workid") - private Integer Id; + private Integer id; @Column(name = "workname") - private String Name; + private String name; @Column(name = "worktime") - private String Time; + private String time; @Column(name = "colfileid") private Integer fileid; @Column(name = "workfolder") - private String Folder; + private String folder; @Column(name = "coursename") private String courseName; @Column(name = "workremark") - private String Remark; + private String remark; } diff --git a/src/main/java/com/fjy/spring/repository/VHomeworkRepository.java b/src/main/java/com/fjy/spring/repository/VHomeworkRepository.java index f8f5ba8..943ebf3 100644 --- a/src/main/java/com/fjy/spring/repository/VHomeworkRepository.java +++ b/src/main/java/com/fjy/spring/repository/VHomeworkRepository.java @@ -3,6 +3,14 @@ package com.fjy.spring.repository; import com.fjy.spring.domain.VHomework; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface VHomeworkRepository extends JpaRepository { + /** + * 找出指定时间之前的所有作业 + * @param destime + * @return + */ + List findAllByTimeAfter(String destime); } diff --git a/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java b/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java index a17948b..62b6161 100644 --- a/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java +++ b/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java @@ -3,5 +3,13 @@ package com.fjy.spring.repository; import com.fjy.spring.domain.VWorkDetail; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface WorkDetailRepository extends JpaRepository { + /** + * 找出指定时间之前的所有作业详情 + * @param worktime + * @return + */ + List findAllByWorktimeAfter(String worktime); } diff --git a/src/main/java/com/fjy/spring/service/HomeworkService.java b/src/main/java/com/fjy/spring/service/HomeworkService.java index af4a678..418a25d 100644 --- a/src/main/java/com/fjy/spring/service/HomeworkService.java +++ b/src/main/java/com/fjy/spring/service/HomeworkService.java @@ -33,4 +33,8 @@ public class HomeworkService { } return null; } + + public List findAllVHomeworkAfterTime(String time){ + return vHomeworkRepository.findAllByTimeAfter(time); + } } diff --git a/src/main/java/com/fjy/spring/service/WorkDetailService.java b/src/main/java/com/fjy/spring/service/WorkDetailService.java index ae53e82..244ee0c 100644 --- a/src/main/java/com/fjy/spring/service/WorkDetailService.java +++ b/src/main/java/com/fjy/spring/service/WorkDetailService.java @@ -15,4 +15,8 @@ public class WorkDetailService { public List findAll(){ return workDetailRepository.findAll(); } + + public List findAllVWorkDetailAfterTime(String time){ + return workDetailRepository.findAllByWorktimeAfter(time); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7ef289a..9efaa1c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ #控制配置文件调用 spring: profiles: - active: prod \ No newline at end of file + active: dev \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 362427e..0e82c6d 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -25,8 +25,8 @@ - - /www/cmsfile/%d/info.%d.log + F:\JAVA Workspace\Temp\log\%d\info.%d.log + @@ -44,16 +44,16 @@ - - /www/cmsfile/%d/error.%d.log - - + F:\JAVA Workspace\Temp\log\error.%d.log + + + - - - - - + + + + + diff --git a/src/test/java/com/fjy/spring/service/HomeworkServiceTest.java b/src/test/java/com/fjy/spring/service/HomeworkServiceTest.java new file mode 100644 index 0000000..d9529ed --- /dev/null +++ b/src/test/java/com/fjy/spring/service/HomeworkServiceTest.java @@ -0,0 +1,49 @@ +package com.fjy.spring.service; + +import com.fjy.spring.domain.VHomework; +import org.junit.Test; + +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import static org.junit.Assert.*; + +public class HomeworkServiceTest { + + @Test + public void findAll() { + } + + @Test + public void findAllVHomework() { + } + + @Test + public void findById() { + Format f = new SimpleDateFormat("yyyy-MM-dd"); + + Date today = new Date(); + System.out.println("今天是:" + f.format(today)); + + Calendar c = Calendar.getInstance(); + c.setTime(today); + c.add(Calendar.DAY_OF_MONTH, -1);// 今天+1天 + + Date tomorrow = c.getTime(); + System.out.println("昨天是:" + f.format(tomorrow)); + } + + @Test + public void findAllVHomeworkAfterTime() { + HomeworkService homeworkService = new HomeworkService(); + List homeworkList = homeworkService.findAllVHomeworkAfterTime("2018-05-28"); + if (homeworkList!=null){ + for (VHomework vHomework : homeworkList){ + System.out.println(vHomework.toString()); + } + } + } +} \ No newline at end of file