From 62d38ac48044abe6ecfc356dfcc16a092327c0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Wed, 7 Feb 2018 09:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BD=9C=E4=B8=9A=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=92=8C=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fjy/spring/controller/DataController.java | 28 ++++++ .../spring/controller/LoginController.java | 7 +- .../spring/controller/UpLoadController.java | 7 +- .../java/com/fjy/spring/domain/Homework.java | 57 ++++++------ .../java/com/fjy/spring/domain/TbAdmin.java | 6 +- .../java/com/fjy/spring/domain/TbCourse.java | 4 + .../java/com/fjy/spring/domain/TbFile.java | 7 +- .../java/com/fjy/spring/domain/TbLog.java | 7 +- .../java/com/fjy/spring/domain/TbStudent.java | 6 +- .../java/com/fjy/spring/domain/TbTeacher.java | 6 +- .../com/fjy/spring/domain/VWorkDetail.java | 89 +++++++++++++++++++ .../com/fjy/spring/domain/Workstatus.java | 2 +- .../fjy/spring/interceptor/WebAppConfig.java | 2 +- .../spring/repository/HomeworkRepository.java | 2 +- .../repository/WorkDetailRepository.java | 7 ++ .../fjy/spring/service/HomeworkService.java | 19 ++++ .../fjy/spring/service/WorkDetailService.java | 18 ++++ src/main/resources/static/js/homePage.js | 38 ++------ src/main/resources/templates/home/home.html | 45 ++++------ src/main/resources/templates/home/home2.html | 23 +++-- 20 files changed, 259 insertions(+), 121 deletions(-) create mode 100644 src/main/java/com/fjy/spring/controller/DataController.java create mode 100644 src/main/java/com/fjy/spring/domain/VWorkDetail.java create mode 100644 src/main/java/com/fjy/spring/repository/WorkDetailRepository.java create mode 100644 src/main/java/com/fjy/spring/service/HomeworkService.java create mode 100644 src/main/java/com/fjy/spring/service/WorkDetailService.java diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java new file mode 100644 index 0000000..4c6f1f6 --- /dev/null +++ b/src/main/java/com/fjy/spring/controller/DataController.java @@ -0,0 +1,28 @@ +package com.fjy.spring.controller; + +import com.fjy.spring.domain.VWorkDetail; +import com.fjy.spring.enums.ResultEnum; +import com.fjy.spring.exception.UserException; +import com.fjy.spring.service.WorkDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class DataController { + + @Autowired + private WorkDetailService workDetailService; + + @GetMapping("/home/findAllHomework") + public List findAllHomework(){ + List homeworks = workDetailService.findAll(); + if (homeworks!=null){ + return homeworks; + } + new UserException(ResultEnum.EMPTY_DATA); + return null; + } +} diff --git a/src/main/java/com/fjy/spring/controller/LoginController.java b/src/main/java/com/fjy/spring/controller/LoginController.java index 7c10a1c..d2fcfd3 100644 --- a/src/main/java/com/fjy/spring/controller/LoginController.java +++ b/src/main/java/com/fjy/spring/controller/LoginController.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import java.math.BigInteger; import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.util.Date; import static com.fjy.spring.constant.GlobalConstant.USER_SESSION_KEY; @@ -43,10 +44,12 @@ public class LoginController { request.getSession().setAttribute(USER_SESSION_KEY,user); //写入日志信息 Date date = new Date(); - Timestamp currentTime = new Timestamp(date.getTime()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateNowStr = sdf.format(date); + System.out.println("当前时间："+dateNowStr); TbLog log = new TbLog(); log.setUserid(user.getColuserid()); - log.setColtime(currentTime); + log.setColtime(dateNowStr); log.setColheader(request.getHeader("user-agent")); log.setColip(request.getRemoteAddr()); logService.addLogRec(log); diff --git a/src/main/java/com/fjy/spring/controller/UpLoadController.java b/src/main/java/com/fjy/spring/controller/UpLoadController.java index b699077..1294502 100644 --- a/src/main/java/com/fjy/spring/controller/UpLoadController.java +++ b/src/main/java/com/fjy/spring/controller/UpLoadController.java @@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; -import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -129,7 +129,8 @@ public class UpLoadController { TbUser user = (TbUser)request.getSession().getAttribute(GlobalConstant.USER_SESSION_KEY); Date date = new Date(); - Timestamp currentTime = new Timestamp(date.getTime()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateNowStr = sdf.format(date); //String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/"; String uploadUrl = serverProperties.getFilePath()+ "upload/"; @@ -151,7 +152,7 @@ public class UpLoadController { TbFile tbFile = new TbFile(); tbFile.setColfilesize(new FormatFileSizeUtil().GetFileSize(file.getSize())); tbFile.setColfilename(filename); - tbFile.setColtime(currentTime); + tbFile.setColtime(dateNowStr); tbFile.setColfilepath(uploadUrl + filename); tbFile.setColip(request.getRemoteAddr()); tbFile.setColuserid(user.getColuserid()); diff --git a/src/main/java/com/fjy/spring/domain/Homework.java b/src/main/java/com/fjy/spring/domain/Homework.java index f722a6b..66d9b96 100644 --- a/src/main/java/com/fjy/spring/domain/Homework.java +++ b/src/main/java/com/fjy/spring/domain/Homework.java @@ -1,50 +1,55 @@ package com.fjy.spring.domain; import javax.persistence.*; -import java.sql.Timestamp; @Entity @Table(name = "tb_homework") public class Homework { @Id + @Column(name = "workid") @GeneratedValue - private Integer workId; + private Integer Id; - private String workName; + @Column(name = "workname") + private String Name; - private Timestamp workTime; + @Column(name = "worktime") + private String Time; @Column(name = "colfileid") private Integer fileid; - private String workFolder; + @Column(name = "workfolder") + private String Folder; + @Column(name = "courseno") private Integer courseNo; - private String workRemark; + @Column(name = "workremark") + private String Remark; - public Integer getWorkId() { - return workId; + public Integer getId() { + return Id; } - public void setWorkId(Integer workId) { - this.workId = workId; + public void setId(Integer id) { + Id = id; } - public String getWorkName() { - return workName; + public String getName() { + return Name; } - public void setWorkName(String workName) { - this.workName = workName; + public void setName(String name) { + Name = name; } - public Timestamp getWorkTime() { - return workTime; + public String getTime() { + return Time; } - public void setWorkTime(Timestamp workTime) { - this.workTime = workTime; + public void setTime(String time) { + Time = time; } public Integer getFileid() { @@ -55,12 +60,12 @@ public class Homework { this.fileid = fileid; } - public String getWorkFolder() { - return workFolder; + public String getFolder() { + return Folder; } - public void setWorkFolder(String workFolder) { - this.workFolder = workFolder; + public void setFolder(String folder) { + Folder = folder; } public Integer getCourseNo() { @@ -71,11 +76,11 @@ public class Homework { this.courseNo = courseNo; } - public String getWorkRemark() { - return workRemark; + public String getRemark() { + return Remark; } - public void setWorkRemark(String workRemark) { - this.workRemark = workRemark; + public void setRemark(String remark) { + Remark = remark; } } diff --git a/src/main/java/com/fjy/spring/domain/TbAdmin.java b/src/main/java/com/fjy/spring/domain/TbAdmin.java index 46bb80f..d963f84 100644 --- a/src/main/java/com/fjy/spring/domain/TbAdmin.java +++ b/src/main/java/com/fjy/spring/domain/TbAdmin.java @@ -15,7 +15,7 @@ public class TbAdmin { @Column(name = "coluserid") private Integer userid; - private Integer coltime; + private String coltime; public Integer getAdminid() { return adminid; @@ -33,11 +33,11 @@ public class TbAdmin { this.userid = userid; } - public Integer getColtime() { + public String getColtime() { return coltime; } - public void setColtime(Integer coltime) { + public void setColtime(String coltime) { this.coltime = coltime; } } diff --git a/src/main/java/com/fjy/spring/domain/TbCourse.java b/src/main/java/com/fjy/spring/domain/TbCourse.java index 4d23b69..ed8cb97 100644 --- a/src/main/java/com/fjy/spring/domain/TbCourse.java +++ b/src/main/java/com/fjy/spring/domain/TbCourse.java @@ -1,5 +1,6 @@ package com.fjy.spring.domain; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -8,11 +9,14 @@ import java.sql.Timestamp; @Entity public class TbCourse { @Id + @Column(name = "courseno") @GeneratedValue private Integer courseNo; + @Column(name = "coursename") private String courseName; + @Column(name = "coursetime") private Timestamp courseTime; private Integer teacherid; diff --git a/src/main/java/com/fjy/spring/domain/TbFile.java b/src/main/java/com/fjy/spring/domain/TbFile.java index 449a746..c77d68b 100644 --- a/src/main/java/com/fjy/spring/domain/TbFile.java +++ b/src/main/java/com/fjy/spring/domain/TbFile.java @@ -3,7 +3,6 @@ package com.fjy.spring.domain; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import java.sql.Timestamp; @Entity public class TbFile { @@ -13,7 +12,7 @@ public class TbFile { private int coluserid; - private Timestamp coltime; + private String coltime; private String colip; @@ -36,11 +35,11 @@ public class TbFile { '}'; } - public Timestamp getColtime() { + public String getColtime() { return coltime; } - public void setColtime(Timestamp coltime) { + public void setColtime(String coltime) { this.coltime = coltime; } diff --git a/src/main/java/com/fjy/spring/domain/TbLog.java b/src/main/java/com/fjy/spring/domain/TbLog.java index d30856e..04ac9d2 100644 --- a/src/main/java/com/fjy/spring/domain/TbLog.java +++ b/src/main/java/com/fjy/spring/domain/TbLog.java @@ -1,7 +1,6 @@ package com.fjy.spring.domain; import javax.persistence.*; -import java.sql.Timestamp; @Entity public class TbLog { @@ -12,7 +11,7 @@ public class TbLog { @Column(name = "coluserid") private Integer userid; - private Timestamp coltime; + private String coltime; private String colip; @@ -34,11 +33,11 @@ public class TbLog { this.userid = userid; } - public Timestamp getColtime() { + public String getColtime() { return coltime; } - public void setColtime(Timestamp coltime) { + public void setColtime(String coltime) { this.coltime = coltime; } diff --git a/src/main/java/com/fjy/spring/domain/TbStudent.java b/src/main/java/com/fjy/spring/domain/TbStudent.java index 8433f64..6da4753 100644 --- a/src/main/java/com/fjy/spring/domain/TbStudent.java +++ b/src/main/java/com/fjy/spring/domain/TbStudent.java @@ -15,7 +15,7 @@ public class TbStudent { @Column(name = "coluserid") private Integer userid; - private Integer coltime; + private String coltime; public Integer getStudentid() { return studentid; @@ -33,11 +33,11 @@ public class TbStudent { this.userid = userid; } - public Integer getColtime() { + public String getColtime() { return coltime; } - public void setColtime(Integer coltime) { + public void setColtime(String coltime) { this.coltime = coltime; } } diff --git a/src/main/java/com/fjy/spring/domain/TbTeacher.java b/src/main/java/com/fjy/spring/domain/TbTeacher.java index 3f64636..496e0cb 100644 --- a/src/main/java/com/fjy/spring/domain/TbTeacher.java +++ b/src/main/java/com/fjy/spring/domain/TbTeacher.java @@ -12,7 +12,7 @@ public class TbTeacher { @GeneratedValue private Integer teacherid; private Integer coluserid; - private Integer coltime; + private String coltime; public Integer getTeacherid() { return teacherid; @@ -30,11 +30,11 @@ public class TbTeacher { this.coluserid = coluserid; } - public Integer getColtime() { + public String getColtime() { return coltime; } - public void setColtime(Integer coltime) { + public void setColtime(String coltime) { this.coltime = coltime; } } diff --git a/src/main/java/com/fjy/spring/domain/VWorkDetail.java b/src/main/java/com/fjy/spring/domain/VWorkDetail.java new file mode 100644 index 0000000..d27e2df --- /dev/null +++ b/src/main/java/com/fjy/spring/domain/VWorkDetail.java @@ -0,0 +1,89 @@ +package com.fjy.spring.domain; + +import org.hibernate.annotations.Immutable; +import org.hibernate.annotations.Subselect; + +import javax.persistence.Entity; +import javax.persistence.Id; + +/** + * 映射视图实体 + */ +@Entity +@Immutable +@Subselect("SELECT * FROM v_workdetail") +public class VWorkDetail { + @Id + private Integer workid; + private Integer colfileid; + private String workname; + private String worktime; + private String colfilename; + private String coursename; + private String workremark; + private String workfolder; + + public Integer getWorkid() { + return workid; + } + + public void setWorkid(Integer workid) { + this.workid = workid; + } + + public Integer getColfileid() { + return colfileid; + } + + public void setColfileid(Integer colfileid) { + this.colfileid = colfileid; + } + + public String getWorkname() { + return workname; + } + + public void setWorkname(String workname) { + this.workname = workname; + } + + public String getWorktime() { + return worktime; + } + + public void setWorktime(String worktime) { + this.worktime = worktime; + } + + public String getColfilename() { + return colfilename; + } + + public void setColfilename(String colfilename) { + this.colfilename = colfilename; + } + + public String getCoursename() { + return coursename; + } + + public void setCoursename(String coursename) { + this.coursename = coursename; + } + + public String getWorkremark() { + return workremark; + } + + public void setWorkremark(String workremark) { + this.workremark = workremark; + } + + public String getWorkfolder() { + return workfolder; + } + + public void setWorkfolder(String workfolder) { + this.workfolder = workfolder; + } +} diff --git a/src/main/java/com/fjy/spring/domain/Workstatus.java b/src/main/java/com/fjy/spring/domain/Workstatus.java index c6596e7..9d474fd 100644 --- a/src/main/java/com/fjy/spring/domain/Workstatus.java +++ b/src/main/java/com/fjy/spring/domain/Workstatus.java @@ -1,7 +1,6 @@ package com.fjy.spring.domain; import javax.persistence.*; -import java.sql.Timestamp; @Entity @Table(name = "tb_workstatus") @@ -13,6 +12,7 @@ public class Workstatus { @Column(name = "coluserid") private Integer userid; + @Column(name = "workid") private Integer workId; private Integer colstatus; diff --git a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java index f3f3ad8..bd31d1c 100644 --- a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java +++ b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java @@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -@Configuration +/*@Configuration*/ public class WebAppConfig implements WebMvcConfigurer { /** diff --git a/src/main/java/com/fjy/spring/repository/HomeworkRepository.java b/src/main/java/com/fjy/spring/repository/HomeworkRepository.java index 72c260a..6a625df 100644 --- a/src/main/java/com/fjy/spring/repository/HomeworkRepository.java +++ b/src/main/java/com/fjy/spring/repository/HomeworkRepository.java @@ -3,6 +3,6 @@ package com.fjy.spring.repository; import com.fjy.spring.domain.Homework; import org.springframework.data.jpa.repository.JpaRepository; -public interface HomeworkRepository extends JpaRepository { +public interface HomeworkRepository extends JpaRepository { } diff --git a/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java b/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java new file mode 100644 index 0000000..a17948b --- /dev/null +++ b/src/main/java/com/fjy/spring/repository/WorkDetailRepository.java @@ -0,0 +1,7 @@ +package com.fjy.spring.repository; + +import com.fjy.spring.domain.VWorkDetail; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface WorkDetailRepository extends JpaRepository { +} diff --git a/src/main/java/com/fjy/spring/service/HomeworkService.java b/src/main/java/com/fjy/spring/service/HomeworkService.java new file mode 100644 index 0000000..552d5e6 --- /dev/null +++ b/src/main/java/com/fjy/spring/service/HomeworkService.java @@ -0,0 +1,19 @@ +package com.fjy.spring.service; + +import com.fjy.spring.domain.Homework; +import com.fjy.spring.domain.VWorkDetail; +import com.fjy.spring.repository.HomeworkRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class HomeworkService { + @Autowired + private HomeworkRepository homeworkRepository; + + public List findAll(){ + return homeworkRepository.findAll(); + } +} diff --git a/src/main/java/com/fjy/spring/service/WorkDetailService.java b/src/main/java/com/fjy/spring/service/WorkDetailService.java new file mode 100644 index 0000000..ae53e82 --- /dev/null +++ b/src/main/java/com/fjy/spring/service/WorkDetailService.java @@ -0,0 +1,18 @@ +package com.fjy.spring.service; + +import com.fjy.spring.domain.VWorkDetail; +import com.fjy.spring.repository.WorkDetailRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WorkDetailService { + @Autowired + private WorkDetailRepository workDetailRepository; + + public List findAll(){ + return workDetailRepository.findAll(); + } +} diff --git a/src/main/resources/static/js/homePage.js b/src/main/resources/static/js/homePage.js index 5373dec..2c4dcd4 100644 --- a/src/main/resources/static/js/homePage.js +++ b/src/main/resources/static/js/homePage.js @@ -73,35 +73,7 @@ var Main = { activeName:'login', fileList: [], DownloadList: [], - tableHomeworkData: [{ - subject: '信息安全', - date: '2018-05-02', - name: '实验报告', - content: '实验报告', - remark:'3000字以上', - tempfile:'15251101238.docx' - }, { - subject: '信息安全', - date: '2018-05-02', - name: '实验报告', - content: '实验报告', - remark:'3000字以上', - tempfile:'15251101238.docx' - }, { - subject: '信息安全', - date: '2018-05-02', - name: '实验报告', - content: '实验报告', - remark:'3000字以上', - tempfile:'15251101238.docx' - }, { - subject: '信息安全', - date: '2018-05-02', - name: '实验报告', - content: '实验报告', - remark:'3000字以上', - tempfile:'15251101238.docx' - }], + tableHomeworkData: [], tableData2: [{ date: '2016-05-02', }, { @@ -137,6 +109,14 @@ var Main = { .catch(function (error) { console.log(error); }); + axios.get('http://localhost:8080/cms/home/findAllHomework') + .then(function (response) { + console.log(response.data); + that.tableHomeworkData = response.data; + }) + .catch(function (error) { + console.log(error); + }); }) }, diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html index d11166f..3d1855f 100644 --- a/src/main/resources/templates/home/home.html +++ b/src/main/resources/templates/home/home.html @@ -94,26 +94,14 @@ --> - - - 首页 - - - 选项1 - 选项2 - 选项3 - - 关于 - 意见反馈 - 登出 - - +
- 用户名
- 学号 + + 用户名
+
首页
@@ -123,7 +111,7 @@
- +
@@ -133,31 +121,30 @@ - + - + - +