实现首页默认显示前一天之后所有要提交的作业,修改部分不合法的命名格式
This commit is contained in:
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
|
import java.text.Format;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@@ -54,7 +55,17 @@ public class DataController {
|
|||||||
|
|
||||||
@GetMapping("/home/findAllHomework")
|
@GetMapping("/home/findAllHomework")
|
||||||
public List<VWorkDetail> findAllHomework() {
|
public List<VWorkDetail> findAllHomework() {
|
||||||
List<VWorkDetail> 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<VWorkDetail> homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(tomorrow));
|
||||||
if (homeworks != null) {
|
if (homeworks != null) {
|
||||||
return homeworks;
|
return homeworks;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,24 +13,24 @@ import javax.persistence.*;
|
|||||||
public class VHomework {
|
public class VHomework {
|
||||||
@Id
|
@Id
|
||||||
@Column(name = "workid")
|
@Column(name = "workid")
|
||||||
private Integer Id;
|
private Integer id;
|
||||||
|
|
||||||
@Column(name = "workname")
|
@Column(name = "workname")
|
||||||
private String Name;
|
private String name;
|
||||||
|
|
||||||
@Column(name = "worktime")
|
@Column(name = "worktime")
|
||||||
private String Time;
|
private String time;
|
||||||
|
|
||||||
@Column(name = "colfileid")
|
@Column(name = "colfileid")
|
||||||
private Integer fileid;
|
private Integer fileid;
|
||||||
|
|
||||||
@Column(name = "workfolder")
|
@Column(name = "workfolder")
|
||||||
private String Folder;
|
private String folder;
|
||||||
|
|
||||||
@Column(name = "coursename")
|
@Column(name = "coursename")
|
||||||
private String courseName;
|
private String courseName;
|
||||||
|
|
||||||
@Column(name = "workremark")
|
@Column(name = "workremark")
|
||||||
private String Remark;
|
private String remark;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,14 @@ package com.fjy.spring.repository;
|
|||||||
import com.fjy.spring.domain.VHomework;
|
import com.fjy.spring.domain.VHomework;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
public interface VHomeworkRepository extends JpaRepository<VHomework,Integer> {
|
public interface VHomeworkRepository extends JpaRepository<VHomework,Integer> {
|
||||||
|
/**
|
||||||
|
* 找出指定时间之前的所有作业
|
||||||
|
* @param destime
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<VHomework> findAllByTimeAfter(String destime);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,5 +3,13 @@ package com.fjy.spring.repository;
|
|||||||
import com.fjy.spring.domain.VWorkDetail;
|
import com.fjy.spring.domain.VWorkDetail;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public interface WorkDetailRepository extends JpaRepository<VWorkDetail,Integer> {
|
public interface WorkDetailRepository extends JpaRepository<VWorkDetail,Integer> {
|
||||||
|
/**
|
||||||
|
* 找出指定时间之前的所有作业详情
|
||||||
|
* @param worktime
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<VWorkDetail> findAllByWorktimeAfter(String worktime);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,4 +33,8 @@ public class HomeworkService {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<VHomework> findAllVHomeworkAfterTime(String time){
|
||||||
|
return vHomeworkRepository.findAllByTimeAfter(time);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,4 +15,8 @@ public class WorkDetailService {
|
|||||||
public List<VWorkDetail> findAll(){
|
public List<VWorkDetail> findAll(){
|
||||||
return workDetailRepository.findAll();
|
return workDetailRepository.findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<VWorkDetail> findAllVWorkDetailAfterTime(String time){
|
||||||
|
return workDetailRepository.findAllByWorktimeAfter(time);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#控制配置文件调用
|
#控制配置文件调用
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: prod
|
active: dev
|
||||||
@@ -25,8 +25,8 @@
|
|||||||
<!--滚动策略-->
|
<!--滚动策略-->
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<!--路径文件名,文件名包含时间-->
|
<!--路径文件名,文件名包含时间-->
|
||||||
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
|
<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
|
||||||
<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
|
<!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
|
||||||
</rollingPolicy>
|
</rollingPolicy>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
@@ -44,8 +44,8 @@
|
|||||||
<!--滚动策略-->
|
<!--滚动策略-->
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<!--路径文件名,文件名包含时间-->
|
<!--路径文件名,文件名包含时间-->
|
||||||
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
|
<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
|
||||||
<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
|
<!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
|
||||||
</rollingPolicy>
|
</rollingPolicy>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
|
|||||||
@@ -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<VHomework> homeworkList = homeworkService.findAllVHomeworkAfterTime("2018-05-28");
|
||||||
|
if (homeworkList!=null){
|
||||||
|
for (VHomework vHomework : homeworkList){
|
||||||
|
System.out.println(vHomework.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user