diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 9396013..40af702 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -31,7 +31,6 @@ //获取当前设备列表 //TODO LIST getAllLOgs public List getAllLogs(String userName,String startTime,String endTime) { - try { Criteria criteria = createCriteria(PgLog.class); if (StringUtils.isNotBlank(userName)) { diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 9396013..40af702 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -31,7 +31,6 @@ //获取当前设备列表 //TODO LIST getAllLOgs public List getAllLogs(String userName,String startTime,String endTime) { - try { Criteria criteria = createCriteria(PgLog.class); if (StringUtils.isNotBlank(userName)) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java new file mode 100644 index 0000000..fdbc486 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -0,0 +1,103 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/23. + */ +@Component +@Path("pgInPerson") +public class PgInPgPersonRs { + + private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + + private PgInPgPersonManager pgInPgPersonManager; + + @Resource + public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { + this.pgInPgPersonManager = pgInPgPersonManager; + } + + /** + * 派发工作证（新增入廊记录） + */ + @POST + @Path("addInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map addInPgPerson(@FormParam("userName") String userName, + @FormParam("phoneNumber") String phoneNumber, + @FormParam("inTime") String inTime, + @FormParam("outTime") String outTime, + @FormParam("type") String type) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgInPgPerson pgInPgPerson=new PgInPgPerson(); + pgInPgPerson.setUserName(userName); + pgInPgPerson.setPhoneNumber(phoneNumber); + pgInPgPerson.setInTime(sdf.parse(inTime)); + pgInPgPerson.setOutTime(sdf.parse(outTime)); + pgInPgPerson.setType(type); + + pgInPgPersonManager.save(pgInPgPerson); + + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 获取人员信息列表 + */ + @POST + @Path("getInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPerson()throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + //pgLogDtoList = pgInPgPersonManager + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 9396013..40af702 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -31,7 +31,6 @@ //获取当前设备列表 //TODO LIST getAllLOgs public List getAllLogs(String userName,String startTime,String endTime) { - try { Criteria criteria = createCriteria(PgLog.class); if (StringUtils.isNotBlank(userName)) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java new file mode 100644 index 0000000..fdbc486 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -0,0 +1,103 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/23. + */ +@Component +@Path("pgInPerson") +public class PgInPgPersonRs { + + private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + + private PgInPgPersonManager pgInPgPersonManager; + + @Resource + public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { + this.pgInPgPersonManager = pgInPgPersonManager; + } + + /** + * 派发工作证（新增入廊记录） + */ + @POST + @Path("addInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map addInPgPerson(@FormParam("userName") String userName, + @FormParam("phoneNumber") String phoneNumber, + @FormParam("inTime") String inTime, + @FormParam("outTime") String outTime, + @FormParam("type") String type) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgInPgPerson pgInPgPerson=new PgInPgPerson(); + pgInPgPerson.setUserName(userName); + pgInPgPerson.setPhoneNumber(phoneNumber); + pgInPgPerson.setInTime(sdf.parse(inTime)); + pgInPgPerson.setOutTime(sdf.parse(outTime)); + pgInPgPerson.setType(type); + + pgInPgPersonManager.save(pgInPgPerson); + + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 获取人员信息列表 + */ + @POST + @Path("getInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPerson()throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + //pgLogDtoList = pgInPgPersonManager + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + +} diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index ea17a17..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 9396013..40af702 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -31,7 +31,6 @@ //获取当前设备列表 //TODO LIST getAllLOgs public List getAllLogs(String userName,String startTime,String endTime) { - try { Criteria criteria = createCriteria(PgLog.class); if (StringUtils.isNotBlank(userName)) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java new file mode 100644 index 0000000..fdbc486 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -0,0 +1,103 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/23. + */ +@Component +@Path("pgInPerson") +public class PgInPgPersonRs { + + private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + + private PgInPgPersonManager pgInPgPersonManager; + + @Resource + public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { + this.pgInPgPersonManager = pgInPgPersonManager; + } + + /** + * 派发工作证（新增入廊记录） + */ + @POST + @Path("addInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map addInPgPerson(@FormParam("userName") String userName, + @FormParam("phoneNumber") String phoneNumber, + @FormParam("inTime") String inTime, + @FormParam("outTime") String outTime, + @FormParam("type") String type) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgInPgPerson pgInPgPerson=new PgInPgPerson(); + pgInPgPerson.setUserName(userName); + pgInPgPerson.setPhoneNumber(phoneNumber); + pgInPgPerson.setInTime(sdf.parse(inTime)); + pgInPgPerson.setOutTime(sdf.parse(outTime)); + pgInPgPerson.setType(type); + + pgInPgPersonManager.save(pgInPgPerson); + + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 获取人员信息列表 + */ + @POST + @Path("getInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPerson()throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + //pgLogDtoList = pgInPgPersonManager + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + +} diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index ea17a17..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" new file mode 100644 index 0000000..d13a45e --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 9396013..40af702 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -31,7 +31,6 @@ //获取当前设备列表 //TODO LIST getAllLOgs public List getAllLogs(String userName,String startTime,String endTime) { - try { Criteria criteria = createCriteria(PgLog.class); if (StringUtils.isNotBlank(userName)) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java new file mode 100644 index 0000000..fdbc486 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -0,0 +1,103 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/23. + */ +@Component +@Path("pgInPerson") +public class PgInPgPersonRs { + + private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + + private PgInPgPersonManager pgInPgPersonManager; + + @Resource + public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { + this.pgInPgPersonManager = pgInPgPersonManager; + } + + /** + * 派发工作证（新增入廊记录） + */ + @POST + @Path("addInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map addInPgPerson(@FormParam("userName") String userName, + @FormParam("phoneNumber") String phoneNumber, + @FormParam("inTime") String inTime, + @FormParam("outTime") String outTime, + @FormParam("type") String type) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgInPgPerson pgInPgPerson=new PgInPgPerson(); + pgInPgPerson.setUserName(userName); + pgInPgPerson.setPhoneNumber(phoneNumber); + pgInPgPerson.setInTime(sdf.parse(inTime)); + pgInPgPerson.setOutTime(sdf.parse(outTime)); + pgInPgPerson.setType(type); + + pgInPgPersonManager.save(pgInPgPerson); + + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 获取人员信息列表 + */ + @POST + @Path("getInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPerson()throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + //pgLogDtoList = pgInPgPersonManager + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + +} diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index ea17a17..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" new file mode 100644 index 0000000..d13a45e --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" deleted file mode 100644 index cceca53..0000000 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a2d1bcd..a31c37a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -45,50 +36,63 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +129,12 @@ @@ -218,6 +228,21 @@ + + + + + + + + + + + @@ -253,10 +278,6 @@ @@ -276,59 +297,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -384,7 +361,7 @@ - - - - - - - - - - - @@ -888,7 +846,8 @@ - + + 1510219102698 @@ -934,11 +893,15 @@ 1521168093758 1521168093758 - - @@ -973,7 +936,7 @@ - + @@ -986,7 +949,7 @@ - + @@ -1027,11 +990,12 @@ - - @@ -1039,69 +1003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1179,20 +1080,6 @@ - - - - - - - - - - - - - - @@ -1221,13 +1108,6 @@ - - - - - - - @@ -1235,30 +1115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1319,7 +1175,6 @@ - @@ -1354,13 +1209,6 @@ - - - - - - - @@ -1381,7 +1229,6 @@ - @@ -1389,7 +1236,6 @@ - @@ -1401,40 +1247,151 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java new file mode 100644 index 0000000..0e524f4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/22. + */ +@Entity +@Table(name = "PG_INPG_PERSON") +@SequenceGenerator(name = "SEQ_PG_INPG_PERSON_ID", sequenceName = "SEQ_PG_INPG_PERSON_ID",allocationSize=1,initialValue=1) +public class PgInPgPerson implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private String type;//人员类别 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "USERNAME") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @Column(name = "TYPE") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java new file mode 100644 index 0000000..b8eb791 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/22. + */ +public class PgInPgPersonDto implements Serializable { + + private String id; + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String inTime;//入廊时间 + private String outTime;//出廊时间 + private String type;//人员类别 + + private String inPgNums;//累计入廊次数 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getInPgNums() { + return inPgNums; + } + + public void setInPgNums(String inPgNums) { + this.inPgNums = inPgNums; + } + + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgPerson.getId())); + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setType(pgInPgPerson.getType()); + this.setInTime(sdf.format(pgInPgPerson.getInTime())); + this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java new file mode 100644 index 0000000..02b2ec3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -0,0 +1,28 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/22. + */ +@Service +public class PgInPgPersonManager extends HibernateEntityDao { + + public List getPgInPersonList() { + List pgInPgPersonDtoList=new ArrayList(); + Criteria criteria=createCriteria(PgInPgPersonDto.class); + criteria.addOrder(Order.desc("inTime")); + + pgInPgPersonDtoList=criteria.list(); + return pgInPgPersonDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 9396013..40af702 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -31,7 +31,6 @@ //获取当前设备列表 //TODO LIST getAllLOgs public List getAllLogs(String userName,String startTime,String endTime) { - try { Criteria criteria = createCriteria(PgLog.class); if (StringUtils.isNotBlank(userName)) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java new file mode 100644 index 0000000..fdbc486 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -0,0 +1,103 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/23. + */ +@Component +@Path("pgInPerson") +public class PgInPgPersonRs { + + private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + + private PgInPgPersonManager pgInPgPersonManager; + + @Resource + public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { + this.pgInPgPersonManager = pgInPgPersonManager; + } + + /** + * 派发工作证（新增入廊记录） + */ + @POST + @Path("addInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map addInPgPerson(@FormParam("userName") String userName, + @FormParam("phoneNumber") String phoneNumber, + @FormParam("inTime") String inTime, + @FormParam("outTime") String outTime, + @FormParam("type") String type) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgInPgPerson pgInPgPerson=new PgInPgPerson(); + pgInPgPerson.setUserName(userName); + pgInPgPerson.setPhoneNumber(phoneNumber); + pgInPgPerson.setInTime(sdf.parse(inTime)); + pgInPgPerson.setOutTime(sdf.parse(outTime)); + pgInPgPerson.setType(type); + + pgInPgPersonManager.save(pgInPgPerson); + + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 获取人员信息列表 + */ + @POST + @Path("getInPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPerson()throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + //pgLogDtoList = pgInPgPersonManager + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + +} diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index ea17a17..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" new file mode 100644 index 0000000..d13a45e --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" deleted file mode 100644 index cceca53..0000000 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" new file mode 100644 index 0000000..8026a56 --- /dev/null +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ