fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

实现首页默认显示前一天之后所有要提交的作业，修改部分不合法的命名格式

Browse Source
This commit is contained in:
F嘉阳
2018-05-12 10:08:21 +08:00
parent 0282a9f401
commit 4e6adecc1f
9 changed files with 102 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/fjy/spring/controller/DataController.java
View File

@@ -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<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) {
return homeworks;
}

10
src/main/java/com/fjy/spring/domain/VHomework.java
View File

@@ -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;
}

8
src/main/java/com/fjy/spring/repository/VHomeworkRepository.java
View File

@@ -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<VHomework,Integer> {
/**
* 找出指定时间之前的所有作业
* @param destime
* @return
*/
List<VHomework> findAllByTimeAfter(String destime);
}

8
src/main/java/com/fjy/spring/repository/WorkDetailRepository.java
View File

@@ -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<VWorkDetail,Integer> {
/**
* 找出指定时间之前的所有作业详情
* @param worktime
* @return
*/
List<VWorkDetail> findAllByWorktimeAfter(String worktime);
}

4
src/main/java/com/fjy/spring/service/HomeworkService.java
View File

@@ -33,4 +33,8 @@ public class HomeworkService {
}
return null;
}
public List<VHomework> findAllVHomeworkAfterTime(String time){
return vHomeworkRepository.findAllByTimeAfter(time);
}
}

4
src/main/java/com/fjy/spring/service/WorkDetailService.java
View File

@@ -15,4 +15,8 @@ public class WorkDetailService {
public List<VWorkDetail> findAll(){
return workDetailRepository.findAll();
}
public List<VWorkDetail> findAllVWorkDetailAfterTime(String time){
return workDetailRepository.findAllByWorktimeAfter(time);
}
}

2
src/main/resources/application.yml
View File

@@ -1,4 +1,4 @@
#控制配置文件调用
spring:
profiles:
active: prod
active: dev

22
src/main/resources/logback-spring.xml
View File

@@ -25,8 +25,8 @@
<!--滚动策略-->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--路径文件名，文件名包含时间-->
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
<!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
</rollingPolicy>
</appender>
@@ -44,16 +44,16 @@
<!--滚动策略-->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--路径文件名，文件名包含时间-->
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
</rollingPolicy>
</appender>
<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
<!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
</rollingPolicy>
</appender>
<root level="info">
<appender-ref ref="consoleLog"/>
<appender-ref ref="fileInfoLog"/>
<appender-ref ref="fileErrorLog"/>
</root>
<root level="info">
<appender-ref ref="consoleLog"/>
<appender-ref ref="fileInfoLog"/>
<appender-ref ref="fileErrorLog"/>
</root>

49
src/test/java/com/fjy/spring/service/HomeworkServiceTest.java Normal file
View File

@@ -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());
}
}
}
}