From 3abbd49f65205c0291140253ec6361b956744fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Thu, 22 Feb 2018 22:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=90=8E=E5=8F=B0=E5=AF=B9?= =?UTF-8?q?=E6=9C=AA=E4=BA=A4=E4=BD=9C=E4=B8=9A=E4=BA=BA=E5=91=98=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fjy/spring/controller/DataController.java | 4 +- .../com/fjy/spring/domain/TbStudentlist.java | 48 +++++++++++++++++ .../fjy/spring/interceptor/WebAppConfig.java | 2 +- .../spring/repository/TbFileRepository.java | 1 - .../repository/VUserfileRepository.java | 5 ++ .../com/fjy/spring/service/FileService.java | 1 + .../fjy/spring/service/VUserfileService.java | 5 ++ src/main/resources/static/js/managecourse.js | 53 ++++++++++++++++++- .../templates/home/managecourse.html | 11 ++-- 9 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/fjy/spring/domain/TbStudentlist.java diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java index 3b675e7..bf79954 100644 --- a/src/main/java/com/fjy/spring/controller/DataController.java +++ b/src/main/java/com/fjy/spring/controller/DataController.java @@ -99,9 +99,9 @@ public class DataController { } @GetMapping("/home/findStudentInCourseFile") - public List findStudentInCourseFile( + public List findStudentInCourseFile( @RequestParam(value = "Folder") String Folder,@RequestParam(value = "CourseName") String CourseName){ - List files = vUserfileService.findByWorkFolderAndCourseName(Folder,CourseName); + List files = vUserfileService.findStudentNoByWorkFolderAndCourseName(Folder,CourseName); if (files!=null){ return files; } diff --git a/src/main/java/com/fjy/spring/domain/TbStudentlist.java b/src/main/java/com/fjy/spring/domain/TbStudentlist.java new file mode 100644 index 0000000..6a00957 --- /dev/null +++ b/src/main/java/com/fjy/spring/domain/TbStudentlist.java @@ -0,0 +1,48 @@ +package com.fjy.spring.domain; + +import javax.persistence.Entity; +import javax.persistence.Id; + +@Entity +public class TbStudentlist { + @Id + private Integer listid; + + private String colstudentno; + + private String colrealname; + + private String sex; + + public Integer getListid() { + return listid; + } + + public void setListid(Integer listid) { + this.listid = listid; + } + + public String getColstudentno() { + return colstudentno; + } + + public void setColstudentno(String colstudentno) { + this.colstudentno = colstudentno; + } + + public String getColrealname() { + return colrealname; + } + + public void setColrealname(String colrealname) { + this.colrealname = colrealname; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } +} 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/TbFileRepository.java b/src/main/java/com/fjy/spring/repository/TbFileRepository.java index a6c53e3..7e972e6 100644 --- a/src/main/java/com/fjy/spring/repository/TbFileRepository.java +++ b/src/main/java/com/fjy/spring/repository/TbFileRepository.java @@ -4,7 +4,6 @@ import com.fjy.spring.domain.TbFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -import java.util.Optional; public interface TbFileRepository extends JpaRepository{ public List findByColfilename(String name); diff --git a/src/main/java/com/fjy/spring/repository/VUserfileRepository.java b/src/main/java/com/fjy/spring/repository/VUserfileRepository.java index b745ff5..a6bd862 100644 --- a/src/main/java/com/fjy/spring/repository/VUserfileRepository.java +++ b/src/main/java/com/fjy/spring/repository/VUserfileRepository.java @@ -1,12 +1,17 @@ package com.fjy.spring.repository; +import com.fjy.spring.domain.TbStudentlist; import com.fjy.spring.domain.VUserfile; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import java.util.List; public interface VUserfileRepository extends JpaRepository { public List findByWorkFolderAndCourseName(String workFolder,String courseName); + + @Query(value = "SELECT l FROM TbStudentlist l WHERE l.colstudentno NOT IN ( SELECT colstudentno FROM VUserfile f WHERE f.workFolder = ?1 AND f.courseName = ?2 )") + public List findStudentNoByWorkFolderAndCourseName(String workFolder, String courseName); } diff --git a/src/main/java/com/fjy/spring/service/FileService.java b/src/main/java/com/fjy/spring/service/FileService.java index 696778f..d6894d5 100644 --- a/src/main/java/com/fjy/spring/service/FileService.java +++ b/src/main/java/com/fjy/spring/service/FileService.java @@ -1,6 +1,7 @@ package com.fjy.spring.service; import com.fjy.spring.domain.TbFile; +import com.fjy.spring.domain.VUserfile; import com.fjy.spring.repository.TbFileRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/fjy/spring/service/VUserfileService.java b/src/main/java/com/fjy/spring/service/VUserfileService.java index c458d02..ee0ee58 100644 --- a/src/main/java/com/fjy/spring/service/VUserfileService.java +++ b/src/main/java/com/fjy/spring/service/VUserfileService.java @@ -1,5 +1,6 @@ package com.fjy.spring.service; +import com.fjy.spring.domain.TbStudentlist; import com.fjy.spring.domain.VUserfile; import com.fjy.spring.repository.VUserfileRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -15,4 +16,8 @@ public class VUserfileService { public List findByWorkFolderAndCourseName(String workFolder, String courseName) { return vUserfileRepository.findByWorkFolderAndCourseName(workFolder, courseName); } + + public List findStudentNoByWorkFolderAndCourseName(String workFolder, String courseName){ + return vUserfileRepository.findStudentNoByWorkFolderAndCourseName(workFolder,courseName); + } } \ No newline at end of file diff --git a/src/main/resources/static/js/managecourse.js b/src/main/resources/static/js/managecourse.js index b7ba991..c8ae308 100644 --- a/src/main/resources/static/js/managecourse.js +++ b/src/main/resources/static/js/managecourse.js @@ -1,6 +1,9 @@ var Main = { data() { return { + restaurants: [], + state1: '', + state2: '', activeIndex: '1', formInline: { user: '', @@ -61,8 +64,40 @@ var Main = { } }) }, - handleSelect(key, keyPath) { - console.log(key, keyPath); + querySearch(queryString, cb) { + var restaurants = this.restaurants; + var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants; + // 调用 callback 返回建议列表的数据 + cb(results); + }, + createFilter(queryString) { + return (restaurant) => { + return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0); + }; + }, + loadAll() { + return [ + { "value": "三全鲜食（北新泾店）", "address": "长宁区新渔路144号" }, + { "value": "Hot honey 首尔炸鸡（仙霞路）", "address": "上海市长宁区淞虹路661号" }, + { "value": "南拳妈妈龙虾盖浇饭", "address": "普陀区金沙江路1699号鑫乐惠美食广场A13" } + ]; + }, + querySearchAsync(queryString, cb) { + var restaurants = this.restaurants; + var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants; + + clearTimeout(this.timeout); + this.timeout = setTimeout(() => { + cb(results); + }, 1000 * Math.random()); + }, + createStateFilter(queryString) { + return (state) => { + return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0); + }; + }, + handleSelect(item) { + console.log(item); }, ClickToJump(targe){ window.location.href="http://localhost:8080/cms/home/" + targe; @@ -83,6 +118,20 @@ var Main = { onSubmit() { console.log('submit!'); } + }, + mounted() { + /*this.restaurants = this.loadAll();*/ + this.restaurants=this.$nextTick(() => { + var that = this; + axios.get('http://localhost:8080/cms/home/findvcourse') + .then(function (response) { + console.log(response.data); + that.logData = response.data; + }) + .catch(function (error) { + console.log(error); + }); + }) } } var Ctor = Vue.extend(Main) diff --git a/src/main/resources/templates/home/managecourse.html b/src/main/resources/templates/home/managecourse.html index 7c1110f..37896bd 100644 --- a/src/main/resources/templates/home/managecourse.html +++ b/src/main/resources/templates/home/managecourse.html @@ -47,13 +47,14 @@

添加课程

- + - - - - + 添加