diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 5666da7..c72603e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -26,21 +26,11 @@ public class PgCoRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgCoManager pgCoManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCoManager(PgCoManager pgCoManager) { - this.pgCoManager = pgCoManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index 192aa1c..a417e84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -35,36 +35,15 @@ public class PgConstructionRs { private static Logger logger = LoggerFactory.getLogger(PgConstructionRs.class); - + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - + @Resource private PgConstructionManager pgConstructionManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) - { - this.pgConstructionManager = pgConstructionManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /* *新建工程 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 5666da7..c72603e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -26,21 +26,11 @@ public class PgCoRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgCoManager pgCoManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCoManager(PgCoManager pgCoManager) { - this.pgCoManager = pgCoManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index 192aa1c..a417e84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -35,36 +35,15 @@ public class PgConstructionRs { private static Logger logger = LoggerFactory.getLogger(PgConstructionRs.class); - + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - + @Resource private PgConstructionManager pgConstructionManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) - { - this.pgConstructionManager = pgConstructionManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /* *新建工程 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java index 549b8e5..fd3d53e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java @@ -23,12 +23,8 @@ @Path("pgConstructionType") public class PgConstructionTypeRs { - private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } + private PgConstructionTypeManager pgConstructionTypeManager; /** * 获取项目状态 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index b2060ed..b1fe121 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -31,22 +31,12 @@ public class PgCsDocumentRs { private static Logger logger = LoggerFactory.getLogger(pgStatisticRs.class); - + @Resource private PgCsDocumentManager pgCsDocumentManager; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgCsDocumentManager(PgCsDocumentManager pgCsDocumentManager) { - this.pgCsDocumentManager = pgCsDocumentManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - /* 新增&上传 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 5666da7..c72603e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -26,21 +26,11 @@ public class PgCoRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgCoManager pgCoManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCoManager(PgCoManager pgCoManager) { - this.pgCoManager = pgCoManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index 192aa1c..a417e84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -35,36 +35,15 @@ public class PgConstructionRs { private static Logger logger = LoggerFactory.getLogger(PgConstructionRs.class); - + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - + @Resource private PgConstructionManager pgConstructionManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) - { - this.pgConstructionManager = pgConstructionManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /* *新建工程 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java index 549b8e5..fd3d53e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java @@ -23,12 +23,8 @@ @Path("pgConstructionType") public class PgConstructionTypeRs { - private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } + private PgConstructionTypeManager pgConstructionTypeManager; /** * 获取项目状态 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index b2060ed..b1fe121 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -31,22 +31,12 @@ public class PgCsDocumentRs { private static Logger logger = LoggerFactory.getLogger(pgStatisticRs.class); - + @Resource private PgCsDocumentManager pgCsDocumentManager; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgCsDocumentManager(PgCsDocumentManager pgCsDocumentManager) { - this.pgCsDocumentManager = pgCsDocumentManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - /* 新增&上传 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 5089b07..5b6037e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -29,27 +29,13 @@ private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PipeGalleryManager pipeGalleryManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - /** * 根据设备类型获取设备信息 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index 8a0b806..421d249 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -26,13 +26,8 @@ public class PgDeviceTypeRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceTypeRs.class); - - private PgDeviceTypeManager pgDeviceTypeManager; - @Resource - public void setPgDeviceTypeManager(PgDeviceTypeManager pgDeviceTypeManager) { - this.pgDeviceTypeManager = pgDeviceTypeManager; - } + private PgDeviceTypeManager pgDeviceTypeManager; /** * 显示设备列表 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 5666da7..c72603e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -26,21 +26,11 @@ public class PgCoRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgCoManager pgCoManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCoManager(PgCoManager pgCoManager) { - this.pgCoManager = pgCoManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index 192aa1c..a417e84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -35,36 +35,15 @@ public class PgConstructionRs { private static Logger logger = LoggerFactory.getLogger(PgConstructionRs.class); - + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - + @Resource private PgConstructionManager pgConstructionManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) - { - this.pgConstructionManager = pgConstructionManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /* *新建工程 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java index 549b8e5..fd3d53e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java @@ -23,12 +23,8 @@ @Path("pgConstructionType") public class PgConstructionTypeRs { - private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } + private PgConstructionTypeManager pgConstructionTypeManager; /** * 获取项目状态 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index b2060ed..b1fe121 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -31,22 +31,12 @@ public class PgCsDocumentRs { private static Logger logger = LoggerFactory.getLogger(pgStatisticRs.class); - + @Resource private PgCsDocumentManager pgCsDocumentManager; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgCsDocumentManager(PgCsDocumentManager pgCsDocumentManager) { - this.pgCsDocumentManager = pgCsDocumentManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - /* 新增&上传 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 5089b07..5b6037e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -29,27 +29,13 @@ private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PipeGalleryManager pipeGalleryManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - /** * 根据设备类型获取设备信息 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index 8a0b806..421d249 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -26,13 +26,8 @@ public class PgDeviceTypeRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceTypeRs.class); - - private PgDeviceTypeManager pgDeviceTypeManager; - @Resource - public void setPgDeviceTypeManager(PgDeviceTypeManager pgDeviceTypeManager) { - this.pgDeviceTypeManager = pgDeviceTypeManager; - } + private PgDeviceTypeManager pgDeviceTypeManager; /** * 显示设备列表 diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 7d2e0e4..8dfea1b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -26,21 +26,11 @@ public class PgO2Rs { private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); - + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgO2Manager pgO2Manager; - @Resource - public void setPgO2Manager(PgO2Manager pgO2Manager) { - this.pgO2Manager = pgO2Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java index f2c49d7..99904ad 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -30,17 +30,11 @@ @Path("pgPatrol") public class PgPatrolRs { + @Resource PgPatrolManager pgPatrolManager = new PgPatrolManager(); + @Resource PgPatrolDocManager pgPatrolDocManager = new PgPatrolDocManager(); - @Resource - public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { - this.pgPatrolManager = pgPatrolManager; - } - - @Resource - public void setPgPatrolDocManager(PgPatrolDocManager pgPatrolDocManager) {this.pgPatrolDocManager = pgPatrolDocManager;} - /** * 新增巡检记录 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 5666da7..c72603e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -26,21 +26,11 @@ public class PgCoRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgCoManager pgCoManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCoManager(PgCoManager pgCoManager) { - this.pgCoManager = pgCoManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index 192aa1c..a417e84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -35,36 +35,15 @@ public class PgConstructionRs { private static Logger logger = LoggerFactory.getLogger(PgConstructionRs.class); - + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - + @Resource private PgConstructionManager pgConstructionManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) - { - this.pgConstructionManager = pgConstructionManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /* *新建工程 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java index 549b8e5..fd3d53e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java @@ -23,12 +23,8 @@ @Path("pgConstructionType") public class PgConstructionTypeRs { - private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } + private PgConstructionTypeManager pgConstructionTypeManager; /** * 获取项目状态 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index b2060ed..b1fe121 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -31,22 +31,12 @@ public class PgCsDocumentRs { private static Logger logger = LoggerFactory.getLogger(pgStatisticRs.class); - + @Resource private PgCsDocumentManager pgCsDocumentManager; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgCsDocumentManager(PgCsDocumentManager pgCsDocumentManager) { - this.pgCsDocumentManager = pgCsDocumentManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - /* 新增&上传 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 5089b07..5b6037e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -29,27 +29,13 @@ private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PipeGalleryManager pipeGalleryManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - /** * 根据设备类型获取设备信息 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index 8a0b806..421d249 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -26,13 +26,8 @@ public class PgDeviceTypeRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceTypeRs.class); - - private PgDeviceTypeManager pgDeviceTypeManager; - @Resource - public void setPgDeviceTypeManager(PgDeviceTypeManager pgDeviceTypeManager) { - this.pgDeviceTypeManager = pgDeviceTypeManager; - } + private PgDeviceTypeManager pgDeviceTypeManager; /** * 显示设备列表 diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 7d2e0e4..8dfea1b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -26,21 +26,11 @@ public class PgO2Rs { private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); - + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgO2Manager pgO2Manager; - @Resource - public void setPgO2Manager(PgO2Manager pgO2Manager) { - this.pgO2Manager = pgO2Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java index f2c49d7..99904ad 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -30,17 +30,11 @@ @Path("pgPatrol") public class PgPatrolRs { + @Resource PgPatrolManager pgPatrolManager = new PgPatrolManager(); + @Resource PgPatrolDocManager pgPatrolDocManager = new PgPatrolDocManager(); - @Resource - public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { - this.pgPatrolManager = pgPatrolManager; - } - - @Resource - public void setPgPatrolDocManager(PgPatrolDocManager pgPatrolDocManager) {this.pgPatrolDocManager = pgPatrolDocManager;} - /** * 新增巡检记录 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index d3abb13..a9e968b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + @Resource private PgDeviceManager pgDeviceManager; + @Resource private PgShManager pgShManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgShManager(PgShManager pgShManager) { - this.pgShManager = pgShManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java index 147b31f..2888d25 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -26,21 +26,11 @@ public class PgTempHumRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgTempHumManager pgTempHumManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgTempHumManager(PgTempHumManager pgTempHumManager) { - this.pgTempHumManager = pgTempHumManager; - } - /** * 获取设备监测数据 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - + @@ -435,7 +485,7 @@ - + @@ -890,14 +940,7 @@ - - - - 1521703079910 - 1521783169434 @@ -1235,11 +1278,18 @@ - - @@ -1254,7 +1304,7 @@ - + @@ -1406,270 +1456,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1801,6 +1587,16 @@ + + + + + + + + + + @@ -1821,16 +1617,243 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java index f76a6c0..782e546 100644 --- a/src/main/java/com/casic/PgInterface/core/http/httpURL.java +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -8,7 +8,7 @@ public class httpURL { - static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorizationInput="Uradio:Ur@dio2018";//明码 static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java index 5ff22a7..7b6bf68 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java @@ -29,26 +29,14 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRule.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgAlarmTypeManager pgAlarmTypeManager; - + @Resource private PgAlarmRuleManager pgAlarmRuleManager; - @Resource - public void setPgAlarmRuleManager(PgAlarmRuleManager pgAlarmRuleManager) { - this.pgAlarmRuleManager = pgAlarmRuleManager; - } - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { - this.pgAlarmTypeManager = pgAlarmTypeManager; - } /** * 新增报警阈值 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index c7d072b..8ba1efb 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -26,12 +26,8 @@ private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - private PgAlarmTjManager pgAlarmTjManager; - @Resource - public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { - this.pgAlarmTjManager = pgAlarmTjManager; - } + private PgAlarmTjManager pgAlarmTjManager; /** * 按类型统计历史报警记录 diff --git a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java index 9f8f5f7..26f5d6a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java @@ -26,12 +26,8 @@ public class PgAuthorityRs { private static Logger logger = LoggerFactory.getLogger(PgAuthority.class); - private PgAuthorityManager pgAuthorityManager; - @Resource - public void setPgAuthorityManager(PgAuthorityManager pgAuthorityManager) { - this.pgAuthorityManager = pgAuthorityManager; - } + private PgAuthorityManager pgAuthorityManager; /** * 新增权限 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index f7b3fac..98d84b1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + @Resource private PgCh4Manager pgCh4Manager; + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { - this.pgCh4Manager = pgCh4Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 5666da7..c72603e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -26,21 +26,11 @@ public class PgCoRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgCoManager pgCoManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgCoManager(PgCoManager pgCoManager) { - this.pgCoManager = pgCoManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index 192aa1c..a417e84 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -35,36 +35,15 @@ public class PgConstructionRs { private static Logger logger = LoggerFactory.getLogger(PgConstructionRs.class); - + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - + @Resource private PgConstructionManager pgConstructionManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PgDeviceManager pgDeviceManager; - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) - { - this.pgConstructionManager = pgConstructionManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /* *新建工程 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java index 549b8e5..fd3d53e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java @@ -23,12 +23,8 @@ @Path("pgConstructionType") public class PgConstructionTypeRs { - private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } + private PgConstructionTypeManager pgConstructionTypeManager; /** * 获取项目状态 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java index b2060ed..b1fe121 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java @@ -31,22 +31,12 @@ public class PgCsDocumentRs { private static Logger logger = LoggerFactory.getLogger(pgStatisticRs.class); - + @Resource private PgCsDocumentManager pgCsDocumentManager; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgCsDocumentManager(PgCsDocumentManager pgCsDocumentManager) { - this.pgCsDocumentManager = pgCsDocumentManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - /* 新增&上传 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 5089b07..5b6037e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -29,27 +29,13 @@ private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgPartitionManager pgPartitionManager; - + @Resource private PipeGalleryManager pipeGalleryManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - /** * 根据设备类型获取设备信息 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index 8a0b806..421d249 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -26,13 +26,8 @@ public class PgDeviceTypeRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceTypeRs.class); - - private PgDeviceTypeManager pgDeviceTypeManager; - @Resource - public void setPgDeviceTypeManager(PgDeviceTypeManager pgDeviceTypeManager) { - this.pgDeviceTypeManager = pgDeviceTypeManager; - } + private PgDeviceTypeManager pgDeviceTypeManager; /** * 显示设备列表 diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 7d2e0e4..8dfea1b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -26,21 +26,11 @@ public class PgO2Rs { private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); - + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgO2Manager pgO2Manager; - @Resource - public void setPgO2Manager(PgO2Manager pgO2Manager) { - this.pgO2Manager = pgO2Manager; - } - - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java index f2c49d7..99904ad 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -30,17 +30,11 @@ @Path("pgPatrol") public class PgPatrolRs { + @Resource PgPatrolManager pgPatrolManager = new PgPatrolManager(); + @Resource PgPatrolDocManager pgPatrolDocManager = new PgPatrolDocManager(); - @Resource - public void setPgPatrolManager(PgPatrolManager pgPatrolManager) { - this.pgPatrolManager = pgPatrolManager; - } - - @Resource - public void setPgPatrolDocManager(PgPatrolDocManager pgPatrolDocManager) {this.pgPatrolDocManager = pgPatrolDocManager;} - /** * 新增巡检记录 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index d3abb13..a9e968b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -27,20 +27,12 @@ private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + @Resource private PgDeviceManager pgDeviceManager; + @Resource private PgShManager pgShManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgShManager(PgShManager pgShManager) { - this.pgShManager = pgShManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java index 147b31f..2888d25 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -26,21 +26,11 @@ public class PgTempHumRs { private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); - + @Resource private PgDeviceManager pgDeviceManager; - + @Resource private PgTempHumManager pgTempHumManager; - @Resource - public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { - this.pgDeviceManager = pgDeviceManager; - } - - @Resource - public void setPgTempHumManager(PgTempHumManager pgTempHumManager) { - this.pgTempHumManager = pgTempHumManager; - } - /** * 获取设备监测数据 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java index 6d310bd..cac8922 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java @@ -27,21 +27,11 @@ public class PgUserRs { private static Logger logger = LoggerFactory.getLogger(PgUserRs.class); - + @Resource private PgUserManager pgUserManager; - + @Resource private PgRoleManager pgRoleManager; - @Resource - public void setPgUserManager(PgUserManager pgUserManager) { - this.pgUserManager = pgUserManager; - } - - @Resource - public void setPgRoleManager(PgRoleManager pgRoleManager) { - this.pgRoleManager = pgRoleManager; - } - /** * 显示人员列表 */ diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java index 3c301bc..e9ea38f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -29,21 +29,11 @@ public class PipeGalleryRs { private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); - + @Resource private PipeGalleryManager pipeGalleryManager; - + @Resource private PgPartitionManager pgPartitionManager; - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - /** * 新增管廊 */ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 99a81de..8d7e967 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,14 +8,24 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -58,7 +68,7 @@ - + @@ -70,7 +80,7 @@ - + @@ -82,7 +92,7 @@ - + @@ -91,7 +101,7 @@ - + @@ -108,49 +118,91 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -209,23 +261,6 @@ @@ -369,6 +421,15 @@ + + + + + + + + + @@ -387,18 +448,7 @@ - - - - - - - - - - - - +