diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.getActive())); + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.getActive())); + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java index 691f445..1a9138a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java +++ b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java @@ -127,7 +127,7 @@ ex.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java index 691f445..1a9138a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java +++ b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java @@ -127,7 +127,7 @@ ex.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java new file mode 100644 index 0000000..6603907 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java @@ -0,0 +1,176 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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 2018/3/30. + */ +@Component +@Path("pgRole") +public class PgRoleRs { + + private static Logger logger = LoggerFactory.getLogger(PgRole.class); + + private PgRoleManager pgRoleManager; + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /* + * 获取角色信息 + */ + @POST + @Path("getRoleList") + @Produces(MediaType.APPLICATION_JSON) + public Map getRoleList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgRoleDtoList = new ArrayList(); + try { + pgRoleDtoList = pgRoleManager.getPgRoleDtoList(); + if (pgRoleDtoList == null) + msg = "不存在角色信息"; + else + msg = "角色信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "角色信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgRoleDtoList); + return resultMap; + } + + /** + * 新增角色 + */ + @POST + @Path("addRole") + @Produces(MediaType.APPLICATION_JSON) + public Map addRole(@FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority); + PgRole pgRole=new PgRole(); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRole.setActive(1); + + pgRoleManager.save(pgRole); + msg="用户角色保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增角色失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角色信息 + */ + @POST + @Path("editRole") + @Produces(MediaType.APPLICATION_JSON) + public Map editRole(@FormParam("id") String id, + @FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgRole pgRole = pgRoleManager.get(Long.valueOf(id)); + + PgAuthority pgAuthority = pgAuthorityManager.getAuthorityByAuthority(authority); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRoleManager.save(pgRole); + + msg="角色保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="角色编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteRole") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteRole(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgRole pgRole= pgRoleManager.get(Long.valueOf(id)); + if(pgRole==null) { + msg = "不存在该角色信息"; + result="false"; + } + else + { + pgRole.setActive(0); + pgRoleManager.save(pgRole); + 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java index 691f445..1a9138a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java +++ b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java @@ -127,7 +127,7 @@ ex.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java new file mode 100644 index 0000000..6603907 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java @@ -0,0 +1,176 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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 2018/3/30. + */ +@Component +@Path("pgRole") +public class PgRoleRs { + + private static Logger logger = LoggerFactory.getLogger(PgRole.class); + + private PgRoleManager pgRoleManager; + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /* + * 获取角色信息 + */ + @POST + @Path("getRoleList") + @Produces(MediaType.APPLICATION_JSON) + public Map getRoleList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgRoleDtoList = new ArrayList(); + try { + pgRoleDtoList = pgRoleManager.getPgRoleDtoList(); + if (pgRoleDtoList == null) + msg = "不存在角色信息"; + else + msg = "角色信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "角色信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgRoleDtoList); + return resultMap; + } + + /** + * 新增角色 + */ + @POST + @Path("addRole") + @Produces(MediaType.APPLICATION_JSON) + public Map addRole(@FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority); + PgRole pgRole=new PgRole(); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRole.setActive(1); + + pgRoleManager.save(pgRole); + msg="用户角色保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增角色失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角色信息 + */ + @POST + @Path("editRole") + @Produces(MediaType.APPLICATION_JSON) + public Map editRole(@FormParam("id") String id, + @FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgRole pgRole = pgRoleManager.get(Long.valueOf(id)); + + PgAuthority pgAuthority = pgAuthorityManager.getAuthorityByAuthority(authority); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRoleManager.save(pgRole); + + msg="角色保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="角色编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteRole") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteRole(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgRole pgRole= pgRoleManager.get(Long.valueOf(id)); + if(pgRole==null) { + msg = "不存在该角色信息"; + result="false"; + } + else + { + pgRole.setActive(0); + pgRoleManager.save(pgRole); + 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..612597e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,205 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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; + + private PgRoleManager pgRoleManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + /** + * 显示人员列表 + */ + @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, + @FormParam("role") String role)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + 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.setPgRoleId(pgRole); + pgUser.setActive(1); + logger.info("成功保存"); + + 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("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, + @FormParam("role") String role) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setPgRoleId(pgRole); + 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 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java index 691f445..1a9138a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java +++ b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java @@ -127,7 +127,7 @@ ex.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java new file mode 100644 index 0000000..6603907 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java @@ -0,0 +1,176 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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 2018/3/30. + */ +@Component +@Path("pgRole") +public class PgRoleRs { + + private static Logger logger = LoggerFactory.getLogger(PgRole.class); + + private PgRoleManager pgRoleManager; + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /* + * 获取角色信息 + */ + @POST + @Path("getRoleList") + @Produces(MediaType.APPLICATION_JSON) + public Map getRoleList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgRoleDtoList = new ArrayList(); + try { + pgRoleDtoList = pgRoleManager.getPgRoleDtoList(); + if (pgRoleDtoList == null) + msg = "不存在角色信息"; + else + msg = "角色信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "角色信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgRoleDtoList); + return resultMap; + } + + /** + * 新增角色 + */ + @POST + @Path("addRole") + @Produces(MediaType.APPLICATION_JSON) + public Map addRole(@FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority); + PgRole pgRole=new PgRole(); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRole.setActive(1); + + pgRoleManager.save(pgRole); + msg="用户角色保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增角色失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角色信息 + */ + @POST + @Path("editRole") + @Produces(MediaType.APPLICATION_JSON) + public Map editRole(@FormParam("id") String id, + @FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgRole pgRole = pgRoleManager.get(Long.valueOf(id)); + + PgAuthority pgAuthority = pgAuthorityManager.getAuthorityByAuthority(authority); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRoleManager.save(pgRole); + + msg="角色保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="角色编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteRole") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteRole(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgRole pgRole= pgRoleManager.get(Long.valueOf(id)); + if(pgRole==null) { + msg = "不存在该角色信息"; + result="false"; + } + else + { + pgRole.setActive(0); + pgRoleManager.save(pgRole); + 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..612597e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,205 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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; + + private PgRoleManager pgRoleManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + /** + * 显示人员列表 + */ + @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, + @FormParam("role") String role)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + 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.setPgRoleId(pgRole); + pgUser.setActive(1); + logger.info("成功保存"); + + 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("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, + @FormParam("role") String role) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setPgRoleId(pgRole); + 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" new file mode 100644 index 0000000..bd72cb4 --- /dev/null +++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java index 691f445..1a9138a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java +++ b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java @@ -127,7 +127,7 @@ ex.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java new file mode 100644 index 0000000..6603907 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java @@ -0,0 +1,176 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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 2018/3/30. + */ +@Component +@Path("pgRole") +public class PgRoleRs { + + private static Logger logger = LoggerFactory.getLogger(PgRole.class); + + private PgRoleManager pgRoleManager; + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /* + * 获取角色信息 + */ + @POST + @Path("getRoleList") + @Produces(MediaType.APPLICATION_JSON) + public Map getRoleList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgRoleDtoList = new ArrayList(); + try { + pgRoleDtoList = pgRoleManager.getPgRoleDtoList(); + if (pgRoleDtoList == null) + msg = "不存在角色信息"; + else + msg = "角色信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "角色信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgRoleDtoList); + return resultMap; + } + + /** + * 新增角色 + */ + @POST + @Path("addRole") + @Produces(MediaType.APPLICATION_JSON) + public Map addRole(@FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority); + PgRole pgRole=new PgRole(); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRole.setActive(1); + + pgRoleManager.save(pgRole); + msg="用户角色保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增角色失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角色信息 + */ + @POST + @Path("editRole") + @Produces(MediaType.APPLICATION_JSON) + public Map editRole(@FormParam("id") String id, + @FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgRole pgRole = pgRoleManager.get(Long.valueOf(id)); + + PgAuthority pgAuthority = pgAuthorityManager.getAuthorityByAuthority(authority); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRoleManager.save(pgRole); + + msg="角色保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="角色编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteRole") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteRole(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgRole pgRole= pgRoleManager.get(Long.valueOf(id)); + if(pgRole==null) { + msg = "不存在该角色信息"; + result="false"; + } + else + { + pgRole.setActive(0); + pgRoleManager.save(pgRole); + 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..612597e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,205 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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; + + private PgRoleManager pgRoleManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + /** + * 显示人员列表 + */ + @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, + @FormParam("role") String role)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + 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.setPgRoleId(pgRole); + pgUser.setActive(1); + logger.info("成功保存"); + + 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("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, + @FormParam("role") String role) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setPgRoleId(pgRole); + 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" new file mode 100644 index 0000000..bd72cb4 --- /dev/null +++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git a/~WRL1033.tmp b/~WRL1033.tmp new file mode 100644 index 0000000..d213a94 --- /dev/null +++ b/~WRL1033.tmp Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071bfbd..a188863 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,6 +1,7 @@ +<<<<<<< HEAD @@ -10,6 +11,12 @@ +======= + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -35,6 +42,7 @@ +<<<<<<< HEAD @@ -73,15 +81,40 @@ +======= + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD +======= + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -105,6 +138,7 @@ +<<<<<<< HEAD @@ -1151,11 +1271,12 @@ - + +<<<<<<< HEAD @@ -1172,6 +1293,26 @@ +======= + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1180,8 +1321,12 @@ +<<<<<<< HEAD +======= + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 @@ -1214,11 +1359,31 @@ - +<<<<<<< HEAD @@ -1226,6 +1391,7 @@ +<<<<<<< HEAD @@ -1291,11 +1457,61 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + +<<<<<<< HEAD @@ -1344,11 +1560,60 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1491,11 +1756,176 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1519,11 +1949,46 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 +<<<<<<< HEAD @@ -1569,10 +2034,91 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + +<<<<<<< HEAD @@ -1592,17 +2138,72 @@ +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 + + + + + + +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4326bcf3581467406b29e7383c4f3016b13135e3 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/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java deleted file mode 100644 index 0c6eff6..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.core.util.DateUtils; -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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/10/30. - */ -@Service -public class PgAlarmManager extends HibernateEntityDao { - - //获取当前报警消息列表 - public List getAllAlarm() { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - List pgAlarmList = criteria.list(); - List pgAlarmDtoList = new ArrayList(); - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - - return pgAlarmDtoList; - } - - public List getAlarmMsgData(String alarmType ,String alarmDate,String alarmLocation) { - - List pgAlarmDtoList = new ArrayList(); - - try { - Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.eq("alarmType", alarmType)); - criteria.add(Restrictions.eq("alarmLocation", alarmLocation)); - - if (StringUtils.isNotBlank(alarmDate)) { - criteria.add(Restrictions.like("alarmDate", DateUtils.sdf4.parse(alarmDate))); - } - List pgAlarmList=criteria.list(); - - for (PgAlarm pgAlarm : pgAlarmList) { - pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); - } - } - catch(Exception ex) - { - return null; - } - - return pgAlarmDtoList; - } -} 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 2ef89cf..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,13 +73,26 @@ } //根据设备类型统计设备资产 - public List getDeviceStatisticByDevType() - { - String hql="select device.devType,count(*) from PG_DEVICE device group by devType"; + public List getDeviceStatisticByDevType(){ + String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType"; List pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list(); 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/PgAuthority.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java index 21e6c47..ea7ba63 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java @@ -1,8 +1,67 @@ package com.casic.PgInterface.patroler.domain; +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + /** - * Created by yxw on 2018/3/19. + * Created by yxw on 2018/3/30. */ -public class PgAuthority { +@Entity +@Table(name = "PG_AUTHORITY") +@SequenceGenerator(name = "SEQ_PG_AUTHORITY_ID", sequenceName = "SEQ_PG_AUTHORITY_ID",allocationSize=1,initialValue=1) +public class PgAuthority implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String authority; + private String concent; + private int active; + private List pgRoles; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_AUTHORITY_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "AUTHORITY") + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + @Column(name = "CONCENT") + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAuthorityId") + public List getPgRoles() { + return pgRoles; + } + + public void setPgRoles(List pgRoles) { + this.pgRoles = pgRoles; + } } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 0e524f4..6264274 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -2,7 +2,7 @@ import javax.persistence.*; import java.io.Serializable; -import java.util.Date; +import java.util.List; /** * Created by yxw on 2018/3/22. @@ -16,9 +16,9 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private Date inTime;//入廊时间 - private Date outTime;//出廊时间 - private String type;//人员类别 + private String personType;//人员类别:临时人员、工作人员 + private int isInPg;//是否在廊内 + private List pgInPgStatuses; @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID") @@ -48,32 +48,31 @@ this.phoneNumber = phoneNumber; } - @Column(name = "INTIME") - public Date getInTime() { - return inTime; + @Column(name = "PERSONTYPE") + public String getPersonType() { + return personType; } - public void setInTime(Date inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - @Column(name = "OUTTIME") - public Date getOutTime() { - return outTime; + @Column(name = "ISINPG") + public int getIsInPg() { + return isInPg; } - public void setOutTime(Date outTime) { - this.outTime = outTime; + public void setIsInPg(int isInPg) { + this.isInPg = isInPg; } - @Column(name = "TYPE") - public String getType() { - return type; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgInPgPersonId") + public List getPgInPgStatuses() { + return pgInPgStatuses; } - public void setType(String type) { - this.type = type; + public void setPgInPgStatuses(List pgInPgStatuses) { + this.pgInPgStatuses = pgInPgStatuses; } - } diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java new file mode 100644 index 0000000..6ac1a71 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/4/2. + */ +@Entity +@Table(name = "PG_INPG_STATUS") +@SequenceGenerator(name = "SEQ_PG_INPG_STATUS_ID", sequenceName = "SEQ_PG_INPG_STATUS_ID",allocationSize=1,initialValue=1) +public class PgInPgStatus implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private Date inTime;//入廊时间 + private Date outTime;//出廊时间 + private PgInPgPerson pgInPgPersonId;//入廊人员 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_STATUS_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "INTIME") + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } + + @Column(name = "OUTTIME") + public Date getOutTime() { + return outTime; + } + + public void setOutTime(Date outTime) { + this.outTime = outTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "pgInPgPersonId") + public PgInPgPerson getPgInPgPersonId() { + return pgInPgPersonId; + } + + public void setPgInPgPersonId(PgInPgPerson pgInPgPersonId) { + this.pgInPgPersonId = pgInPgPersonId; + } +} 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/PgMaintain.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java new file mode 100644 index 0000000..4e962d5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_MAINTAIN") +@SequenceGenerator(name = "SEQ_PG_MAINTAIN_ID", sequenceName = "SEQ_PG_MAINTAIN_ID",allocationSize=1,initialValue=1) +public class PgMaintain implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String mainTainer;//维护人员 + private Date beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private int active;//状态位 + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_MAINTAIN_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "MAINTAINER") + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java new file mode 100644 index 0000000..27fbf99 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java @@ -0,0 +1,76 @@ +package com.casic.PgInterface.patroler.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2018/3/28. + */ +@Entity +@Table(name = "PG_PATROL") +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +public class PgPatrol implements Serializable{ + private static final long serialVersionUID = 1L; + private long id; + private String patroler; + private Date beginTime; + private String timeLimt; + private String describe; + private int active; + + @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 = "PATROLER") + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + @Column(name = "BEGINTIME") + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + @Column(name = "TIMELIMT") + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + @Column(name = "DESCRIBE") + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } +} 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/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java new file mode 100644 index 0000000..a76886e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.patroler.domain; + +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2018/3/19. + */ +@Entity +@Table(name = "PG_ROLE") +@SequenceGenerator(name = "SEQ_PG_ROLE_ID", sequenceName = "SEQ_PG_ROLE_ID",allocationSize=1,initialValue=1) +public class PgRole implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String role; + private int active; + private PgAuthority pgAuthorityId; + private List pgUsers; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ROLE") + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "AUTHORITYID") + public PgAuthority getPgAuthorityId() { + return pgAuthorityId; + } + + public void setPgAuthorityId(PgAuthority pgAuthorityId) { + this.pgAuthorityId = pgAuthorityId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId") + public List getPgUsers() { + return pgUsers; + } + + public void setPgUsers(List pgUsers) { + this.pgUsers = pgUsers; + } + +} \ No newline at end of file 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..a3c865b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java @@ -0,0 +1,123 @@ +package com.casic.PgInterface.patroler.domain; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +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 PgRole pgRoleId;//权限 + 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; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ROLEID") + public PgRole getPgRoleId() { + return pgRoleId; + } + + public void setPgRoleId(PgRole pgRoleId) { + this.pgRoleId = pgRoleId; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgAlarms() { + return pgAlarms; + } + + public void setPgAlarms(List pgAlarms) { + this.pgAlarms = pgAlarms; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId") + public List getPgLogs() { + return pgLogs; + } + + public void setPgLogs(List pgLogs) { + this.pgLogs = pgLogs; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java new file mode 100644 index 0000000..2468612 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgAuthority; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ + +public class PgAuthorityDto implements Serializable { + + private String id; + private String authority; + private String concent; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAuthority() { + return authority; + } + + public void setAuthority(String authority) { + this.authority = authority; + } + + public String getConcent() { + return concent; + } + + public void setConcent(String concent) { + this.concent = concent; + } + + public PgAuthorityDto(PgAuthority pgAuthority) + { + this.setId(String.valueOf(pgAuthority.getId())); + this.setAuthority(pgAuthority.getAuthority()); + this.setConcent(pgAuthority.getConcent()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java new file mode 100644 index 0000000..b241650 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgInfoDto { + private String userName;//入廊人员 + private String phoneNumber;//联系方式 + private String personType;//人员类别 + private String isInPg;//是否在廊内 + private String lastInTime;//最后入廊时间 + private String inPgNum;//入廊次数 + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getPersonType() { + return personType; + } + + public void setPersonType(String personType) { + this.personType = personType; + } + + public String getIsInPg() { + return isInPg; + } + + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; + } + + public String getLastInTime() { + return lastInTime; + } + + public void setLastInTime(String lastInTime) { + this.lastInTime = lastInTime; + } + + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setUserName(pgInPgPerson.getUserName()); + this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + this.setInPgNum(String.valueOf(inPgNum)); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index b8eb791..96f6150 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -3,7 +3,6 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import java.io.Serializable; -import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/22. @@ -13,11 +12,8 @@ private String id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String inTime;//入廊时间 - private String outTime;//出廊时间 - private String type;//人员类别 - - private String inPgNums;//累计入廊次数 + private String personType;//人员类别 + private String isInPg; public String getId() { return id; @@ -43,47 +39,29 @@ this.phoneNumber = phoneNumber; } - public String getInTime() { - return inTime; + public String getPersonType() { + return personType; } - public void setInTime(String inTime) { - this.inTime = inTime; + public void setPersonType(String personType) { + this.personType = personType; } - public String getOutTime() { - return outTime; + public String getIsInPg() { + return isInPg; } - public void setOutTime(String outTime) { - this.outTime = outTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getInPgNums() { - return inPgNums; - } - - public void setInPgNums(String inPgNums) { - this.inPgNums = inPgNums; + public void setIsInPg(String isInPg) { + this.isInPg = isInPg; } public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgInPgPerson.getId())); this.setUserName(pgInPgPerson.getUserName()); this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); - this.setType(pgInPgPerson.getType()); - this.setInTime(sdf.format(pgInPgPerson.getInTime())); - this.setOutTime(sdf.format(pgInPgPerson.getOutTime())); + this.setPersonType(pgInPgPerson.getPersonType()); + this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); } } diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java new file mode 100644 index 0000000..e842335 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java @@ -0,0 +1,49 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgInPgStatus; + +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/4/2. + */ +public class PgInPgStatusDto { + + private String id; + private String inTime;//入廊时间 + private String outTime;//出廊时间 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInTime() { + return inTime; + } + + public void setInTime(String inTime) { + this.inTime = inTime; + } + + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public PgInPgStatusDto(PgInPgStatus pgInPgStatus) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgInPgStatus.getId())); + this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); + } + +} 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/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java new file mode 100644 index 0000000..620bbf3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgMaintain; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgMaintainDto implements Serializable { + + private String id; + private String mainTainer;//维护人员 + private String beginTime;//开始时间 + private String timeLimt;//计划工期 + private String describe;//任务描述 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMainTainer() { + return mainTainer; + } + + public void setMainTainer(String mainTainer) { + this.mainTainer = mainTainer; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgMaintainDto(PgMaintain pgMaintain) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setMainTainer(pgMaintain.getMainTainer()); + this.setBeginTime(sdf.format(pgMaintain.getBeginTime())); + this.setTimeLimt(pgMaintain.getTimeLimt()); + this.setDescribe(pgMaintain.getDescribe()); + this.setActive(String.valueOf(pgMaintain.getActive())); + } + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java new file mode 100644 index 0000000..39fd3c5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgPatrol; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2018/3/28. + */ +public class PgPatrolDto implements Serializable { + + private String id; + private String patroler;//巡检人员 + private String beginTime;//开始时间 + private String timeLimt;//预计工期 + private String describe;//任务描述 + private String active;//状态表 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatroler() { + return patroler; + } + + public void setPatroler(String patroler) { + this.patroler = patroler; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getTimeLimt() { + return timeLimt; + } + + public void setTimeLimt(String timeLimt) { + this.timeLimt = timeLimt; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgPatrolDto(PgPatrol pgPatrol) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgPatrol.getId())); + this.setPatroler(patroler); + this.setBeginTime(sdf.format(pgPatrol.getBeginTime())); + this.setTimeLimt(pgPatrol.getTimeLimt()); + this.setDescribe(pgPatrol.getDescribe()); + this.setActive(String.valueOf(pgPatrol.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/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java new file mode 100644 index 0000000..7c7e004 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -0,0 +1,46 @@ +package com.casic.PgInterface.patroler.dto; + +import com.casic.PgInterface.patroler.domain.PgRole; + +import java.io.Serializable; + +/** + * Created by yxw on 2018/3/30. + */ +public class PgRoleDto implements Serializable { + + private String id; + private String role; + private String active; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgRoleDto(PgRole pgRole) + { + this.setId(String.valueOf(pgRole.getId())); + this.setRole(pgRole.getRole()); + this.setActive(String.valueOf(pgRole.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/PgAuthorityManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java new file mode 100644 index 0000000..12f92a9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgAuthorityManager extends HibernateEntityDao{ + + public PgAuthority getAuthorityByAuthority(String authority) { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("authority", authority)); + criteria.add(Restrictions.eq("active", 1)); + List pgAuthorityList = criteria.list(); + + if (pgAuthorityList == null || pgAuthorityList.size() == 0) + return null; + else + return pgAuthorityList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getAuthorityList() + { + try { + Criteria criteria = createCriteria(PgAuthority.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgAuthorityList = criteria.list(); + List pgAuthorityDtoList=new ArrayList(); + for(PgAuthority pgAuthority : pgAuthorityList) + { + pgAuthorityDtoList.add(new PgAuthorityDto(pgAuthority)); + } + + return pgAuthorityDtoList; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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 02b2ec3..96efa91 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,11 +1,16 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -13,16 +18,79 @@ * Created by yxw on 2018/3/22. */ @Service -public class PgInPgPersonManager extends HibernateEntityDao { +public class PgInPgPersonManager extends HibernateEntityDao { - public List getPgInPersonList() { - List pgInPgPersonDtoList=new ArrayList(); - Criteria criteria=createCriteria(PgInPgPersonDto.class); - criteria.addOrder(Order.desc("inTime")); + private PgInPgStatusManager pgInPgStatusManager; - pgInPgPersonDtoList=criteria.list(); + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + + public PgInPgPerson getPersonByUserName(String userName) { + List pgInPgPersonList = null; + try { + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.addOrder(Order.desc("id")); + pgInPgPersonList = criteria.list(); + + if (pgInPgPersonList != null && pgInPgPersonList.size() > 0) + return pgInPgPersonList.get(0); + else + return null; + } catch (Exception e) { + return null; + } + } + + public List getPgInPersonList(int perType) { + + Criteria criteria = createCriteria(PgInPgPerson.class); + criteria.addOrder(Order.desc("id")); + if(perType==1) + criteria.add(Restrictions.eq("isInPg",1)); + List pgInPgPersonList = criteria.list(); + + List pgInPgInfoDtoList = new ArrayList(); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); + int inPgNum = 0; + for (PgInPgPerson pgInPgPerson : pgInPgPersonList) { + pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + inPgNum = pgInPgStatusManager.getInPgNumByName(pgInPgPerson); + pgInPgInfoDtoList.add(new PgInPgInfoDto(pgInPgPerson, pgInPgStatus, inPgNum)); + } + + return pgInPgInfoDtoList; + } + + public List getPgInPersonListByTime(String year,String statisticType) { + + String sql=""; + + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + break; + case 1://月 + sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by month(inTime)"; + break; + case 2://周 + sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by datename(week,[inTime])"; + break; + case 3://日 + sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" + + year +"' group by day(inTime)"; + break; + default: + break; + } + + List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); return pgInPgPersonDtoList; } - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java new file mode 100644 index 0000000..f2f08ae --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -0,0 +1,39 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by yxw on 2018/4/2. + */ +@Service +public class PgInPgStatusManager extends HibernateEntityDao { + + public PgInPgStatus getPgInPgStatusByPerson(PgInPgPerson pgInPgPerson) { + + Criteria criteria=createCriteria(PgInPgStatus.class); + criteria.add(Restrictions.eq("pgInPgPersonId",pgInPgPerson)); + criteria.addOrder(Order.desc("inTime")); + + List pgInPgStatusList=criteria.list(); + if(pgInPgStatusList!=null) + return pgInPgStatusList.get(0); + else + return null; + } + + public int getInPgNumByName(PgInPgPerson pgInPgPerson) { + String hql = "select count(*) from PgInPgStatus where pgInPgPersonId = " + pgInPgPerson.getId(); + + Object object = this.getSession().createQuery(hql).uniqueResult(); + + return Integer.parseInt(String.valueOf(object)); + } +} 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/PgMaintainManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java new file mode 100644 index 0000000..b36336b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java @@ -0,0 +1,73 @@ +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.PgMaintain; +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgMaintainManager extends HibernateEntityDao{ + + public List getPgMaintainList() { + Criteria criteria=createCriteria(PgMaintain.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain:pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + return pgMaintainDtoList; + } + + public List getPgMaintainByMaintainerOrTime(String mainTainer,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(mainTainer)) { + criteria.add(Restrictions.eq("mainTainer", mainTainer)); + } + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgMaintainList=criteria.list(); + List pgMaintainDtoList=new ArrayList(); + for(PgMaintain pgMaintain : pgMaintainList) + { + pgMaintainDtoList.add(new PgMaintainDto(pgMaintain)); + } + + return pgMaintainDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java new file mode 100644 index 0000000..015fa56 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java @@ -0,0 +1,72 @@ +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.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +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.Calendar; +import java.util.List; + +/** + * Created by yxw on 2018/3/28. + */ +@Service +public class PgPatrolManager extends HibernateEntityDao { + + public List getPgPatrolList() { + Criteria criteria=createCriteria(PgPatrol.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol:pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + return pgPatrolDtoList; + } + + public List getPgPatrolByPatrolerOrTime(String patroler,String startTime,String endTime) { + try { + Criteria criteria = createCriteria(PgPatrol.class); + if (StringUtils.isNotBlank(patroler)) { + criteria.add(Restrictions.eq("patroler", patroler)); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("beginTime", DateUtils.sdf_day.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf_day.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("beginTime", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolList=criteria.list(); + List pgPatrolDtoList=new ArrayList(); + for(PgPatrol pgPatrol : pgPatrolList) + { + pgPatrolDtoList.add(new PgPatrolDto(pgPatrol)); + } + + return pgPatrolDtoList; + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} 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/PgRoleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java new file mode 100644 index 0000000..66b272b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgRoleManager.java @@ -0,0 +1,56 @@ +package com.casic.PgInterface.patroler.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2018/3/30. + */ +@Service +public class PgRoleManager extends HibernateEntityDao { + + public PgRole getPgRoleByRole(String role) { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("role", role)); + criteria.add(Restrictions.eq("active", 1)); + List pgRoleList = criteria.list(); + + if (pgRoleList == null || pgRoleList.size() == 0) + return null; + else + return pgRoleList.get(0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getPgRoleDtoList() { + try { + Criteria criteria = createCriteria(PgRole.class); + criteria.add(Restrictions.eq("active", 1)); + + List pgRoleList=criteria.list(); + List pgRoleDtoList=new ArrayList(); + for(PgRole pgRole:pgRoleList) + { + pgRoleDtoList.add(new PgRoleDto(pgRole)); + } + return pgRoleDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + 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/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java index 616ae26..bbb735b 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -1,8 +1,13 @@ package com.casic.PgInterface.reservePlan.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto; import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -12,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.List; /** @@ -58,7 +64,6 @@ } } - public String saveFiles(String fileBuffer,String fileName,String fileType){ try { @@ -87,5 +92,28 @@ } } + public List getReservePlanDtoByAlarmType(PgAlarm pgAlarm) + { + try { + Criteria criteria = createCriteria(PgReservePlan.class); + criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId())); + criteria.add(Restrictions.eq("active", "1")); + criteria.addOrder(Order.desc("id")); + + List pgReservePlanList = criteria.list(); + List pgReservePlanDtoList = new ArrayList(); + for (PgReservePlan pgReservePlan : pgReservePlanList) { + pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan)); + } + + return pgReservePlanDtoList; + } + catch(Exception e) + { + e.printStackTrace(); + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java new file mode 100644 index 0000000..89163aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java @@ -0,0 +1,143 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.dto.PgDeviceDto; +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.reservePlan.dto.PgReservePlanDto; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +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 2018/3/29. + */ +@Component +@Path("pgAlarmLink") +public class PgAlarmLinkRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmLinkRs.class); + + private PgAlarmManager pgAlarmManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgDeviceManager pgDeviceManager; + + private PgReservePlanManager pgReservePlanManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + /* + * 获取报警设备信息 + */ + @POST + @Path("linkDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgDevice pgDevice = null; + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + + msg = "报警关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "获取关联设备失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDevice); + + return resultMap; + } + + /* + * 获取报警设备所在区域的所有设备信息 + */ + @POST + @Path("linkPartitionDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map linkPartitionDevice(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgDeviceDtoList = new ArrayList(); + try { + PgAlarm pgAlarm = pgAlarmManager.get(id); + PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId()); + pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition()); + + msg = "关联设备获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "分区设备关联失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDtoList); + return resultMap; + } + + /* + * 根据报警记录获取关联的预案 + */ + @POST + @Path("linkReservePlan") + @Produces(MediaType.APPLICATION_JSON) + public Map linkReservePlan(@FormParam("id") String id) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgReservePlanDtoList=new ArrayList(); + try{ + PgAlarm pgAlarm=pgAlarmManager.get(id); + pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm); + + msg="关联预案获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案关联失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgReservePlanDtoList); + + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java deleted file mode 100644 index 02bd691..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by yxw on 2017/11/4. - */ -@Component -@Path("pgAlarm") -public class PgAlarmRs { - - private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - - private PgAlarmTypeManager pgAlarmTypeManager; - - private PgAlarmManager pgAlarmManager; - - private PgPatrolerManager pgPatrolerManager; - - private PgDeviceManager pgDeviceManager; - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { - this.pgPatrolerManager = pgPatrolerManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } - - /** - * 获取报警信息 - */ - @POST - @Path("getAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmList()throws Exception { - Map resultMap = new HashMap(); - String msg=""; - List pgAlarmDtoList=new ArrayList(); - try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(); - if(pgAlarmDtoList.size()==0) - msg="没有报警信息"; - else - msg="报警信息获取成功"; - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息获取失败"; - } - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - /** - * 消除报警信息 - */ - @POST - @Path("clearAlarmInfo") - @Produces(MediaType.APPLICATION_JSON) - public Map clearAlarmList(@FormParam("id") String id)throws Exception { - - Map resultMap = new HashMap(); - String msg=""; - String result="false"; - - try { - PgAlarm pgAlarm=new PgAlarm(); - pgAlarm=pgAlarmManager.get(Long.valueOf(id)); - if(pgAlarm==null) { - msg = "不存在该报警信息"; - result="false"; - } - else - { - pgAlarm.setActive(0); - pgAlarmManager.save(pgAlarm); - msg="报警信息清除成功"; - result="true"; - } - }catch(Exception e){ - e.printStackTrace(); - msg="报警信息清除失败"; - result="false"; - } - resultMap.put("msg",msg); - resultMap.put("result",result); - return resultMap; - } - - /** - * 新增报警 - */ - @POST - @Path("addAlarm") - @Produces(MediaType.APPLICATION_JSON) - public Map addAlarm(@FormParam("alarmType") String alarmType, - @FormParam("alarmValue") String alarmValue, - @FormParam("alarmDate") String alarmDate, - @FormParam("description") String description, - @FormParam("devCode") String devCode, - @FormParam("userName") String userName)throws Exception { - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - PgAlarm pgAlarm = new PgAlarm(); - if (!pgPatrolerManager.userNameIsExits(userName)) { - result = "false"; - msg = "不存在该用户!"; - } else { - pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); - pgAlarm.setAlarmValue(alarmValue); - pgAlarm.setAlarmDate(sdf.parse(alarmDate)); - pgAlarm.setDescription(description); - pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); - pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); - pgAlarm.setActive(1); - - logger.info("成功保存"); - pgAlarmManager.save(pgAlarm); - result = "true"; - msg = "保存成功"; - } - } catch (Exception e) { - result = "false"; - msg = "保存失败"; - e.printStackTrace(); - } - - resultMap.put("result", result); - resultMap.put("msg", msg); - return resultMap; - } - - - @POST - @Path("queryAlarmMsg") - @Produces(MediaType.APPLICATION_JSON) - public Map queryAlarmMsg(@FormParam("alarmType")String alarmType, - @FormParam("alarmDate")String alarmDate, - @FormParam("alarmLocation")String alarmLocation) - throws Exception{ - - Map resultMap = new HashMap(); - List pgAlarmDtoList = new ArrayList(); - - String msg=""; - - try { - pgAlarmDtoList = pgAlarmManager.getAlarmMsgData(alarmType, alarmDate, alarmLocation); - if (pgAlarmDtoList != null) - { - msg = "获取数据成功"; - }else - { - msg = "没有满足条件的数据"; - } - - }catch (Exception e){ - e.printStackTrace(); - msg = "获取失败"; - } - - resultMap.put("msg",msg); - resultMap.put("result",pgAlarmDtoList); - return resultMap; - } - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index f28ebdf..d9914a8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -91,7 +91,8 @@ @POST @Path("editAlarmRule") @Produces(MediaType.APPLICATION_JSON) - public Map editAlarmRule(@FormParam("devType") String devType, + public Map editAlarmRule(@FormParam("id") String id, + @FormParam("devType") String devType, @FormParam("highValue") String highValue, @FormParam("lowValue") String lowValue, @FormParam("unit") String unit) throws Exception { @@ -102,7 +103,7 @@ PgAlarmRule pgAlarmRule = null; try { - pgAlarmRule = pgAlarmRuleManager.getAlarmRuleBydevType(devType); + pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id)); if (pgAlarmRule == null) { msg = "不存在报警阈值记录"; result = "false"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index ce1b74f..bce5747 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -98,7 +98,6 @@ return resultMap; } - /** * 编辑报警类型 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java new file mode 100644 index 0000000..9f8f5f7 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -0,0 +1,167 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.dto.PgAuthorityDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +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 2018/3/30. + */ +@Component +@Path("pgAuthority") +public class PgAuthorityRs { + private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /** + * 新增权限 + */ + @POST + @Path("addAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map addAuthority(@FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=new PgAuthority(); + + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + pgAuthority.setActive(1); + + pgAuthorityManager.save(pgAuthority); + msg="用户权限保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增权限失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角权限信息 + */ + @POST + @Path("editAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map editAuthority(@FormParam("id") String id, + @FormParam("authority") String authority, + @FormParam("concent") String concent) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgAuthority pgAuthority=pgAuthorityManager.get(Long.valueOf(id)); + pgAuthority.setAuthority(authority); + pgAuthority.setConcent(concent); + + pgAuthorityManager.save(pgAuthority); + msg="权限保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="权限编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteAuthority") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAuthority(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAuthority pgAuthority= pgAuthorityManager.get(Long.valueOf(id)); + if(pgAuthority==null) { + msg = "不存在该权限信息"; + result="false"; + } + else + { + pgAuthority.setActive(0); + pgAuthorityManager.save(pgAuthority); + msg="删除权限成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="删除权限失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /* +* 获取权限信息 + */ + @POST + @Path("getAuthorityList") + @Produces(MediaType.APPLICATION_JSON) + public Map getAuthorityList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgAuthorityDtoList = new ArrayList(); + try { + pgAuthorityDtoList = pgAuthorityManager.getAuthorityList(); + if (pgAuthorityDtoList == null) + msg = "不存在权限信息"; + else + msg = "权限信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "权限信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgAuthorityDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 2d1246f..279f505 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -177,7 +177,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; @@ -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/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b6c84aa..1e8c508 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -93,7 +93,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); 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 fdbc486..f67760b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.domain.PgInPgStatus; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +14,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2018/3/23. @@ -26,15 +23,20 @@ @Path("pgInPerson") public class PgInPgPersonRs { - private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); - private PgInPgPersonManager pgInPgPersonManager; + private PgInPgStatusManager pgInPgStatusManager; + @Resource public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { this.pgInPgPersonManager = pgInPgPersonManager; } + @Resource + public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { + this.pgInPgStatusManager = pgInPgStatusManager; + } + /** * 派发工作证（新增入廊记录） */ @@ -44,23 +46,33 @@ public Map addInPgPerson(@FormParam("userName") String userName, @FormParam("phoneNumber") String phoneNumber, @FormParam("inTime") String inTime, - @FormParam("outTime") String outTime, - @FormParam("type") String type) throws Exception { + @FormParam("personType") String personType) throws Exception { Map resultMap = new HashMap(); String result = ""; String msg = ""; - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - PgInPgPerson pgInPgPerson=new PgInPgPerson(); - pgInPgPerson.setUserName(userName); - pgInPgPerson.setPhoneNumber(phoneNumber); - pgInPgPerson.setInTime(sdf.parse(inTime)); - pgInPgPerson.setOutTime(sdf.parse(outTime)); - pgInPgPerson.setType(type); + PgInPgStatus pgInPgStatus = new PgInPgStatus(); - pgInPgPersonManager.save(pgInPgPerson); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) { + PgInPgPerson pgInPgPerson1=new PgInPgPerson(); + pgInPgPerson1.setUserName(userName); + pgInPgPerson1.setPhoneNumber(phoneNumber); + pgInPgPerson1.setPersonType(personType); + pgInPgPerson1.setIsInPg(1); + + pgInPgPersonManager.save(pgInPgPerson1); + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + } + + pgInPgStatus.setInTime(sdf.parse(inTime)); + //pgInPgStatus.setOutTime(sdf.parse(outTime)); + pgInPgStatus.setPgInPgPersonId(pgInPgPerson); + + pgInPgStatusManager.save(pgInPgStatus); result = "true"; msg = "保存成功"; } catch (Exception e) { @@ -68,7 +80,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -79,25 +91,144 @@ @POST @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPerson()throws Exception { + public Map getInPgPerson() throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgLogDtoList = new ArrayList(); + + List pgInPgInfoDtoList = new ArrayList(); try { - //pgLogDtoList = pgInPgPersonManager - if (pgLogDtoList == null || pgLogDtoList.size() == 0) - msg = "没有找到日志信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; else - msg = "日志信息获取成功"; + msg = "入廊人员信息获取成功"; } catch (Exception e) { e.printStackTrace(); - msg = "日志信息获取失败"; + msg = "入廊人员信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgLogDtoList); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 获取在线人员信息列表 + */ + @POST + @Path("getInPgPersonInPg") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonInPg() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgInPgInfoDtoList = new ArrayList(); + try { + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(1); + if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgInfoDtoList); + return resultMap; + } + + /** + * 根据人员名称获取人员信息 + */ + @POST + @Path("getInPgPersonByName") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByName(@FormParam("userName") String userName) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + PgInPgPerson pgInPgPerson = null; + try { + pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在人员信息"; + else + msg = "人员信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "人员信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPerson); + return resultMap; + } + + /** + * 人员出廊确认 + */ + @POST + @Path("outPgPerson") + @Produces(MediaType.APPLICATION_JSON) + public Map outPgPerson(@FormParam("userName") String userName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); + if (pgInPgPerson == null) + msg = "不存在入廊人员"; + else { + PgInPgStatus pgInPgStatus = pgInPgStatusManager.getPgInPgStatusByPerson(pgInPgPerson); + if(pgInPgStatus==null) + msg="不存在入廊记录"; + else { + pgInPgStatus.setOutTime(new Date()); + pgInPgPerson.setIsInPg(0); + pgInPgPersonManager.save(pgInPgPerson); + result = "true"; + msg = "编辑成功"; + } + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); return resultMap; } + /** + * 根据时间统计入廊人员次数 + */ + /* + @POST + @Path("getInPgPersonByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgPersonByTime(@FormParam("year") String year, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgInPgPersonDtoList = new ArrayList(); + try { + pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); + if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) + msg = "没有找到入廊人员信息"; + else + msg = "入廊人员统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "入廊人员统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgInPgPersonDtoList); + return resultMap; + } + */ } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index ea3ec08..16bb660 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,10 +57,10 @@ String msg = ""; PgLog pgLog=new PgLog(); try { - PgPatroler pgPatroler = new PgPatroler(); - pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + PgUser pgUser = new PgUser(); + pgUser = pgPatrolerManager.getPatrolerByuserName(userName); - pgLog.setPatrolerId(pgPatroler); + pgLog.setUserId(pgUser); pgLog.setOperate(operate); pgLog.setOperateTime(new Date()); pgLog.setActive(1); @@ -74,7 +74,7 @@ msg = "保存失败"; e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } @@ -107,7 +107,4 @@ return resultMap; } - - - -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java new file mode 100644 index 0000000..a310aeb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgMaintain; +import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.manager.PgMaintainManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgMaintain") +public class PgMaintainRs { + + PgMaintainManager pgMaintainManager=new PgMaintainManager(); + + @Resource + public void setPgMaintainManager(PgMaintainManager pgMaintainManager) { + this.pgMaintainManager = pgMaintainManager; + } + + /** + * 新增维护记录 + */ + @POST + @Path("addMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map addMaintain(@FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgMaintain pgMaintain=new PgMaintain(); + + try { + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + pgMaintain.setActive(1); + + pgMaintainManager.save(pgMaintain); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改维护记录 + */ + @POST + @Path("editMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map editMaintain(@FormParam("id") String id, + @FormParam("mainTainer") String mainTainer, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgMaintain pgMaintain = pgMaintainManager.get(Long.valueOf(id)); + + pgMaintain.setMainTainer(mainTainer); + pgMaintain.setBeginTime(sdf.parse(beginTime)); + pgMaintain.setTimeLimt(timeLimt); + pgMaintain.setDescribe(describe); + + pgMaintainManager.save(pgMaintain); + msg = "维护记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取维护信息 + */ + @POST + @Path("getMaintain") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintain() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList=new ArrayList(); + + try{ + pgMaintainDtoList=pgMaintainManager.getPgMaintainList(); + if(pgMaintainDtoList==null||pgMaintainDtoList.size()==0) + msg="不存在维护记录"; + else + msg="维护获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="维护记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取维护记录 + */ + @POST + @Path("getPatrolByMaintainOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByMaintainOrTime(@FormParam("maintainer") String mainTainer, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgMaintainDtoList = new ArrayList(); + + try { + pgMaintainDtoList = pgMaintainManager.getPgMaintainByMaintainerOrTime(mainTainer, startTime, endTime); + if (pgMaintainDtoList == null || pgMaintainDtoList.size() == 0) + msg = "不存在满足要求的维护记录"; + else + msg = "维护记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgMaintainDtoList); + + return resultMap; + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java index 88ad11e..2952f12 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -74,7 +74,7 @@ e.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java new file mode 100644 index 0000000..130b873 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -0,0 +1,175 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgPatrol; +import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.manager.PgPatrolManager; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2018/3/28. + */ +@Component +@Path("pgPatrol") +public class PgPatrolRs { + + PgPatrolManager pgPatrolManager = new PgPatrolManager(); + + @Resource + public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { + this.pgPatrolManager = pgPatrolManager; + } + + /** + * 新增巡检记录 + */ + @POST + @Path("addPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatrol(@FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPatrol pgPatrol = new PgPatrol(); + + try { + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + pgPatrol.setActive(1); + + pgPatrolManager.save(pgPatrol); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 修改巡检记录 + */ + @POST + @Path("editPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map editPatrol(@FormParam("id") String id, + @FormParam("patroler") String patroler, + @FormParam("beginTime") String beginTime, + @FormParam("timeLimt") String timeLimt, + @FormParam("describe") String describe) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatrol pgPatrol = pgPatrolManager.get(Long.valueOf(id)); + + pgPatrol.setPatroler(patroler); + pgPatrol.setBeginTime(sdf.parse(beginTime)); + pgPatrol.setTimeLimt(timeLimt); + pgPatrol.setDescribe(describe); + + pgPatrolManager.save(pgPatrol); + msg = "巡检记录编辑成功"; + result = "true"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检记录修改出错"; + result = "false"; + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + + return resultMap; + } + + /* + * 获取巡检信息 + */ + @POST + @Path("getPatrol") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrol() throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList=new ArrayList(); + + try{ + pgPatrolDtoList=pgPatrolManager.getPgPatrolList(); + if(pgPatrolDtoList==null||pgPatrolDtoList.size()==0) + msg="不存在巡检记录"; + else + msg="巡检记录获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="巡检记录获取失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + /* + * 根据巡检人员和时间来获取巡检记录 + */ + @POST + @Path("getPatrolByPatrolerOrTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByPatrolerOrTime(@FormParam("patroler") String patroler, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + List pgPatrolDtoList = new ArrayList(); + + try { + pgPatrolDtoList = pgPatrolManager.getPgPatrolByPatrolerOrTime(patroler, startTime, endTime); + if (pgPatrolDtoList == null || pgPatrolDtoList.size() == 0) + msg = "不存在满足要求的巡检记录"; + else + msg = "巡检记录获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检人员获取失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolDtoList); + + return resultMap; + } + + + +} \ No newline at end of file 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/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index 1eeb589..57b8ec8 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -110,7 +110,7 @@ e.printStackTrace(); } } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java index 691f445..1a9138a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgReserveController.java +++ b/src/main/java/com/casic/PgInterface/rs/PgReserveController.java @@ -127,7 +127,7 @@ ex.printStackTrace(); } - resultMap.put("success", result); + resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java new file mode 100644 index 0000000..6603907 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java @@ -0,0 +1,176 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgAuthority; +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.dto.PgRoleDto; +import com.casic.PgInterface.patroler.manager.PgAuthorityManager; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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 2018/3/30. + */ +@Component +@Path("pgRole") +public class PgRoleRs { + + private static Logger logger = LoggerFactory.getLogger(PgRole.class); + + private PgRoleManager pgRoleManager; + + private PgAuthorityManager pgAuthorityManager; + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + @Resource + public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { + this.pgAuthorityManager = pgAuthorityManager; + } + + /* + * 获取角色信息 + */ + @POST + @Path("getRoleList") + @Produces(MediaType.APPLICATION_JSON) + public Map getRoleList() { + Map resultMap = new HashMap(); + String msg = ""; + List pgRoleDtoList = new ArrayList(); + try { + pgRoleDtoList = pgRoleManager.getPgRoleDtoList(); + if (pgRoleDtoList == null) + msg = "不存在角色信息"; + else + msg = "角色信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "角色信息获取是失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgRoleDtoList); + return resultMap; + } + + /** + * 新增角色 + */ + @POST + @Path("addRole") + @Produces(MediaType.APPLICATION_JSON) + public Map addRole(@FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAuthority pgAuthority=pgAuthorityManager.getAuthorityByAuthority(authority); + PgRole pgRole=new PgRole(); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRole.setActive(1); + + pgRoleManager.save(pgRole); + msg="用户角色保存成功"; + result="true"; + } + catch(Exception e) { + e.printStackTrace(); + msg = "新增角色失败"; + result = "false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /* + *编辑角色信息 + */ + @POST + @Path("editRole") + @Produces(MediaType.APPLICATION_JSON) + public Map editRole(@FormParam("id") String id, + @FormParam("role") String role, + @FormParam("authority") String authority) throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgRole pgRole = pgRoleManager.get(Long.valueOf(id)); + + PgAuthority pgAuthority = pgAuthorityManager.getAuthorityByAuthority(authority); + pgRole.setRole(role); + pgRole.setPgAuthorityId(pgAuthority); + pgRoleManager.save(pgRole); + + msg="角色保存成功"; + result="true"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="角色编辑失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + + return resultMap; + } + + /** + * 删除信息 + */ + @POST + @Path("deleteRole") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteRole(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgRole pgRole= pgRoleManager.get(Long.valueOf(id)); + if(pgRole==null) { + msg = "不存在该角色信息"; + result="false"; + } + else + { + pgRole.setActive(0); + pgRoleManager.save(pgRole); + 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..612597e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -0,0 +1,205 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgRole; +import com.casic.PgInterface.patroler.domain.PgUser; +import com.casic.PgInterface.patroler.dto.PgUserDto; +import com.casic.PgInterface.patroler.manager.PgRoleManager; +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; + + private PgRoleManager pgRoleManager; + + @Resource + public void setPgUserManager(PgUserManager pgUserManager) { + this.pgUserManager = pgUserManager; + } + + @Resource + public void setPgRoleManager(PgRoleManager pgRoleManager) { + this.pgRoleManager = pgRoleManager; + } + + /** + * 显示人员列表 + */ + @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, + @FormParam("role") String role)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + 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.setPgRoleId(pgRole); + pgUser.setActive(1); + logger.info("成功保存"); + + 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("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, + @FormParam("role") String role) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + /* + if (pgUserManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + */ + PgRole pgRole=pgRoleManager.getPgRoleByRole(role); + + PgUser pgUser = pgUserManager.get(Long.valueOf(id)); + pgUser.setUserName(userName); + pgUser.setPassword(password); + pgUser.setDepartment(department); + pgUser.setPost(post); + pgUser.setPhoneNumber(phoneNumber); + pgUser.setPgRoleId(pgRole); + 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" new file mode 100644 index 0000000..bd72cb4 --- /dev/null +++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git a/~WRL1033.tmp b/~WRL1033.tmp new file mode 100644 index 0000000..d213a94 --- /dev/null +++ b/~WRL1033.tmp Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" index d13a45e..2d3565a 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ