diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java index bf79954..982c6d8 100644 --- a/src/main/java/com/fjy/spring/controller/DataController.java +++ b/src/main/java/com/fjy/spring/controller/DataController.java @@ -9,8 +9,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.List; +import static com.fjy.spring.constant.GlobalConstant.USER_SESSION_KEY; + @RestController public class DataController { @@ -38,6 +42,9 @@ public class DataController { @Autowired private VUserfileService vUserfileService; + @Resource + HttpServletRequest httpServletRequest; + @GetMapping("/home/findAllHomework") public List findAllHomework(){ List homeworks = workDetailService.findAll(); @@ -108,4 +115,10 @@ public class DataController { new UserException(ResultEnum.EMPTY_DATA); return null; } + + @GetMapping("/home/userinfo") + public VUserinfo findUserInfo(){ + TbUser user= (TbUser)httpServletRequest.getSession().getAttribute(USER_SESSION_KEY); + return userService.findUserInfo(user.getColuserid()); + } } diff --git a/src/main/java/com/fjy/spring/domain/VUserinfo.java b/src/main/java/com/fjy/spring/domain/VUserinfo.java new file mode 100644 index 0000000..e74a7cd --- /dev/null +++ b/src/main/java/com/fjy/spring/domain/VUserinfo.java @@ -0,0 +1,74 @@ +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_userinfo") +public class VUserinfo { + @Id + private Integer coluserid; + + private String colname; + + private String colemail; + + private String colstudentno; + + private String colrealname; + + public Integer getColuserid() { + return coluserid; + } + + public void setColuserid(Integer coluserid) { + this.coluserid = coluserid; + } + + public String getColname() { + return colname; + } + + public void setColname(String colname) { + this.colname = colname; + } + + + public String getColemail() { + return colemail; + } + + public void setColemail(String colemail) { + this.colemail = colemail; + } + + 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; + } + + @Override + public String toString() { + return "VUserinfo{" + + "coluserid=" + coluserid + + ", colname='" + colname + '\'' + + ", colemail='" + colemail + '\'' + + ", colstudentno='" + colstudentno + '\'' + + ", colrealname='" + colrealname + '\'' + + '}'; + } +} diff --git a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java index bd31d1c..f3f3ad8 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/VUserinfoRepository.java b/src/main/java/com/fjy/spring/repository/VUserinfoRepository.java new file mode 100644 index 0000000..ab656d2 --- /dev/null +++ b/src/main/java/com/fjy/spring/repository/VUserinfoRepository.java @@ -0,0 +1,8 @@ +package com.fjy.spring.repository; + +import com.fjy.spring.domain.VUserinfo; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface VUserinfoRepository extends JpaRepository { +} diff --git a/src/main/java/com/fjy/spring/service/UserService.java b/src/main/java/com/fjy/spring/service/UserService.java index 0a72e93..0331266 100644 --- a/src/main/java/com/fjy/spring/service/UserService.java +++ b/src/main/java/com/fjy/spring/service/UserService.java @@ -1,9 +1,11 @@ package com.fjy.spring.service; import com.fjy.spring.domain.TbUser; +import com.fjy.spring.domain.VUserinfo; import com.fjy.spring.enums.ResultEnum; import com.fjy.spring.exception.UserException; import com.fjy.spring.repository.TbUserRepository; +import com.fjy.spring.repository.VUserinfoRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +18,9 @@ public class UserService { @Autowired private TbUserRepository tbUserRepository; + @Autowired + private VUserinfoRepository vUserinfoRepository; + public TbUser doLoginService(String name,String password){ TbUser user = (TbUser)tbUserRepository.findByColname(name).get(); @@ -44,4 +49,8 @@ public class UserService { return tbUserRepository.findAll(); } + public VUserinfo findUserInfo(Integer coluserid){ + return vUserinfoRepository.findById(coluserid).get(); + } + } diff --git a/src/main/resources/static/js/user.js b/src/main/resources/static/js/user.js index 1dc7ed2..9b59769 100644 --- a/src/main/resources/static/js/user.js +++ b/src/main/resources/static/js/user.js @@ -14,6 +14,21 @@ function DateDiff(sDate1, sDate2){ //sDate1和sDate2是2002-12-18格式 } var Main = { data() { + var checkName = (rule, value, callback) => { + if (!value) { + return callback(new Error('用户名不能为空')); + } + }; + var checkNo = (rule, value, callback) => { + if (!value) { + return callback(new Error('学号不能为空')); + } + }; + var checkRealName = (rule, value, callback) => { + if (!value) { + return callback(new Error('真实姓名不能为空')); + } + }; var validatePass = (rule, value, callback) => { if (value === '') { callback(new Error('请输入密码')); @@ -34,7 +49,7 @@ var Main = { } }; return { - activeIndex: '1', + activeIndex: '2-1', ruleForm2: { coluserid:'', colname: '', @@ -45,9 +60,29 @@ var Main = { checkPass: '', }, rules2: { + colpassword: [ + {required: true,validator: validatePass, trigger: 'blur'} + ], checkPass: [ - { validator: validatePass2, trigger: 'blur'} - ] + {required: true,validator: validatePass2, trigger: 'blur'} + ], + colstudentno: [ + { + required: true, + validator: checkNo, + trigger: 'blur' + } + ], + colrealname: [ + { + required: true, + validator: checkRealName, + trigger: 'blur' + } + ], + colname: [ + {required: true,validator: checkName, trigger: 'blur'} + ], }, tableHomeworkData: [ { @@ -130,6 +165,19 @@ var Main = { onSubmit() { console.log('submit!'); } + }, + mounted() { + this.$nextTick(() => { + var that = this; + axios.get('http://localhost:8080/cms/home/userinfo') + .then(function (response) { + console.log(response.data); + that.ruleForm2 = response.data; + }) + .catch(function (error) { + console.log(error); + }); + }) } } var Ctor = Vue.extend(Main) diff --git a/src/main/resources/templates/home/user.html b/src/main/resources/templates/home/user.html index e4ea7c8..cf93b66 100644 --- a/src/main/resources/templates/home/user.html +++ b/src/main/resources/templates/home/user.html @@ -23,18 +23,18 @@ method="POST" name="register"> - + - + - + - + - + - +