实现作业获取和展示

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<VWorkDetail> findAllHomework(){
+        List<VWorkDetail> homeworks = workDetailService.findAll();
+        if (homeworks!=null){
+            return homeworks;
+        }
+        new UserException(ResultEnum.EMPTY_DATA);
+        return null;
+    }
+}

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);

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

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() {
+    public Integer getId() {
-        return workId;
+        return Id;
     }
 
-    public void setWorkId(Integer workId) {
+    public void setId(Integer id) {
-        this.workId = workId;
+        Id = id;
     }
 
-    public String getWorkName() {
+    public String getName() {
-        return workName;
+        return Name;
     }
 
-    public void setWorkName(String workName) {
+    public void setName(String name) {
-        this.workName = workName;
+        Name = name;
     }
 
-    public Timestamp getWorkTime() {
+    public String getTime() {
-        return workTime;
+        return Time;
     }
 
-    public void setWorkTime(Timestamp workTime) {
+    public void setTime(String time) {
-        this.workTime = workTime;
+        Time = time;
     }
 
     public Integer getFileid() {
@@ -55,12 +60,12 @@ public class Homework {
         this.fileid = fileid;
     }
 
-    public String getWorkFolder() {
+    public String getFolder() {
-        return workFolder;
+        return Folder;
     }
 
-    public void setWorkFolder(String workFolder) {
+    public void setFolder(String folder) {
-        this.workFolder = workFolder;
+        Folder = folder;
     }
 
     public Integer getCourseNo() {
@@ -71,11 +76,11 @@ public class Homework {
         this.courseNo = courseNo;
     }
 
-    public String getWorkRemark() {
+    public String getRemark() {
-        return workRemark;
+        return Remark;
     }
 
-    public void setWorkRemark(String workRemark) {
+    public void setRemark(String remark) {
-        this.workRemark = workRemark;
+        Remark = remark;
     }
 }

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

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;

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

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

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

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

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

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;

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 {
 
     /**

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<Homework,Integer> {
 
+public interface HomeworkRepository extends JpaRepository<Homework,Integer> {
 }

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<VWorkDetail,Integer> {
+}

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<Homework> findAll(){
+        return homeworkRepository.findAll();
+    }
+}

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<VWorkDetail> findAll(){
+        return workDetailRepository.findAll();
+    }
+}

src/main/resources/static/js/homePage.js

@@ -73,35 +73,7 @@ var Main = {
             activeName:'login',
             fileList: [],
             DownloadList: [],
-            tableHomeworkData: [{
+            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'
-            }],
             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);
+                });
         })
 
     },

src/main/resources/templates/home/home.html

@@ -94,26 +94,14 @@
         </el-aside>-->
 
         <el-container>
-            <el-header>
+            <el-header th:include="dist/thymeleaf/layout :: header"></el-header>
-                <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
-                    <el-menu-item index="1">首页</el-menu-item>
-                    <el-submenu index="2">
-                        <template slot="title">个人中心</template>
-                        <el-menu-item index="2-1">选项1</el-menu-item>
-                        <el-menu-item index="2-2">选项2</el-menu-item>
-                        <el-menu-item index="2-3">选项3</el-menu-item>
-                    </el-submenu>
-                    <el-menu-item index="3" @click="ClickToJump('about')">关于</el-menu-item>
-                    <el-menu-item index="4" @click="ClickToJump('feedback')">意见反馈</el-menu-item>
-                    <el-menu-item index="5"><a href="login.jsp">登出</a></el-menu-item>
-                </el-menu>
-            </el-header>
             <el-main>
                 <el-col :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
                     <el-card class="box-card">
                         <div slot="header" class="clearfix">
-                            <span>用户名</span><br>
+                            <!--下面两行报错正常-->
-                            <span>学号</span>
+                            <span th:text="${#httpServletRequest.getSession().getAttribute('USER_SESSION').colname}">用户名</span><br>
+                            <span th:text="${#httpServletRequest.getSession().getAttribute('USER_SESSION').colstudentno}"></span>
                         </div>
                         <div class="item">
                             <el-button type="text" @click="ClickToJump('home')">首页</el-button><br>
@@ -123,7 +111,7 @@
                         </div>
                     </el-card>
                 </el-col>
-                <el-col :md="14" :lg="14" :xl="14" :sm="18" :xs="23" offset="1">
+                <el-col :md="14" :lg="14" :xl="14" :sm="18" :xs="23" offset=1>
                     <el-row>
                         <el-col :span="23">
                             <div class="grid-content bg-purple-dark">
@@ -133,31 +121,30 @@
                                             <template slot-scope="props">
                                                 <el-form label-position="left" inline class="demo-table-expand">
                                                     <el-form-item label="科目">
-                                                        <span>{{ props.row.subject }}</span>
+                                                        <span>{{ props.row.coursename }}</span>
-                                                    </el-form-item>
-                                                    <el-form-item label="作业名称">
-                                                        <span>{{ props.row.name }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="内容">
-                                                        <span>{{ props.row.name }}</span>
+                                                        <span>{{ props.row.workname }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="提交时间">
-                                                        <span>{{ props.row.date }}</span>
+                                                        <span>{{ props.row.worktime }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="特殊要求">
-                                                        <span>{{ props.row.remark }}</span>
+                                                        <span>{{ props.row.workremark }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="模板下载">
-                                                        <span>{{ props.row.tempfile }}</span>
+                                                        <el-button type="text" @click="handleDownload(props.row)">
+                                                            {{ props.row.colfilename }}
+                                                        </el-button>
                                                     </el-form-item>
                                                 </el-form>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column label="科目" prop="subject">
+                                        <el-table-column label="科目" prop="coursename">
                                         </el-table-column>
-                                        <el-table-column label="作业名称" prop="name">
+                                        <el-table-column label="内容" prop="workname">
                                         </el-table-column>
-                                        <el-table-column label="内容" prop="content">
+                                        <el-table-column label="提交时间" prop="worktime">
                                         </el-table-column>
                                         <el-table-column fixed="right" label="操作">
                                             <template slot-scope="scope">
@@ -248,7 +235,7 @@
                                         </el-table-column>
                                         <el-table-column prop="colfilesize" label="大小" width="80">
                                         </el-table-column>
-                                        <el-table-column prop="colip" label="地址">
+                                        <el-table-column prop="coltime" label="上传时间">
                                         </el-table-column>
                                         <el-table-column fixed="right" label="操作" width="150">
                                             <template slot-scope="scope">

src/main/resources/templates/home/home2.html

@@ -84,7 +84,7 @@
                         </div>
                     </el-card>
                 </el-col>
-                <el-col :md="14" :lg="14" :xl="14" :sm="18" :xs="23" offset="1">
+                <el-col :md="14" :lg="14" :xl="14" :sm="18" :xs="23" offset=1>
                     <el-row>
                         <el-col :span="23">
                             <div class="grid-content bg-purple-dark">
@@ -94,31 +94,30 @@
                                             <template slot-scope="props">
                                                 <el-form label-position="left" inline class="demo-table-expand">
                                                     <el-form-item label="科目">
-                                                        <span>{{ props.row.subject }}</span>
+                                                        <span>{{ props.row.coursename }}</span>
-                                                    </el-form-item>
-                                                    <el-form-item label="作业名称">
-                                                        <span>{{ props.row.name }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="内容">
-                                                        <span>{{ props.row.name }}</span>
+                                                        <span>{{ props.row.workname }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="提交时间">
-                                                        <span>{{ props.row.date }}</span>
+                                                        <span>{{ props.row.worktime }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="特殊要求">
-                                                        <span>{{ props.row.remark }}</span>
+                                                        <span>{{ props.row.workremark }}</span>
                                                     </el-form-item>
                                                     <el-form-item label="模板下载">
-                                                        <span>{{ props.row.tempfile }}</span>
+                                                        <el-button type="text" @click="handleDownload(props.row)">
+                                                            {{ props.row.colfilename }}
+                                                        </el-button>
                                                     </el-form-item>
                                                 </el-form>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column label="科目" prop="subject">
+                                        <el-table-column label="科目" prop="coursename">
                                         </el-table-column>
-                                        <el-table-column label="作业名称" prop="name">
+                                        <el-table-column label="内容" prop="workname">
                                         </el-table-column>
-                                        <el-table-column label="内容" prop="content">
+                                        <el-table-column label="提交时间" prop="worktime">
                                         </el-table-column>
                                         <el-table-column fixed="right" label="操作">
                                             <template slot-scope="scope">