diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ 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 index b4424eb..15d0934 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -1,16 +1,18 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import org.apache.poi.ss.usermodel.DateUtil; 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; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by yxw on 2018/4/2. @@ -68,18 +70,20 @@ //yyyy-mm-dd public List getPgInPersonListByDay() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=getStartDayString(); + List pgInPgInfoDtoList = createDTO(startDay); - List pgInPgInfoDtoList = new ArrayList(); - - String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t group " + - "by to_char(t.intime, 'yyyy-mm-dd')"; + String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t " + +"where t.intime > to_date('"+startDay+"','yyyy-mm-dd') and t.intime < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(t.intime, 'yyyy-mm-dd') order by to_char(t.intime,'yyyy-mm-dd')"; List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgInPgInfoDto pgInPgInfoDto = new PgInPgInfoDto(); - pgInPgInfoDto.setInPgNum(objects.get(i)[0].toString()); - pgInPgInfoDto.setInTime(objects.get(i)[1].toString()); - pgInPgInfoDtoList.add(pgInPgInfoDto); + for(PgInPgInfoDto pgInPgInfoDto:pgInPgInfoDtoList){ + if(pgInPgInfoDto.getInTime().equals(objects.get(i)[1].toString())) + pgInPgInfoDtoList.get(i).setInPgNum(objects.get(i)[0].toString()); + } } return pgInPgInfoDtoList; } @@ -119,4 +123,40 @@ return null; } + public String getStartDayString(){ + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 7); + Date startDate = calendar.getTime(); + + return DateUtils.sdf_day.format(startDate); + } + + private List createDTO(String startDay) + { + List pgInPgInfoDtoList=new ArrayList<>(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgInPgInfoDto pgInPgInfoDto=new PgInPgInfoDto(); + + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + + pgInPgInfoDto.setInTime(DateUtils.sdf_day.format(dt)); + pgInPgInfoDto.setInPgNum("0"); + pgInPgInfoDtoList.add(pgInPgInfoDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgInPgInfoDtoList; + } + } \ 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 index baacd93..534f1eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -51,12 +51,14 @@ public Map getAlarmList(@FormParam("alarmType") String alarmType, @FormParam("startDay") String startDay, @FormParam("endDay") String endDay, - @FormParam("isNew") String isNew) throws Exception { + @FormParam("isNew") String isNew, + @FormParam("page") int page, + @FormParam("row") int rows) throws Exception { Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmDtoList = new ArrayList<>(); try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew); + pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows); if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0) msg = "没有报警信息"; else diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ 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 index b4424eb..15d0934 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -1,16 +1,18 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import org.apache.poi.ss.usermodel.DateUtil; 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; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by yxw on 2018/4/2. @@ -68,18 +70,20 @@ //yyyy-mm-dd public List getPgInPersonListByDay() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=getStartDayString(); + List pgInPgInfoDtoList = createDTO(startDay); - List pgInPgInfoDtoList = new ArrayList(); - - String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t group " + - "by to_char(t.intime, 'yyyy-mm-dd')"; + String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t " + +"where t.intime > to_date('"+startDay+"','yyyy-mm-dd') and t.intime < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(t.intime, 'yyyy-mm-dd') order by to_char(t.intime,'yyyy-mm-dd')"; List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgInPgInfoDto pgInPgInfoDto = new PgInPgInfoDto(); - pgInPgInfoDto.setInPgNum(objects.get(i)[0].toString()); - pgInPgInfoDto.setInTime(objects.get(i)[1].toString()); - pgInPgInfoDtoList.add(pgInPgInfoDto); + for(PgInPgInfoDto pgInPgInfoDto:pgInPgInfoDtoList){ + if(pgInPgInfoDto.getInTime().equals(objects.get(i)[1].toString())) + pgInPgInfoDtoList.get(i).setInPgNum(objects.get(i)[0].toString()); + } } return pgInPgInfoDtoList; } @@ -119,4 +123,40 @@ return null; } + public String getStartDayString(){ + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 7); + Date startDate = calendar.getTime(); + + return DateUtils.sdf_day.format(startDate); + } + + private List createDTO(String startDay) + { + List pgInPgInfoDtoList=new ArrayList<>(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgInPgInfoDto pgInPgInfoDto=new PgInPgInfoDto(); + + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + + pgInPgInfoDto.setInTime(DateUtils.sdf_day.format(dt)); + pgInPgInfoDto.setInPgNum("0"); + pgInPgInfoDtoList.add(pgInPgInfoDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgInPgInfoDtoList; + } + } \ 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 index baacd93..534f1eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -51,12 +51,14 @@ public Map getAlarmList(@FormParam("alarmType") String alarmType, @FormParam("startDay") String startDay, @FormParam("endDay") String endDay, - @FormParam("isNew") String isNew) throws Exception { + @FormParam("isNew") String isNew, + @FormParam("page") int page, + @FormParam("row") int rows) throws Exception { Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmDtoList = new ArrayList<>(); try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew); + pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows); if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0) msg = "没有报警信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index a0245ba..bf92fe4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -6,10 +6,8 @@ import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; -import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index 455e9af..326b0c6 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -48,7 +48,7 @@ @FormParam("doc_name") String doc_name, @FormParam("construct_doc") String construct_doc, @FormParam("cs_name") String cs_name)throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); PgCsDocument pgCsDocument = new PgCsDocument(); String result = ""; @@ -91,7 +91,7 @@ @FormParam("doc_name") String doc_name, @FormParam("cs_name") String cs_name) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ 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 index b4424eb..15d0934 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -1,16 +1,18 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import org.apache.poi.ss.usermodel.DateUtil; 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; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by yxw on 2018/4/2. @@ -68,18 +70,20 @@ //yyyy-mm-dd public List getPgInPersonListByDay() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=getStartDayString(); + List pgInPgInfoDtoList = createDTO(startDay); - List pgInPgInfoDtoList = new ArrayList(); - - String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t group " + - "by to_char(t.intime, 'yyyy-mm-dd')"; + String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t " + +"where t.intime > to_date('"+startDay+"','yyyy-mm-dd') and t.intime < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(t.intime, 'yyyy-mm-dd') order by to_char(t.intime,'yyyy-mm-dd')"; List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgInPgInfoDto pgInPgInfoDto = new PgInPgInfoDto(); - pgInPgInfoDto.setInPgNum(objects.get(i)[0].toString()); - pgInPgInfoDto.setInTime(objects.get(i)[1].toString()); - pgInPgInfoDtoList.add(pgInPgInfoDto); + for(PgInPgInfoDto pgInPgInfoDto:pgInPgInfoDtoList){ + if(pgInPgInfoDto.getInTime().equals(objects.get(i)[1].toString())) + pgInPgInfoDtoList.get(i).setInPgNum(objects.get(i)[0].toString()); + } } return pgInPgInfoDtoList; } @@ -119,4 +123,40 @@ return null; } + public String getStartDayString(){ + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 7); + Date startDate = calendar.getTime(); + + return DateUtils.sdf_day.format(startDate); + } + + private List createDTO(String startDay) + { + List pgInPgInfoDtoList=new ArrayList<>(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgInPgInfoDto pgInPgInfoDto=new PgInPgInfoDto(); + + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + + pgInPgInfoDto.setInTime(DateUtils.sdf_day.format(dt)); + pgInPgInfoDto.setInPgNum("0"); + pgInPgInfoDtoList.add(pgInPgInfoDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgInPgInfoDtoList; + } + } \ 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 index baacd93..534f1eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -51,12 +51,14 @@ public Map getAlarmList(@FormParam("alarmType") String alarmType, @FormParam("startDay") String startDay, @FormParam("endDay") String endDay, - @FormParam("isNew") String isNew) throws Exception { + @FormParam("isNew") String isNew, + @FormParam("page") int page, + @FormParam("row") int rows) throws Exception { Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmDtoList = new ArrayList<>(); try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew); + pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows); if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0) msg = "没有报警信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index a0245ba..bf92fe4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -6,10 +6,8 @@ import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; -import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index 455e9af..326b0c6 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -48,7 +48,7 @@ @FormParam("doc_name") String doc_name, @FormParam("construct_doc") String construct_doc, @FormParam("cs_name") String cs_name)throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); PgCsDocument pgCsDocument = new PgCsDocument(); String result = ""; @@ -91,7 +91,7 @@ @FormParam("doc_name") String doc_name, @FormParam("cs_name") String cs_name) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index a18bb85..94c5c84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -165,7 +165,6 @@ pgDevice.setIp(ip); pgDevice.setModBus(modBus); pgDevice.setMome(mome); - pgDevice.setIsOpen(0); pgDevice.setActive(1); pgDeviceManager.save(pgDevice); @@ -231,7 +230,6 @@ pgDevice.setModBus(modBus); pgDevice.setMome(mome); pgDevice.setActive(1); - pgDevice.setIsOpen(Integer.valueOf(isOpen)); pgDeviceManager.save(pgDevice); result = "true"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index ca65da3..ff85c61 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -86,6 +86,8 @@ if(inTime!=null) pgInPgStatus.setInTime(DateUtils.sdf4.parse(inTime)); + else + pgInPgStatus.setInTime(new Date()); pgInPgStatus.setPgInPgPersonId(pgInPgPerson1); pgInPgStatusManager.save(pgInPgStatus); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ 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 index b4424eb..15d0934 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -1,16 +1,18 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import org.apache.poi.ss.usermodel.DateUtil; 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; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by yxw on 2018/4/2. @@ -68,18 +70,20 @@ //yyyy-mm-dd public List getPgInPersonListByDay() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=getStartDayString(); + List pgInPgInfoDtoList = createDTO(startDay); - List pgInPgInfoDtoList = new ArrayList(); - - String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t group " + - "by to_char(t.intime, 'yyyy-mm-dd')"; + String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t " + +"where t.intime > to_date('"+startDay+"','yyyy-mm-dd') and t.intime < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(t.intime, 'yyyy-mm-dd') order by to_char(t.intime,'yyyy-mm-dd')"; List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgInPgInfoDto pgInPgInfoDto = new PgInPgInfoDto(); - pgInPgInfoDto.setInPgNum(objects.get(i)[0].toString()); - pgInPgInfoDto.setInTime(objects.get(i)[1].toString()); - pgInPgInfoDtoList.add(pgInPgInfoDto); + for(PgInPgInfoDto pgInPgInfoDto:pgInPgInfoDtoList){ + if(pgInPgInfoDto.getInTime().equals(objects.get(i)[1].toString())) + pgInPgInfoDtoList.get(i).setInPgNum(objects.get(i)[0].toString()); + } } return pgInPgInfoDtoList; } @@ -119,4 +123,40 @@ return null; } + public String getStartDayString(){ + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 7); + Date startDate = calendar.getTime(); + + return DateUtils.sdf_day.format(startDate); + } + + private List createDTO(String startDay) + { + List pgInPgInfoDtoList=new ArrayList<>(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgInPgInfoDto pgInPgInfoDto=new PgInPgInfoDto(); + + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + + pgInPgInfoDto.setInTime(DateUtils.sdf_day.format(dt)); + pgInPgInfoDto.setInPgNum("0"); + pgInPgInfoDtoList.add(pgInPgInfoDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgInPgInfoDtoList; + } + } \ 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 index baacd93..534f1eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -51,12 +51,14 @@ public Map getAlarmList(@FormParam("alarmType") String alarmType, @FormParam("startDay") String startDay, @FormParam("endDay") String endDay, - @FormParam("isNew") String isNew) throws Exception { + @FormParam("isNew") String isNew, + @FormParam("page") int page, + @FormParam("row") int rows) throws Exception { Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmDtoList = new ArrayList<>(); try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew); + pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows); if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0) msg = "没有报警信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index a0245ba..bf92fe4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -6,10 +6,8 @@ import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; -import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index 455e9af..326b0c6 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -48,7 +48,7 @@ @FormParam("doc_name") String doc_name, @FormParam("construct_doc") String construct_doc, @FormParam("cs_name") String cs_name)throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); PgCsDocument pgCsDocument = new PgCsDocument(); String result = ""; @@ -91,7 +91,7 @@ @FormParam("doc_name") String doc_name, @FormParam("cs_name") String cs_name) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index a18bb85..94c5c84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -165,7 +165,6 @@ pgDevice.setIp(ip); pgDevice.setModBus(modBus); pgDevice.setMome(mome); - pgDevice.setIsOpen(0); pgDevice.setActive(1); pgDeviceManager.save(pgDevice); @@ -231,7 +230,6 @@ pgDevice.setModBus(modBus); pgDevice.setMome(mome); pgDevice.setActive(1); - pgDevice.setIsOpen(Integer.valueOf(isOpen)); pgDeviceManager.save(pgDevice); result = "true"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index ca65da3..ff85c61 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -86,6 +86,8 @@ if(inTime!=null) pgInPgStatus.setInTime(DateUtils.sdf4.parse(inTime)); + else + pgInPgStatus.setInTime(new Date()); pgInPgStatus.setPgInPgPersonId(pgInPgPerson1); pgInPgStatusManager.save(pgInPgStatus); diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java index a77e194..6217cde 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java @@ -95,10 +95,10 @@ @Path("getDayInPgStatistic") @Produces(MediaType.APPLICATION_JSON) public Map getDayInPgStatistic() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay(); if (pgInPgInfoDtoList == null) @@ -179,14 +179,8 @@ int inNum = 0; try { - if(isDevFault!=null) - { inNum = pgAlarmManager.getMonthAlarmNum(isDevFault); - msg = "报警次数获取成功";} - else - { - msg="请输入参数"; - } + msg = "报警次数获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "报警次数获取失败"; @@ -228,13 +222,13 @@ @POST @Path("getDayAlarmStatistic") @Produces(MediaType.APPLICATION_JSON) - public Map getDayAlarmStatistic(@FormParam("isDevFault") String isDevFault) throws Exception { - Map resultMap = new HashMap(); + public Map getDayAlarmStatistic() throws Exception { + Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmTjDtoList = new ArrayList(); try { - pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(isDevFault); + pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(); if (pgAlarmTjDtoList == null) msg = "信息获取失败"; else @@ -256,9 +250,9 @@ @Path("getAlarmList") @Produces(MediaType.APPLICATION_JSON) public Map getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{ - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgAlarmDtoList=new ArrayList(); + List pgAlarmDtoList=new ArrayList<>(); try{ pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault); msg="信息获取成功"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index b42a182..6ee63ff 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -40,7 +40,8 @@ @POST @Path("addPipeLine") @Produces(MediaType.APPLICATION_JSON) - public Map addLog( @FormParam("lineType") String lineType, + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, @FormParam("secRow") String secRow, @FormParam("secColumn") String secColumn, @FormParam("pileAcuList") String pileAcuList) throws Exception { @@ -50,7 +51,7 @@ Map resultMap = new HashMap<>(); try { - resultMap = pgPipeLineManager.addPipeLine(lineType,secRow,secColumn,pileAcuList); + resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList); resultMap.put("msg","提交成功"); resultMap.put("result","true"); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ 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 index b4424eb..15d0934 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -1,16 +1,18 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import org.apache.poi.ss.usermodel.DateUtil; 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; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by yxw on 2018/4/2. @@ -68,18 +70,20 @@ //yyyy-mm-dd public List getPgInPersonListByDay() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=getStartDayString(); + List pgInPgInfoDtoList = createDTO(startDay); - List pgInPgInfoDtoList = new ArrayList(); - - String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t group " + - "by to_char(t.intime, 'yyyy-mm-dd')"; + String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t " + +"where t.intime > to_date('"+startDay+"','yyyy-mm-dd') and t.intime < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(t.intime, 'yyyy-mm-dd') order by to_char(t.intime,'yyyy-mm-dd')"; List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgInPgInfoDto pgInPgInfoDto = new PgInPgInfoDto(); - pgInPgInfoDto.setInPgNum(objects.get(i)[0].toString()); - pgInPgInfoDto.setInTime(objects.get(i)[1].toString()); - pgInPgInfoDtoList.add(pgInPgInfoDto); + for(PgInPgInfoDto pgInPgInfoDto:pgInPgInfoDtoList){ + if(pgInPgInfoDto.getInTime().equals(objects.get(i)[1].toString())) + pgInPgInfoDtoList.get(i).setInPgNum(objects.get(i)[0].toString()); + } } return pgInPgInfoDtoList; } @@ -119,4 +123,40 @@ return null; } + public String getStartDayString(){ + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 7); + Date startDate = calendar.getTime(); + + return DateUtils.sdf_day.format(startDate); + } + + private List createDTO(String startDay) + { + List pgInPgInfoDtoList=new ArrayList<>(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgInPgInfoDto pgInPgInfoDto=new PgInPgInfoDto(); + + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + + pgInPgInfoDto.setInTime(DateUtils.sdf_day.format(dt)); + pgInPgInfoDto.setInPgNum("0"); + pgInPgInfoDtoList.add(pgInPgInfoDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgInPgInfoDtoList; + } + } \ 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 index baacd93..534f1eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -51,12 +51,14 @@ public Map getAlarmList(@FormParam("alarmType") String alarmType, @FormParam("startDay") String startDay, @FormParam("endDay") String endDay, - @FormParam("isNew") String isNew) throws Exception { + @FormParam("isNew") String isNew, + @FormParam("page") int page, + @FormParam("row") int rows) throws Exception { Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmDtoList = new ArrayList<>(); try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew); + pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows); if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0) msg = "没有报警信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index a0245ba..bf92fe4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -6,10 +6,8 @@ import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; -import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index 455e9af..326b0c6 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -48,7 +48,7 @@ @FormParam("doc_name") String doc_name, @FormParam("construct_doc") String construct_doc, @FormParam("cs_name") String cs_name)throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); PgCsDocument pgCsDocument = new PgCsDocument(); String result = ""; @@ -91,7 +91,7 @@ @FormParam("doc_name") String doc_name, @FormParam("cs_name") String cs_name) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index a18bb85..94c5c84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -165,7 +165,6 @@ pgDevice.setIp(ip); pgDevice.setModBus(modBus); pgDevice.setMome(mome); - pgDevice.setIsOpen(0); pgDevice.setActive(1); pgDeviceManager.save(pgDevice); @@ -231,7 +230,6 @@ pgDevice.setModBus(modBus); pgDevice.setMome(mome); pgDevice.setActive(1); - pgDevice.setIsOpen(Integer.valueOf(isOpen)); pgDeviceManager.save(pgDevice); result = "true"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index ca65da3..ff85c61 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -86,6 +86,8 @@ if(inTime!=null) pgInPgStatus.setInTime(DateUtils.sdf4.parse(inTime)); + else + pgInPgStatus.setInTime(new Date()); pgInPgStatus.setPgInPgPersonId(pgInPgPerson1); pgInPgStatusManager.save(pgInPgStatus); diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java index a77e194..6217cde 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java @@ -95,10 +95,10 @@ @Path("getDayInPgStatistic") @Produces(MediaType.APPLICATION_JSON) public Map getDayInPgStatistic() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay(); if (pgInPgInfoDtoList == null) @@ -179,14 +179,8 @@ int inNum = 0; try { - if(isDevFault!=null) - { inNum = pgAlarmManager.getMonthAlarmNum(isDevFault); - msg = "报警次数获取成功";} - else - { - msg="请输入参数"; - } + msg = "报警次数获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "报警次数获取失败"; @@ -228,13 +222,13 @@ @POST @Path("getDayAlarmStatistic") @Produces(MediaType.APPLICATION_JSON) - public Map getDayAlarmStatistic(@FormParam("isDevFault") String isDevFault) throws Exception { - Map resultMap = new HashMap(); + public Map getDayAlarmStatistic() throws Exception { + Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmTjDtoList = new ArrayList(); try { - pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(isDevFault); + pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(); if (pgAlarmTjDtoList == null) msg = "信息获取失败"; else @@ -256,9 +250,9 @@ @Path("getAlarmList") @Produces(MediaType.APPLICATION_JSON) public Map getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{ - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgAlarmDtoList=new ArrayList(); + List pgAlarmDtoList=new ArrayList<>(); try{ pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault); msg="信息获取成功"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index b42a182..6ee63ff 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -40,7 +40,8 @@ @POST @Path("addPipeLine") @Produces(MediaType.APPLICATION_JSON) - public Map addLog( @FormParam("lineType") String lineType, + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, @FormParam("secRow") String secRow, @FormParam("secColumn") String secColumn, @FormParam("pileAcuList") String pileAcuList) throws Exception { @@ -50,7 +51,7 @@ Map resultMap = new HashMap<>(); try { - resultMap = pgPipeLineManager.addPipeLine(lineType,secRow,secColumn,pileAcuList); + resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList); resultMap.put("msg","提交成功"); resultMap.put("result","true"); diff --git "a/~$\350\257\264\346\230\21620191207.docx" "b/~$\350\257\264\346\230\21620191207.docx" new file mode 100644 index 0000000..dd1a455 --- /dev/null +++ "b/~$\350\257\264\346\230\21620191207.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" deleted file mode 100644 index 8eb33fb..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" +++ /dev/null Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 82b1019..b3467ab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,33 +7,24 @@ - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - + - @@ -61,44 +52,44 @@ - + - - + + - + - - + + - - - + + + - - - + + + - + - + @@ -109,35 +100,37 @@ - + + - + - + - + - + + - + @@ -145,83 +138,110 @@ - + - - + + + - + - - + + - - - + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + + - + - - + + - + - - + + - - - - + + + + + + - + - - + + - + + + + + + @@ -238,8 +258,6 @@ - getMonthAlarmNum - getAlarmList compositeFilter alarmTypeId getPipeGalleryByPgName @@ -259,6 +277,17 @@ getPlanResult pgPipeLine getPipeLineBylineName + StringU + getAllAlarm + getAlarmList + getPgInPersonListByDay + getDayInPgStatistic + PgConstruction + getDayAlarmStatistic + queryConstructDoc + getMonthAlarmNum + searchConstruction + getPersonNumInPgByMonth @@ -267,17 +296,6 @@ @@ -353,10 +382,10 @@ - @@ -371,6 +400,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,7 +534,7 @@ @@ -560,7 +675,17 @@ - + + + + + + + + + + + 1564361618083 @@ -653,11 +778,18 @@ - - @@ -670,8 +802,9 @@ + - + @@ -682,14 +815,14 @@ - + - + @@ -773,7 +906,8 @@ - @@ -784,6 +918,36 @@ @@ -792,127 +956,153 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -920,239 +1110,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + + + + + - + - + - - + + - - - - + + - + - - + + - + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index d43c05f..9d18f2f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,6 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat sdf_month=new SimpleDateFormat("yyyy-MM"); + //public static final SimpleDateFormat sdf_week=new SimpleDateFormat("iw"); } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index f623961..ce07d19 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -28,7 +28,7 @@ private String ip;//IP地址 private String modBus;//modBus地址 private String mome;//备注 - private int isOpen;//设备开启状态 + private String isOpen;//设备开启状态 private int active;//状态位 private List pgAlarms; @@ -157,11 +157,11 @@ } @Column(name = "ISOPEN") - public int getIsOpen() { + public String getIsOpen() { return isOpen; } - public void setIsOpen(int isOpen) { + public void setIsOpen(String isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5681a71..80009bd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.devTable.dto; + + import com.casic.PgInterface.devTable.domain.PgDevice; import java.text.SimpleDateFormat; @@ -165,7 +167,7 @@ this.setIp(pgDevice.getIp()); this.setModBus(pgDevice.getModBus()); this.setMome(pgDevice.getMome()); - this.setIsOpen(String.valueOf(pgDevice.getIsOpen())); + this.setIsOpen(pgDevice.getIsOpen()); this.setActive(String.valueOf(pgDevice.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java index 0db633a..74738ad 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.devTable.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.page.Page; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devTable.domain.PgAlarm; @@ -8,8 +9,11 @@ import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.apache.poi.util.StringUtil; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; @@ -17,10 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by yxw on 2017/10/30. @@ -31,6 +32,9 @@ @Resource private PgAlarmTypeManager pgAlarmTypeManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + public List getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){ try { Criteria criteria = createCriteria(PgAlarm.class); @@ -67,12 +71,14 @@ } public int getAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm "; + String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm "; - if (isDevFault.equals("true")) - hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.valueOf(object.toString()); @@ -80,51 +86,50 @@ public int getMonthAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','yyyy-mm')"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" + + " = to_char(sysdate,'yyyy-mm')"; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } public int getWeekAlarmNum(String isDevFault) { - String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + - " = to_char('" + DateUtils.sdf4.format(new Date()) + "','iw')"; - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + String hql = "select count(distinct pgAlarm.alarmDevId) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" + + " = to_char(sysdate,'iw')"; + + if(isDevFault!=null) { + if (isDevFault.equals("true")) + hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; + else + hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; + } Object object = this.getSession().createQuery(hql).uniqueResult(); return Integer.parseInt(String.valueOf(object)); } - public List getDayAlarmStatistic(String isDevFault) { + public List getDayAlarmStatistic() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=pgInPgStatusManager.getStartDayString(); + List pgAlarmTjDtoList = createDTO(startDay); - List pgAlarmTjDtoList = new ArrayList(); - - String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm where 1=1 "; - - if (isDevFault.equals("true")) - hql += " and pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'"; - else - hql += " and pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'"; - - hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')"; + String hql = "select count(distinct alarmDevId), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm " + +"where pgAlarm.alarmDate > to_date('"+startDay+"','yyyy-mm-dd') and pgAlarm.alarmDate < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') order by to_char(pgAlarm.alarmDate,'yyyy-mm-dd')"; List objects = (List)this.getSession().createQuery(hql).list(); for (int i = 0; i < objects.size(); i++) { - PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto(); - pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); - pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString()); - pgAlarmTjDtoList.add(pgAlarmTjDto); + for(PgAlarmTjDto pgAlarmTjDto:pgAlarmTjDtoList){ + if(pgAlarmTjDto.getAlarmDate().equals(objects.get(i)[1].toString())) + pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString()); + } } return pgAlarmTjDtoList; } @@ -133,16 +138,27 @@ PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警"); - Criteria criteria=createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active",1)); + String hql="from PgAlarm a where a.active = 1"; - if(isDevFault!=null) { + if(isDevFault!=null) + if(isDevFault.equals("true")) + hql+=" and a.alarmTypeId = " + pgAlarmType.getId(); + else if(isDevFault.equals("false")) + hql+=" and a.alarmTypeId != " + pgAlarmType.getId(); + Query query=this.getSession().createQuery(hql); + ListpgAlarmList=query.list(); + + /* + Criteria criteria=createCriteria(PgAlarm.class); + + if(isDevFault!=null) { if (isDevFault.equals("true")) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmType)); else criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType)); } - + criteria.add(Restrictions.eq("active",1));*/ + /* Date endTime=new Date(); Calendar calendar = Calendar.getInstance(); @@ -152,10 +168,10 @@ criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - criteria.add(Restrictions.le("alarmDate", endTime)); + criteria.add(Restrictions.le("alarmDate", endTime));*/ - List pgAlarmList = (List)criteria.list(); - List pgAlarmDtoList=new ArrayList(); + //List pgAlarmList = (List)criteria.list(); + List pgAlarmDtoList=new ArrayList<>(); for(PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -165,42 +181,33 @@ } //获取历史报警消息列表 - public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew) { + public List getAllAlarm(String alarmType,String startDay,String endDay,String isNew,int page,int rows) { try { Criteria criteria = createCriteria(PgAlarm.class); - criteria.addOrder(Order.desc("id")); - if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")) { + if (StringUtils.isNotBlank(alarmType)&&!alarmType.contains("全部")&&pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)!=null) criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType))); - } - if(StringUtils.isNotBlank(startDay)&&StringUtils.isNotBlank(endDay)) - { + if (StringUtils.isNotBlank(startDay)) { criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startDay))); - + } + if (StringUtils.isNotBlank(endDay)) { Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtils.sdf_day.parse(endDay)); calendar.add(Calendar.DATE, 1); criteria.add(Restrictions.le("alarmDate", calendar.getTime())); } + + if(StringUtils.isNotBlank(isNew)&&isNew.equals("false")) + criteria.add(Restrictions.eq("active", 0)); else - { - Date date=new Date(); + criteria.add(Restrictions.eq("active",1)); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0);//控制时 - calendar.set(Calendar.MINUTE, 0);//控制分 - calendar.set(Calendar.SECOND, 0);//控制秒 + criteria.addOrder(Order.desc("id")); + Page pg = pagedQuery(criteria, page, rows); - criteria.add(Restrictions.ge("alarmDate", calendar.getTime())); - - criteria.add(Restrictions.le("alarmDate",date)); - } - if(StringUtils.isNotBlank(isNew)&&isNew.equals("true")) - criteria.add(Restrictions.eq("active", 1)); - - List pgAlarmList = criteria.list(); + List pgAlarmList = (List)pg.getResult(); List pgAlarmDtoList = new ArrayList<>(); for (PgAlarm pgAlarm : pgAlarmList) { pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); @@ -215,4 +222,29 @@ } + private List createDTO(String startDay) { + List pgAlarmTjDtoList = new ArrayList(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + pgAlarmTjDto.setAlarmDate(DateUtils.sdf_day.format(dt)); + pgAlarmTjDto.setAlarmNum("0"); + pgAlarmTjDtoList.add(pgAlarmTjDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgAlarmTjDtoList; + } + } \ No newline at end of file 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 3c5ca0c..48fab47 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -170,7 +170,10 @@ dto.setDevType(objects[6].toString()); if(objects[7]!=null) dto.setIp(objects[7].toString()); - dto.setIsOpen(objects[8].toString()); + if(objects[8]!=null) + dto.setIsOpen(objects[8].toString()); + else + dto.setIsOpen(""); dto.setPartition(objects[11].toString()); dto.setPipeGallery(objects[12].toString()); dto.setPosition(objects[13].toString()); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 2f9a15c..a91c635 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -104,7 +104,7 @@ return pgPipeLineTypeNumDtoList; } - public Map addPipeLine(String lineType,String secRow, String secColumn, String pileAcuList){ + public Map addPipeLine(String lineCode,String lineType,String secRow, String secColumn, String pileAcuList){ Map resultMap=new HashMap<>(); String msg=""; String result=""; @@ -114,6 +114,7 @@ Long acuLength=pgPileAcuManager.getAcuListLength(pgPileAcuList); try{ PgPipeLine pgPipeLine=new PgPipeLine(); + pgPipeLine.setLineCode(lineCode); pgPipeLine.setLineType(lineType); pgPipeLine.setLength(acuLength); pgPipeLine.setActive(1); diff --git a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java index c655eda..2864cbd 100644 --- a/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java +++ b/src/main/java/com/casic/PgInterface/intelPlan/domain/PgPile.java @@ -39,4 +39,4 @@ public void setActive(boolean active) { this.active = active; } -} +} \ 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 index b4424eb..15d0934 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java @@ -1,16 +1,18 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import org.apache.poi.ss.usermodel.DateUtil; 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; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by yxw on 2018/4/2. @@ -68,18 +70,20 @@ //yyyy-mm-dd public List getPgInPersonListByDay() { + String today=DateUtils.sdf_day.format(new Date()); + String startDay=getStartDayString(); + List pgInPgInfoDtoList = createDTO(startDay); - List pgInPgInfoDtoList = new ArrayList(); - - String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t group " + - "by to_char(t.intime, 'yyyy-mm-dd')"; + String sql = "select count(*), to_char(t.intime, 'yyyy-mm-dd') from pg_inpg_status t " + +"where t.intime > to_date('"+startDay+"','yyyy-mm-dd') and t.intime < to_date('"+today+"','yyyy-mm-dd')" + +" group by to_char(t.intime, 'yyyy-mm-dd') order by to_char(t.intime,'yyyy-mm-dd')"; List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgInPgInfoDto pgInPgInfoDto = new PgInPgInfoDto(); - pgInPgInfoDto.setInPgNum(objects.get(i)[0].toString()); - pgInPgInfoDto.setInTime(objects.get(i)[1].toString()); - pgInPgInfoDtoList.add(pgInPgInfoDto); + for(PgInPgInfoDto pgInPgInfoDto:pgInPgInfoDtoList){ + if(pgInPgInfoDto.getInTime().equals(objects.get(i)[1].toString())) + pgInPgInfoDtoList.get(i).setInPgNum(objects.get(i)[0].toString()); + } } return pgInPgInfoDtoList; } @@ -119,4 +123,40 @@ return null; } + public String getStartDayString(){ + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - 7); + Date startDate = calendar.getTime(); + + return DateUtils.sdf_day.format(startDate); + } + + private List createDTO(String startDay) + { + List pgInPgInfoDtoList=new ArrayList<>(); + + try { + Date dt1 = DateUtils.sdf_day.parse(startDay); + Date dt; + + for(int i=0;i<7;i++) + { + PgInPgInfoDto pgInPgInfoDto=new PgInPgInfoDto(); + + Calendar calendar = new GregorianCalendar(); + calendar.setTime(dt1); + calendar.add(calendar.DATE,i); + dt=calendar.getTime(); + + pgInPgInfoDto.setInTime(DateUtils.sdf_day.format(dt)); + pgInPgInfoDto.setInPgNum("0"); + pgInPgInfoDtoList.add(pgInPgInfoDto); + } + } + catch(Exception ex){ + ex.printStackTrace(); + } + return pgInPgInfoDtoList; + } + } \ 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 index baacd93..534f1eb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -51,12 +51,14 @@ public Map getAlarmList(@FormParam("alarmType") String alarmType, @FormParam("startDay") String startDay, @FormParam("endDay") String endDay, - @FormParam("isNew") String isNew) throws Exception { + @FormParam("isNew") String isNew, + @FormParam("page") int page, + @FormParam("row") int rows) throws Exception { Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmDtoList = new ArrayList<>(); try { - pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew); + pgAlarmDtoList = pgAlarmManager.getAllAlarm(alarmType,startDay,endDay,isNew,page,rows); if (pgAlarmDtoList==null||pgAlarmDtoList.size() == 0) msg = "没有报警信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index a0245ba..bf92fe4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -6,10 +6,8 @@ import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; -import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index 455e9af..326b0c6 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -48,7 +48,7 @@ @FormParam("doc_name") String doc_name, @FormParam("construct_doc") String construct_doc, @FormParam("cs_name") String cs_name)throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); PgCsDocument pgCsDocument = new PgCsDocument(); String result = ""; @@ -91,7 +91,7 @@ @FormParam("doc_name") String doc_name, @FormParam("cs_name") String cs_name) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index a18bb85..94c5c84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -165,7 +165,6 @@ pgDevice.setIp(ip); pgDevice.setModBus(modBus); pgDevice.setMome(mome); - pgDevice.setIsOpen(0); pgDevice.setActive(1); pgDeviceManager.save(pgDevice); @@ -231,7 +230,6 @@ pgDevice.setModBus(modBus); pgDevice.setMome(mome); pgDevice.setActive(1); - pgDevice.setIsOpen(Integer.valueOf(isOpen)); pgDeviceManager.save(pgDevice); result = "true"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index ca65da3..ff85c61 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -86,6 +86,8 @@ if(inTime!=null) pgInPgStatus.setInTime(DateUtils.sdf4.parse(inTime)); + else + pgInPgStatus.setInTime(new Date()); pgInPgStatus.setPgInPgPersonId(pgInPgPerson1); pgInPgStatusManager.save(pgInPgStatus); diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java index a77e194..6217cde 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java @@ -95,10 +95,10 @@ @Path("getDayInPgStatistic") @Produces(MediaType.APPLICATION_JSON) public Map getDayInPgStatistic() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay(); if (pgInPgInfoDtoList == null) @@ -179,14 +179,8 @@ int inNum = 0; try { - if(isDevFault!=null) - { inNum = pgAlarmManager.getMonthAlarmNum(isDevFault); - msg = "报警次数获取成功";} - else - { - msg="请输入参数"; - } + msg = "报警次数获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "报警次数获取失败"; @@ -228,13 +222,13 @@ @POST @Path("getDayAlarmStatistic") @Produces(MediaType.APPLICATION_JSON) - public Map getDayAlarmStatistic(@FormParam("isDevFault") String isDevFault) throws Exception { - Map resultMap = new HashMap(); + public Map getDayAlarmStatistic() throws Exception { + Map resultMap = new HashMap<>(); String msg = ""; List pgAlarmTjDtoList = new ArrayList(); try { - pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(isDevFault); + pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(); if (pgAlarmTjDtoList == null) msg = "信息获取失败"; else @@ -256,9 +250,9 @@ @Path("getAlarmList") @Produces(MediaType.APPLICATION_JSON) public Map getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{ - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgAlarmDtoList=new ArrayList(); + List pgAlarmDtoList=new ArrayList<>(); try{ pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault); msg="信息获取成功"; diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java index b42a182..6ee63ff 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -40,7 +40,8 @@ @POST @Path("addPipeLine") @Produces(MediaType.APPLICATION_JSON) - public Map addLog( @FormParam("lineType") String lineType, + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, @FormParam("secRow") String secRow, @FormParam("secColumn") String secColumn, @FormParam("pileAcuList") String pileAcuList) throws Exception { @@ -50,7 +51,7 @@ Map resultMap = new HashMap<>(); try { - resultMap = pgPipeLineManager.addPipeLine(lineType,secRow,secColumn,pileAcuList); + resultMap = pgPipeLineManager.addPipeLine(lineCode,lineType,secRow,secColumn,pileAcuList); resultMap.put("msg","提交成功"); resultMap.put("result","true"); diff --git "a/~$\350\257\264\346\230\21620191207.docx" "b/~$\350\257\264\346\230\21620191207.docx" new file mode 100644 index 0000000..dd1a455 --- /dev/null +++ "b/~$\350\257\264\346\230\21620191207.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" deleted file mode 100644 index 8eb33fb..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" +++ /dev/null Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx" new file mode 100644 index 0000000..87b8f7b --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620191207.docx" Binary files differ diff --git "a/\346\231\272\350\203\275\350\247\204\345\210\222.docx" "b/\346\231\272\350\203\275\350\247\204\345\210\222.docx" index 055787f..d1da692 100644 --- "a/\346\231\272\350\203\275\350\247\204\345\210\222.docx" +++ "b/\346\231\272\350\203\275\350\247\204\345\210\222.docx" Binary files differ