diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ return pgInPgPersonDtoList; } - } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 3b808ec..03ef508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -128,9 +128,7 @@ @POST @Path("getInPgPersonByName") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByName(@FormParam("userName") String userName, - @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime) throws Exception { + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { Map resultMap = new HashMap(); String msg = ""; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 3b808ec..03ef508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -128,9 +128,7 @@ @POST @Path("getInPgPersonByName") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByName(@FormParam("userName") String userName, - @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime) throws Exception { + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { Map resultMap = new HashMap(); String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..e40ea8e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgLog; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import com.casic.PgInterface.patroler.dto.PgLogDto; import com.casic.PgInterface.patroler.manager.PgLogManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -28,7 +28,7 @@ private PgLogManager pgLogManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource public void setPgLogManager(PgLogManager pgLogManager) { @@ -36,7 +36,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } @@ -57,7 +57,7 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); + PgUser pgPatroler = new PgUser(); pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); pgLog.setPatrolerId(pgPatroler); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 3b808ec..03ef508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -128,9 +128,7 @@ @POST @Path("getInPgPersonByName") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByName(@FormParam("userName") String userName, - @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime) throws Exception { + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { Map resultMap = new HashMap(); String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..e40ea8e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgLog; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import com.casic.PgInterface.patroler.dto.PgLogDto; import com.casic.PgInterface.patroler.manager.PgLogManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -28,7 +28,7 @@ private PgLogManager pgLogManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource public void setPgLogManager(PgLogManager pgLogManager) { @@ -36,7 +36,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } @@ -57,7 +57,7 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); + PgUser pgPatroler = new PgUser(); pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); pgLog.setPatrolerId(pgPatroler); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java deleted file mode 100644 index aa2d1dc..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; -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.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgPatroler") -public class PgPatrolerRs { - - private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); - - private PgPatrolerManager pgPatrolerManager; - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - /** - * 显示人员列表 - */ - @POST - @Path("getPatrolerList") - @Produces(MediaType.APPLICATION_JSON) - public Map getPatrolerList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgPatrolerDtoList=new ArrayList(); - try { - pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); - if(pgPatrolerDtoList.size()==0) - msg="没有找到人员信息"; - else - msg="获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgPatrolerDtoList); - return resultMap; - } - - /** - * 新增人员 - */ - @POST - @Path("addPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map addPatroler(@FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - try { - - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - PgPatroler pgPatroler = new PgPatroler(); - - pgPatroler.setUserName(userName); - //String pass = StringUtils.getMD5(password); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatroler.setActive(1); - logger.info("成功保存"); - - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("success", result); - resultMap.put("msg", msg); - return resultMap; - } - - /** - * 编辑人员 - */ - @POST - @Path("editPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map editPartition(@FormParam("id") String id, - @FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber) throws Exception { - - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try { - /* - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - */ - PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id)); - pgPatroler.setUserName(userName); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "编辑成功"; - //} - } catch (Exception e) { - result = "false"; - msg = "编辑失败"; - e.printStackTrace(); - } - - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - - /** - * 删除信息 - */ - @POST - @Path("deletePatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map deleteDevice(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id)); - if(pgPatroler==null) { - msg = "不存在该人员信息"; - result="false"; - } - else - { - pgPatroler.setActive(0); - pgPatrolerManager.save(pgPatroler); - msg="删除人员成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="删除人员失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 3b808ec..03ef508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -128,9 +128,7 @@ @POST @Path("getInPgPersonByName") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByName(@FormParam("userName") String userName, - @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime) throws Exception { + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { Map resultMap = new HashMap(); String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..e40ea8e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgLog; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import com.casic.PgInterface.patroler.dto.PgLogDto; import com.casic.PgInterface.patroler.manager.PgLogManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -28,7 +28,7 @@ private PgLogManager pgLogManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource public void setPgLogManager(PgLogManager pgLogManager) { @@ -36,7 +36,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } @@ -57,7 +57,7 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); + PgUser pgPatroler = new PgUser(); pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); pgLog.setPatrolerId(pgPatroler); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java deleted file mode 100644 index aa2d1dc..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; -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.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgPatroler") -public class PgPatrolerRs { - - private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); - - private PgPatrolerManager pgPatrolerManager; - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - /** - * 显示人员列表 - */ - @POST - @Path("getPatrolerList") - @Produces(MediaType.APPLICATION_JSON) - public Map getPatrolerList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgPatrolerDtoList=new ArrayList(); - try { - pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); - if(pgPatrolerDtoList.size()==0) - msg="没有找到人员信息"; - else - msg="获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgPatrolerDtoList); - return resultMap; - } - - /** - * 新增人员 - */ - @POST - @Path("addPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map addPatroler(@FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - try { - - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - PgPatroler pgPatroler = new PgPatroler(); - - pgPatroler.setUserName(userName); - //String pass = StringUtils.getMD5(password); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatroler.setActive(1); - logger.info("成功保存"); - - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("success", result); - resultMap.put("msg", msg); - return resultMap; - } - - /** - * 编辑人员 - */ - @POST - @Path("editPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map editPartition(@FormParam("id") String id, - @FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber) throws Exception { - - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try { - /* - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - */ - PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id)); - pgPatroler.setUserName(userName); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "编辑成功"; - //} - } catch (Exception e) { - result = "false"; - msg = "编辑失败"; - e.printStackTrace(); - } - - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - - /** - * 删除信息 - */ - @POST - @Path("deletePatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map deleteDevice(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id)); - if(pgPatroler==null) { - msg = "不存在该人员信息"; - result="false"; - } - else - { - pgPatroler.setActive(0); - pgPatrolerManager.save(pgPatroler); - msg="删除人员成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="删除人员失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java new file mode 100644 index 0000000..7733e50 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgUserManager; +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.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgUser") +public class PgUserRs { + + private static Logger logger = LoggerFactory.getLogger(PgUserRs.class); + + private PgUserManager pgUserManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getUserList") + @Produces(MediaType.APPLICATION_JSON) + public Map getUserList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgUserDtoList=new ArrayList(); + try { + pgUserDtoList = pgUserManager.getAllUser(); + if(pgUserDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgUserDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addUser") + @Produces(MediaType.APPLICATION_JSON) + public Map addUser(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + PgUser pgUser = new PgUser(); + + pgUser.setUserName(userName); + //String pass = StringUtils.getMD5(password); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setActive(1); + logger.info("成功保存"); + + pgUserManager.save(pgUser); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editUser") + @Produces(MediaType.APPLICATION_JSON) + public Map editUser(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUserManager.save(pgUser); + result = "true"; + msg = "编辑成功"; + //} + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteUser") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteUser(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgUser pgUser= pgUserManager.get(Long.valueOf(id)); + if(pgUser==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgUser.setActive(0); + pgUserManager.save(pgUser); + msg="删除人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 3b808ec..03ef508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -128,9 +128,7 @@ @POST @Path("getInPgPersonByName") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByName(@FormParam("userName") String userName, - @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime) throws Exception { + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { Map resultMap = new HashMap(); String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..e40ea8e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgLog; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import com.casic.PgInterface.patroler.dto.PgLogDto; import com.casic.PgInterface.patroler.manager.PgLogManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -28,7 +28,7 @@ private PgLogManager pgLogManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource public void setPgLogManager(PgLogManager pgLogManager) { @@ -36,7 +36,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } @@ -57,7 +57,7 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); + PgUser pgPatroler = new PgUser(); pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); pgLog.setPatrolerId(pgPatroler); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java deleted file mode 100644 index aa2d1dc..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; -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.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgPatroler") -public class PgPatrolerRs { - - private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); - - private PgPatrolerManager pgPatrolerManager; - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - /** - * 显示人员列表 - */ - @POST - @Path("getPatrolerList") - @Produces(MediaType.APPLICATION_JSON) - public Map getPatrolerList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgPatrolerDtoList=new ArrayList(); - try { - pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); - if(pgPatrolerDtoList.size()==0) - msg="没有找到人员信息"; - else - msg="获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgPatrolerDtoList); - return resultMap; - } - - /** - * 新增人员 - */ - @POST - @Path("addPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map addPatroler(@FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - try { - - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - PgPatroler pgPatroler = new PgPatroler(); - - pgPatroler.setUserName(userName); - //String pass = StringUtils.getMD5(password); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatroler.setActive(1); - logger.info("成功保存"); - - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("success", result); - resultMap.put("msg", msg); - return resultMap; - } - - /** - * 编辑人员 - */ - @POST - @Path("editPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map editPartition(@FormParam("id") String id, - @FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber) throws Exception { - - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try { - /* - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - */ - PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id)); - pgPatroler.setUserName(userName); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "编辑成功"; - //} - } catch (Exception e) { - result = "false"; - msg = "编辑失败"; - e.printStackTrace(); - } - - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - - /** - * 删除信息 - */ - @POST - @Path("deletePatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map deleteDevice(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id)); - if(pgPatroler==null) { - msg = "不存在该人员信息"; - result="false"; - } - else - { - pgPatroler.setActive(0); - pgPatrolerManager.save(pgPatroler); - msg="删除人员成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="删除人员失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java new file mode 100644 index 0000000..7733e50 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgUserManager; +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.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgUser") +public class PgUserRs { + + private static Logger logger = LoggerFactory.getLogger(PgUserRs.class); + + private PgUserManager pgUserManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getUserList") + @Produces(MediaType.APPLICATION_JSON) + public Map getUserList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgUserDtoList=new ArrayList(); + try { + pgUserDtoList = pgUserManager.getAllUser(); + if(pgUserDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgUserDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addUser") + @Produces(MediaType.APPLICATION_JSON) + public Map addUser(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + PgUser pgUser = new PgUser(); + + pgUser.setUserName(userName); + //String pass = StringUtils.getMD5(password); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setActive(1); + logger.info("成功保存"); + + pgUserManager.save(pgUser); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editUser") + @Produces(MediaType.APPLICATION_JSON) + public Map editUser(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUserManager.save(pgUser); + result = "true"; + msg = "编辑成功"; + //} + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteUser") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteUser(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgUser pgUser= pgUserManager.get(Long.valueOf(id)); + if(pgUser==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgUser.setActive(0); + pgUserManager.save(pgUser); + msg="删除人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" deleted file mode 100644 index 244d6f0..0000000 --- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ /dev/null Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 60bced2..2d1aff8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,24 @@ - - - + + + + - - + + + + + + + + + + @@ -34,76 +43,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -126,7 +66,6 @@ @@ -238,6 +185,20 @@ + + + + + + + + + + @@ -329,6 +290,10 @@ @@ -393,10 +358,6 @@ - - @@ -457,28 +418,10 @@ - - - - - - - - - - - - @@ -892,7 +835,8 @@ - + + 1510219102698 @@ -946,11 +890,15 @@ 1521783169434 1521783169434 - - @@ -978,35 +926,35 @@ - - - - - + - - - + - - - - - + + + + + + + + + + + + - @@ -1054,69 +1002,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1275,14 +1160,6 @@ - - - - - - - - @@ -1311,21 +1188,6 @@ - - - - - - - - - - - - - - - @@ -1355,120 +1217,246 @@ - - - - - - - - - - - - - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index d8f5e6b..3a9144b 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -1,7 +1,7 @@ package com.casic.PgInterface.devData.domain; import com.casic.PgInterface.devTable.domain.PgDevice; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -19,7 +19,7 @@ private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 - private PgPatroler pgPatrolerId;//人员信息 + private PgUser pgPatrolerId;//人员信息 private Date intoTime;//进入时间 private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -75,11 +75,11 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PGPATROLERID") - public PgPatroler getPgPatrolerId() { + public PgUser getPgPatrolerId() { return pgPatrolerId; } - public void setPgPatrolerId(PgPatroler pgPatrolerId) { + public void setPgPatrolerId(PgUser pgPatrolerId) { this.pgPatrolerId = pgPatrolerId; } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index f91f82e..fbbd50e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -23,7 +23,7 @@ private String description;//描述 private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 - private PgPatroler patrolerId;//责任人 + private PgUser userId;//责任人 private int active;//状态位 @Id @@ -87,13 +87,13 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } @Column(name = "ACTIVE") diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 12e33a9..899ac2d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -19,7 +19,6 @@ public class PgDeviceManager extends HibernateEntityDao { //获取当前设备列表 - //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); @@ -61,7 +60,7 @@ return pgDeviceDtoList; } - //根据名字获取当前设备 + //根据设备编号获取当前设备的信息 public PgDevice getDeviceBydevCode(String devCode) { Criteria criteria=createCriteria(PgDevice.class); criteria.add(Restrictions.eq("devCode",devCode)); @@ -74,8 +73,7 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { + public List getDeviceStatisticByDevType(){ String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); @@ -83,4 +81,18 @@ return pgDeviceTypeStatisticDtoList; } -} + //根据分区获取设备列表 + public List getPgDeviceDtoListByPartition(String partition) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("partition",partition)); + + List pgDeviceList=criteria.list(); + List pgDeviceDtoList = new ArrayList(); + + for (PgDevice pgDevice : pgDeviceList) { + pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); + } + return pgDeviceDtoList; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index 8a5ae58..a18be20 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -18,7 +18,7 @@ private long id; private String operate;//操作 private Date operateTime;//时间 - private PgPatroler patrolerId;//操作人员 + private PgUser userId;//操作人员 private int active;//状态位 @Id @@ -60,12 +60,12 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) - @JoinColumn(name = "PATROLERID") - public PgPatroler getPatrolerId() { - return patrolerId; + @JoinColumn(name = "USERID") + public PgUser getUserId() { + return userId; } - public void setPatrolerId(PgPatroler patrolerId) { - this.patrolerId = patrolerId; + public void setUserId(PgUser userId) { + this.userId = userId; } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java deleted file mode 100644 index 4661e1f..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.patroler.domain; - -import com.casic.PgInterface.devTable.domain.PgAlarm; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * Created by yxw on 2017/10/31. - */ -@Entity -@Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) -public class PgPatroler implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private int active;//状态位 - private List pgAlarms; - private List pgLogs; - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PATROL_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 = "PASSWORD") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Column(name = "DEPARTMENT") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - @Column(name = "POST") - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - @Column(name = "PHONENUMBER") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - @Column(name = "ACTIVE") - public int getActive() { - return active; - } - - public void setActive(int active) { - this.active = active; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgAlarms() { - return pgAlarms; - } - - public void setPgAlarms(List pgAlarms) { - this.pgAlarms = pgAlarms; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") - public List getPgLogs() { - return pgLogs; - } - - public void setPgLogs(List pgLogs) { - this.pgLogs = pgLogs; - } -} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java new file mode 100644 index 0000000..85301a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,109 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/10/31. + */ +@Entity +@Table(name = "PG_USER") +@SequenceGenerator(name = "SEQ_PG_USER_ID", sequenceName = "SEQ_PG_USER_ID",allocationSize=1,initialValue=1) +public class PgUser implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private int active;//状态位 + private List pgAlarms; + private List pgLogs; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_USER_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 = "PASSWORD") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "DEPARTMENT") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Column(name = "POST") + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + @Column(name = "PHONENUMBER") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "patrolerId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 0e98ded..9316457 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -61,7 +61,7 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); - this.setUserName(pgLog.getPatrolerId().getUserName()); + this.setUserName(pgLog.getUserId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); this.setActive(String.valueOf(pgLog.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java deleted file mode 100644 index 22bec22..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.PgInterface.patroler.dto; - -import com.casic.PgInterface.patroler.domain.PgPatroler; - -import java.io.Serializable; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgPatrolerDto implements Serializable { - - private String id; - private String userName;//用户名 - private String password;//密码 - private String department;//部门 - private String post;//职务 - private String phoneNumber;//电话 - private String active;//状态位 - - 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 getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getPost() { - return post; - } - - public void setPost(String post) { - this.post = post; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public PgPatrolerDto(PgPatroler pgPatroler) - { - this.setId(String.valueOf(pgPatroler.getId())); - this.setUserName(pgPatroler.getUserName()); - this.setPassword(pgPatroler.getPassword()); - this.setDepartment(pgPatroler.getDepartment()); - this.setPhoneNumber(pgPatroler.getPhoneNumber()); - this.setPost(pgPatroler.getPost()); - this.setActive(String.valueOf(pgPatroler.getActive())); - } - - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java new file mode 100644 index 0000000..d701c70 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -0,0 +1,88 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgUser; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/2. + */ +public class PgUserDto implements Serializable { + + private String id; + private String userName;//用户名 + private String password;//密码 + private String department;//部门 + private String post;//职务 + private String phoneNumber;//电话 + private String active;//状态位 + + 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 getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgUserDto(PgUser pgPatroler) + { + this.setId(String.valueOf(pgPatroler.getId())); + this.setUserName(pgPatroler.getUserName()); + this.setPassword(pgPatroler.getPassword()); + this.setDepartment(pgPatroler.getDepartment()); + this.setPhoneNumber(pgPatroler.getPhoneNumber()); + this.setPost(pgPatroler.getPost()); + this.setActive(String.valueOf(pgPatroler.getActive())); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 7e842a6..0af246c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,7 +1,6 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; @@ -10,7 +9,6 @@ import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; -import java.util.Calendar; import java.util.List; /** @@ -19,13 +17,13 @@ @Service public class PgInPgPersonManager extends HibernateEntityDao { - public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) { + public PgInPgPerson getPersonByUserName(String userName) { List pgInPgPersonList = null; try { Criteria criteria = createCriteria(PgInPgPerson.class); if (StringUtils.isNotBlank(userName)) criteria.add(Restrictions.eq("userName", userName)); - +/* if (StringUtils.isNotBlank(inTime)) { criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime))); } @@ -35,7 +33,7 @@ calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("inTime", calendar.getTime())); } - +*/ criteria.addOrder(Order.desc("id")); pgInPgPersonList = criteria.list(); @@ -43,7 +41,6 @@ return pgInPgPersonList.get(0); else return null; - } catch (Exception e) { return null; } @@ -103,5 +100,4 @@ 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 40af702..eacfb52 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -21,10 +21,10 @@ @Service public class PgLogManager extends HibernateEntityDao { - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java deleted file mode 100644 index 865f2e8..0000000 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.PgInterface.patroler.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgPatrolerManager extends HibernateEntityDao { - - //获取当前人员列表 - //TODO LIST List getAll() - public List getAllPatroler() { - - Criteria criteria = createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active",1)); - criteria.addOrder(Order.desc("id")); - - List pgPatrolerList=criteria.list(); - List pgPatrolerDtoList = new ArrayList(); - for (PgPatroler pgPatroler : pgPatrolerList){ - pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); - } - - return pgPatrolerDtoList; - } - - //查询人员是否存在 - public boolean userNameIsExits(String userName) - { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.add(Restrictions.eq("userName", userName)); - if (getCount(criteria) > 0) { - return true; - } - return false; - } - - public PgPatroler getPatrolerByuserName(String userName) { - Criteria criteria = getSession().createCriteria(PgPatroler.class); - criteria.add(Restrictions.eq("userName", userName)); - criteria.add(Restrictions.eq("active",1)); - List pgPatrolers = criteria.list(); - - //TODO LIST:为空判断 patrolers==null? - if (pgPatrolers != null && pgPatrolers.size() > 0) - return pgPatrolers.get(0); - else - return null; - } - -} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java new file mode 100644 index 0000000..c2a2ee1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/2. + */ +@Service +public class PgUserManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllUser() { + + Criteria criteria = createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgUserList=criteria.list(); + List pgUserDtoList = new ArrayList(); + for (PgUser pgUser : pgUserList){ + pgUserDtoList.add(new PgUserDto(pgUser)); + } + + return pgUserDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgUser getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgUser.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgUserList = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgUserList != null && pgUserList.size() > 0) + return pgUserList.get(0); + else + return null; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 9d17fb1..bc4127f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -5,7 +5,7 @@ import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -35,7 +35,7 @@ private PgAlarmManager pgAlarmManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; private PgDeviceManager pgDeviceManager; @@ -45,7 +45,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..20540d5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -281,5 +281,64 @@ return resultMap; } + /** + * 根据设备编号获取设备的资产信息 + */ + @POST + @Path("getDeviceByDevCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByDevCode(@FormParam("devCode") String devCode) throws Exception + { + Map resultMap = new HashMap(); + String msg=""; + PgDeviceDto pgDeviceDto=null; + + try{ + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + if(pgDeviceDto==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception ex) + { + ex.printStackTrace(); + msg="设备状态获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDto); + return resultMap; + } + + /* + *根据分区获取设备列表 + */ + @POST + @Path("getDeviceByPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getDeviceByPartition(@FormParam("partition") String partition) throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + List pgDeviceDtoList=new ArrayList(); + + try{ + pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(partition); + if(pgDeviceDtoList==null) + msg="设备信息获取失败"; + else + msg="设备信息获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="设备信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgDeviceDtoList); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 3b808ec..03ef508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -128,9 +128,7 @@ @POST @Path("getInPgPersonByName") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByName(@FormParam("userName") String userName, - @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime) throws Exception { + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { Map resultMap = new HashMap(); String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..e40ea8e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgLog; -import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.domain.PgUser; import com.casic.PgInterface.patroler.dto.PgLogDto; import com.casic.PgInterface.patroler.manager.PgLogManager; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import com.casic.PgInterface.patroler.manager.PgUserManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -28,7 +28,7 @@ private PgLogManager pgLogManager; - private PgPatrolerManager pgPatrolerManager; + private PgUserManager pgPatrolerManager; @Resource public void setPgLogManager(PgLogManager pgLogManager) { @@ -36,7 +36,7 @@ } @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + public void setPgPatrolerManager(PgUserManager pgPatrolerManager) { this.pgPatrolerManager = pgPatrolerManager; } @@ -57,7 +57,7 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); + PgUser pgPatroler = new PgUser(); pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); pgLog.setPatrolerId(pgPatroler); diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java deleted file mode 100644 index aa2d1dc..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.patroler.domain.PgPatroler; -import com.casic.PgInterface.patroler.dto.PgPatrolerDto; -import com.casic.PgInterface.patroler.manager.PgPatrolerManager; -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.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgPatroler") -public class PgPatrolerRs { - - private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); - - private PgPatrolerManager pgPatrolerManager; - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - /** - * 显示人员列表 - */ - @POST - @Path("getPatrolerList") - @Produces(MediaType.APPLICATION_JSON) - public Map getPatrolerList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgPatrolerDtoList=new ArrayList(); - try { - pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); - if(pgPatrolerDtoList.size()==0) - msg="没有找到人员信息"; - else - msg="获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgPatrolerDtoList); - return resultMap; - } - - /** - * 新增人员 - */ - @POST - @Path("addPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map addPatroler(@FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - try { - - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - PgPatroler pgPatroler = new PgPatroler(); - - pgPatroler.setUserName(userName); - //String pass = StringUtils.getMD5(password); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatroler.setActive(1); - logger.info("成功保存"); - - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("success", result); - resultMap.put("msg", msg); - return resultMap; - } - - /** - * 编辑人员 - */ - @POST - @Path("editPatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map editPartition(@FormParam("id") String id, - @FormParam("userName") String userName, - @FormParam("password") String password, - @FormParam("department") String department, - @FormParam("post") String post, - @FormParam("phoneNumber") String phoneNumber) throws Exception { - - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try { - /* - if (pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "用户名已经存在!"; - } else { - */ - PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id)); - pgPatroler.setUserName(userName); - pgPatroler.setPassword(password); - pgPatroler.setDepartment(department); - pgPatroler.setPost(post); - pgPatroler.setPhoneNumber(phoneNumber); - pgPatrolerManager.save(pgPatroler); - result = "true"; - msg = "编辑成功"; - //} - } catch (Exception e) { - result = "false"; - msg = "编辑失败"; - e.printStackTrace(); - } - - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - - /** - * 删除信息 - */ - @POST - @Path("deletePatroler") - @Produces(MediaType.APPLICATION_JSON) - public Map deleteDevice(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id)); - if(pgPatroler==null) { - msg = "不存在该人员信息"; - result="false"; - } - else - { - pgPatroler.setActive(0); - pgPatrolerManager.save(pgPatroler); - msg="删除人员成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="删除人员失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java new file mode 100644 index 0000000..7733e50 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgUserManager; +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.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgUser") +public class PgUserRs { + + private static Logger logger = LoggerFactory.getLogger(PgUserRs.class); + + private PgUserManager pgUserManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getUserList") + @Produces(MediaType.APPLICATION_JSON) + public Map getUserList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgUserDtoList=new ArrayList(); + try { + pgUserDtoList = pgUserManager.getAllUser(); + if(pgUserDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgUserDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addUser") + @Produces(MediaType.APPLICATION_JSON) + public Map addUser(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + PgUser pgUser = new PgUser(); + + pgUser.setUserName(userName); + //String pass = StringUtils.getMD5(password); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setActive(1); + logger.info("成功保存"); + + pgUserManager.save(pgUser); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editUser") + @Produces(MediaType.APPLICATION_JSON) + public Map editUser(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUserManager.save(pgUser); + result = "true"; + msg = "编辑成功"; + //} + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteUser") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteUser(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgUser pgUser= pgUserManager.get(Long.valueOf(id)); + if(pgUser==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgUser.setActive(0); + pgUserManager.save(pgUser); + msg="删除人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" deleted file mode 100644 index 244d6f0..0000000 --- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ /dev/null Binary files differ diff --git "a/~$\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/~$\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" deleted file mode 100644 index fccdb82..0000000 --- "a/~$\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" +++ /dev/null Binary files differ