Skip to content

T
tjmdp
Commit 26c88306 authored by liuchao's avatar liuchao
Browse files
Options

no message

parent add91184
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 240 deletions
pom.xml
View file @ 26c88306
......@@ -209,6 +209,13 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.20</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
......
src/main/java/com/qiankun/controller/UserController.java
View file @ 26c88306
......@@ -9,7 +9,6 @@ import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.ResourceBundle;
import java.util.Set;
......@@ -51,22 +50,13 @@ public class UserController extends BaseController<Object>{
}
@Auth(verifyLogin = false, verifyURL = false)
@RequestMapping("/")
@RequestMapping("/login")
public ModelAndView login() throws Exception {
ModelAndView t_view = new ModelAndView();
t_view.setViewName("index");
t_view.setViewName("login");
return t_view;
}
@Auth(verifyLogin = false, verifyURL = false)
@RequestMapping("/match")
public ModelAndView match() throws Exception {
ModelAndView t_view = new ModelAndView();
t_view.setViewName("match");
return t_view;
}
@Auth(verifyLogin = false, verifyURL = false)
@RequestMapping("/api/user/save")
public ModelAndView saveUser(UserVo userVo, HttpServletResponse response, HttpServletRequest request) throws Exception {
......@@ -89,12 +79,11 @@ public class UserController extends BaseController<Object>{
return view;
}
user.setContacts(userVo.getContacts());
user.setGroups(userVo.getGroups());
user.setMobile(userVo.getMobile());
user.setPwd(MD5.digest(userVo.getPwd()));
user.setUserName(userVo.getUserName());
user.setTeamName(userVo.getTeamName());
user.setEmail(userVo.getEmail());
Date date = new Date();
user.setCreateTime(date);
......@@ -142,34 +131,7 @@ public class UserController extends BaseController<Object>{
user.setUserName(userVo.getUserName());
user.setTeamName(userVo.getTeamName());
user.setEmail(userVo.getEmail());
user.setContacts(userVo.getContacts());
user.setTeacher(userVo.getTeacher());
user.setTeacherEmail(userVo.getTeacherEmail());
user.setTeacherTel(userVo.getTeacherTel());
user.setMemberName1(userVo.getMemberName1());
user.setMemberEmail1(userVo.getMemberEmail1());
user.setMemberTel1(userVo.getMemberTel1());
user.setMemberGender1(userVo.getMemberGender1());
user.setMemberGrade1(userVo.getMemberGrade1());
user.setMemberName2(userVo.getMemberName2());
user.setMemberEmail2(userVo.getMemberEmail2());
user.setMemberTel2(userVo.getMemberTel2());
user.setMemberGender2(userVo.getMemberGender2());
user.setMemberGrade2(userVo.getMemberGrade2());
user.setMemberName3(userVo.getMemberName3());
user.setMemberEmail3(userVo.getMemberEmail3());
user.setMemberTel3(userVo.getMemberTel3());
user.setMemberGender3(userVo.getMemberGender3());
user.setMemberGrade3(userVo.getMemberGrade3());
user.setMemberName4(userVo.getMemberName4());
user.setMemberEmail4(userVo.getMemberEmail4());
user.setMemberTel4(userVo.getMemberTel4());
user.setMemberGender4(userVo.getMemberGender4());
user.setMemberGrade4(userVo.getMemberGrade4());
}
userService.save(user);
......@@ -199,8 +161,6 @@ public class UserController extends BaseController<Object>{
view.getModelMap().addAttribute("status", 0);
}
} else {
User user = userService.userLogin(mobile, pwd);
if (user != null) {
......
src/main/java/com/qiankun/controller/WebSiteController.java
View file @ 26c88306
......@@ -6,6 +6,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.qiankun.controller.base.BaseController;
import com.qiankun.service.UserService;
......@@ -25,10 +27,15 @@ public class WebSiteController extends BaseController<Object>{
@RequestMapping("/result")
public ModelAndView search(String userId, String userName) throws Exception {
public ModelAndView search(String content) throws Exception {
final UserService service = applicationContext.getBean(UserService.class);
ModelAndView t_view = new ModelAndView();
ObjectMapper mapper = new ObjectMapper();
JsonNode request = mapper.readTree(content);
String condition = request.get("condition").asText();
long interval = request.get("interval").asLong();
long businessId = request.get("business").asLong();
long startMs = request.get("start").asLong();
return t_view;
}
......
src/main/java/com/qiankun/entity/User.java
View file @ 26c88306
......@@ -35,38 +35,9 @@ public class User {
private String mobile; //手机
private String pwd; //密码
private String email;
private String groups; //组
private String role; //角色 1.管理员 2.志愿者 3.预注册用户
private String memberName1; //成员姓名
private String memberGender1; //成员性别
private String memberTel1; //成员电话
private String memberEmail1; //成员邮箱
private String memberGrade1; //成员年级专业
private String memberName2; //成员姓名
private String memberGender2; //成员性别
private String memberTel2; //成员电话
private String memberEmail2; //成员邮箱
private String memberGrade2; //成员年级专业
private String memberName3; //成员姓名
private String memberGender3; //成员性别
private String memberTel3; //成员电话
private String memberEmail3; //成员邮箱
private String memberGrade3; //成员年级专业
private String memberName4; //成员姓名
private String memberGender4; //成员性别
private String memberTel4; //成员电话
private String memberEmail4; //成员邮箱
private String memberGrade4; //成员年级专业
private String teacher; //指导老师
private String teacherTel;
private String teacherEmail;
private String contacts; //联系人
private String achievement; //成绩
private Date createTime = new Date();
@OneToMany(fetch = FetchType.LAZY, cascade = { CascadeType.ALL}, orphanRemoval = true, mappedBy = "user")
......@@ -105,23 +76,23 @@ public class User {
public void setPwd(String pwd) {
this.pwd = pwd;
}
public String getTeacher() {
return teacher;
public String getTeamName() {
return teamName;
}
public void setTeacher(String teacher) {
this.teacher = teacher;
public void setTeamName(String teamName) {
this.teamName = teamName;
}
public String getContacts() {
return contacts;
public String getEmail() {
return email;
}
public void setContacts(String contacts) {
this.contacts = contacts;
public void setEmail(String email) {
this.email = email;
}
public String getAchievement() {
return achievement;
public String getRole() {
return role;
}
public void setAchievement(String achievement) {
this.achievement = achievement;
public void setRole(String role) {
this.role = role;
}
public Date getCreateTime() {
return createTime;
......@@ -129,12 +100,6 @@ public class User {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getGroups() {
return groups;
}
public void setGroups(String groups) {
this.groups = groups;
}
public Set<Product> getProduct() {
return product;
}
......@@ -147,150 +112,6 @@ public class User {
public void setIsRemove(Boolean isRemove) {
this.isRemove = isRemove;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getTeamName() {
return teamName;
}
public void setTeamName(String teamName) {
this.teamName = teamName;
}
public String getMemberName1() {
return memberName1;
}
public void setMemberName1(String memberName1) {
this.memberName1 = memberName1;
}
public String getMemberGender1() {
return memberGender1;
}
public void setMemberGender1(String memberGender1) {
this.memberGender1 = memberGender1;
}
public String getMemberTel1() {
return memberTel1;
}
public void setMemberTel1(String memberTel1) {
this.memberTel1 = memberTel1;
}
public String getMemberEmail1() {
return memberEmail1;
}
public void setMemberEmail1(String memberEmail1) {
this.memberEmail1 = memberEmail1;
}
public String getMemberGrade1() {
return memberGrade1;
}
public void setMemberGrade1(String memberGrade1) {
this.memberGrade1 = memberGrade1;
}
public String getMemberName2() {
return memberName2;
}
public void setMemberName2(String memberName2) {
this.memberName2 = memberName2;
}
public String getMemberGender2() {
return memberGender2;
}
public void setMemberGender2(String memberGender2) {
this.memberGender2 = memberGender2;
}
public String getMemberTel2() {
return memberTel2;
}
public void setMemberTel2(String memberTel2) {
this.memberTel2 = memberTel2;
}
public String getMemberEmail2() {
return memberEmail2;
}
public void setMemberEmail2(String memberEmail2) {
this.memberEmail2 = memberEmail2;
}
public String getMemberGrade2() {
return memberGrade2;
}
public void setMemberGrade2(String memberGrade2) {
this.memberGrade2 = memberGrade2;
}
public String getMemberName3() {
return memberName3;
}
public void setMemberName3(String memberName3) {
this.memberName3 = memberName3;
}
public String getMemberGender3() {
return memberGender3;
}
public void setMemberGender3(String memberGender3) {
this.memberGender3 = memberGender3;
}
public String getMemberTel3() {
return memberTel3;
}
public void setMemberTel3(String memberTel3) {
this.memberTel3 = memberTel3;
}
public String getMemberEmail3() {
return memberEmail3;
}
public void setMemberEmail3(String memberEmail3) {
this.memberEmail3 = memberEmail3;
}
public String getMemberGrade3() {
return memberGrade3;
}
public void setMemberGrade3(String memberGrade3) {
this.memberGrade3 = memberGrade3;
}
public String getMemberName4() {
return memberName4;
}
public void setMemberName4(String memberName4) {
this.memberName4 = memberName4;
}
public String getMemberGender4() {
return memberGender4;
}
public void setMemberGender4(String memberGender4) {
this.memberGender4 = memberGender4;
}
public String getMemberTel4() {
return memberTel4;
}
public void setMemberTel4(String memberTel4) {
this.memberTel4 = memberTel4;
}
public String getMemberEmail4() {
return memberEmail4;
}
public void setMemberEmail4(String memberEmail4) {
this.memberEmail4 = memberEmail4;
}
public String getMemberGrade4() {
return memberGrade4;
}
public void setMemberGrade4(String memberGrade4) {
this.memberGrade4 = memberGrade4;
}
public String getTeacherTel() {
return teacherTel;
}
public void setTeacherTel(String teacherTel) {
this.teacherTel = teacherTel;
}
public String getTeacherEmail() {
return teacherEmail;
}
public void setTeacherEmail(String teacherEmail) {
this.teacherEmail = teacherEmail;
}
......
src/main/webapp/WEB-INF/decorators.xml
View file @ 26c88306
......@@ -13,7 +13,8 @@
</decorator>
<excludes>
<pattern>/api/product/download*</pattern>
<pattern>/api/*</pattern>
<pattern>/login</pattern>
</excludes>
</decorators>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment