diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d28b45..499c04c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,19 +8,11 @@ - - - - + - - - - - - + @@ -35,41 +27,42 @@ - - - + + + - - - + + + - + - + - - + + - + + @@ -79,31 +72,18 @@ - + - - + + - - - - - - - - - - - - - - - + + @@ -111,17 +91,20 @@ - - + + - - + + - - + + + + + @@ -186,8 +169,10 @@ @@ -234,7 +219,6 @@ - @@ -304,16 +288,6 @@ - - - - - - - - - - @@ -327,6 +301,7 @@ + @@ -459,7 +434,8 @@ - + + 1564361618083 @@ -475,16 +451,24 @@ - - + - + @@ -495,7 +479,7 @@ - + @@ -565,14 +549,15 @@ - file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java - 29 + 39 @@ -580,30 +565,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -618,13 +579,6 @@ - - - - - - - @@ -751,13 +705,6 @@ - - - - - - - @@ -877,13 +824,6 @@ - - - - - - - @@ -891,31 +831,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -930,10 +845,103 @@ - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index e0cfa5f..8b0e269 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -10,6 +10,7 @@ */ public class PgInPgInfoDto{ + private Long personId; private String userName;//入廊人员 private String phoneNumber;//联系方式 private String userCode;//人员编号 @@ -20,6 +21,14 @@ private String outTime;//出廊时间 private String inPgNum;//入廊次数 + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + public String getUserName() { return userName; } @@ -95,6 +104,7 @@ public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setPersonId(pgInPgPerson.getId()); this.setUserName(pgInPgPerson.getUserName()); this.setUserCode(pgInPgPerson.getUserCode()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d28b45..499c04c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,19 +8,11 @@ - - - - + - - - - - - + @@ -35,41 +27,42 @@ - - - + + + - - - + + + - + - + - - + + - + + @@ -79,31 +72,18 @@ - + - - + + - - - - - - - - - - - - - - - + + @@ -111,17 +91,20 @@ - - + + - - + + - - + + + + + @@ -186,8 +169,10 @@ @@ -234,7 +219,6 @@ - @@ -304,16 +288,6 @@ - - - - - - - - - - @@ -327,6 +301,7 @@ + @@ -459,7 +434,8 @@ - + + 1564361618083 @@ -475,16 +451,24 @@ - - + - + @@ -495,7 +479,7 @@ - + @@ -565,14 +549,15 @@ - file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java - 29 + 39 @@ -580,30 +565,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -618,13 +579,6 @@ - - - - - - - @@ -751,13 +705,6 @@ - - - - - - - @@ -877,13 +824,6 @@ - - - - - - - @@ -891,31 +831,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -930,10 +845,103 @@ - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index e0cfa5f..8b0e269 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -10,6 +10,7 @@ */ public class PgInPgInfoDto{ + private Long personId; private String userName;//入廊人员 private String phoneNumber;//联系方式 private String userCode;//人员编号 @@ -20,6 +21,14 @@ private String outTime;//出廊时间 private String inPgNum;//入廊次数 + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + public String getUserName() { return userName; } @@ -95,6 +104,7 @@ public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setPersonId(pgInPgPerson.getId()); this.setUserName(pgInPgPerson.getUserName()); this.setUserCode(pgInPgPerson.getUserCode()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java index 9ecf4a1..865ae88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -89,7 +89,7 @@ this.setDepartment(pgUser.getDepartment()); this.setPhoneNumber(pgUser.getPhoneNumber()); this.setPost(pgUser.getPost()); - this.setActive(String.valueOf(pgUser.getActive())); + //this.setActive(String.valueOf(pgUser.getActive())); if(pgUser.getRoleId()==null) this.setRole(""); else diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java index cb42943..8d58eda 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -62,14 +62,18 @@ return null; } - public boolean signIn(String userName,String passWord){ + public PgUserDto signIn(String userName,String passWord){ - String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1"; + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("passWord", passWord)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); - Object object=this.getSession().createSQLQuery(sql).list(); - - if(String.valueOf(((List) object).get(0)).equals(passWord)) return true; - else return false; + if (pgUserList != null && pgUserList.size() > 0) + return new PgUserDto(pgUserList.get(0),pgRoleManager); + else + return null; } } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d28b45..499c04c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,19 +8,11 @@ - - - - + - - - - - - + @@ -35,41 +27,42 @@ - - - + + + - - - + + + - + - + - - + + - + + @@ -79,31 +72,18 @@ - + - - + + - - - - - - - - - - - - - - - + + @@ -111,17 +91,20 @@ - - + + - - + + - - + + + + + @@ -186,8 +169,10 @@ @@ -234,7 +219,6 @@ - @@ -304,16 +288,6 @@ - - - - - - - - - - @@ -327,6 +301,7 @@ + @@ -459,7 +434,8 @@ - + + 1564361618083 @@ -475,16 +451,24 @@ - - + - + @@ -495,7 +479,7 @@ - + @@ -565,14 +549,15 @@ - file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java - 29 + 39 @@ -580,30 +565,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -618,13 +579,6 @@ - - - - - - - @@ -751,13 +705,6 @@ - - - - - - - @@ -877,13 +824,6 @@ - - - - - - - @@ -891,31 +831,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -930,10 +845,103 @@ - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index e0cfa5f..8b0e269 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -10,6 +10,7 @@ */ public class PgInPgInfoDto{ + private Long personId; private String userName;//入廊人员 private String phoneNumber;//联系方式 private String userCode;//人员编号 @@ -20,6 +21,14 @@ private String outTime;//出廊时间 private String inPgNum;//入廊次数 + public Long getPersonId() { + return personId; + } + + public void setPersonId(Long personId) { + this.personId = personId; + } + public String getUserName() { return userName; } @@ -95,6 +104,7 @@ public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setPersonId(pgInPgPerson.getId()); this.setUserName(pgInPgPerson.getUserName()); this.setUserCode(pgInPgPerson.getUserCode()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java index 9ecf4a1..865ae88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -89,7 +89,7 @@ this.setDepartment(pgUser.getDepartment()); this.setPhoneNumber(pgUser.getPhoneNumber()); this.setPost(pgUser.getPost()); - this.setActive(String.valueOf(pgUser.getActive())); + //this.setActive(String.valueOf(pgUser.getActive())); if(pgUser.getRoleId()==null) this.setRole(""); else diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java index cb42943..8d58eda 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -62,14 +62,18 @@ return null; } - public boolean signIn(String userName,String passWord){ + public PgUserDto signIn(String userName,String passWord){ - String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1"; + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("passWord", passWord)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); - Object object=this.getSession().createSQLQuery(sql).list(); - - if(String.valueOf(((List) object).get(0)).equals(passWord)) return true; - else return false; + if (pgUserList != null && pgUserList.size() > 0) + return new PgUserDto(pgUserList.get(0),pgRoleManager); + else + return null; } } diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java index 10aff34..73895f5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -206,18 +206,17 @@ String result=""; try{ - if(pgUserManager.signIn(userName,passWord)==true) - { - msg="登录成功"; - result="true"; - } + PgUserDto pgUserDto=pgUserManager.signIn(userName,passWord); + + if(pgUserDto==null) + msg="false"; else { - msg="登录失败"; - result="false"; + msg="true"; + result=pgUserDto.getRole(); } } catch(Exception e){ - msg="登陆失败"; + msg="false"; e.printStackTrace(); } diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml index b728ef5..afc896c 100644 --- a/src/main/resources/spring/taskConfig-applicationContext.xml +++ b/src/main/resources/spring/taskConfig-applicationContext.xml @@ -13,11 +13,13 @@ +