diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index 4774573..6d55e33 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -131,7 +131,7 @@
result = "false";
msg = "不存在该管廊信息";
} else {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
pgPartition.setParCode(parCode);
pgPartition.setParName(parName);
pgPartition.setPipeGalleryId(pipeGallery);
@@ -163,7 +163,7 @@
String result="false";
try {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
if(pgPartition==null) {
msg = "不存在该分区信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index 4774573..6d55e33 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -131,7 +131,7 @@
result = "false";
msg = "不存在该管廊信息";
} else {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
pgPartition.setParCode(parCode);
pgPartition.setParName(parName);
pgPartition.setPipeGalleryId(pipeGallery);
@@ -163,7 +163,7 @@
String result="false";
try {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
if(pgPartition==null) {
msg = "不存在该分区信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
index 1610c07..cf2520c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
@@ -1,6 +1,5 @@
package com.casic.PgInterface.rs;
-import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.patroler.domain.PgPatroler;
import com.casic.PgInterface.patroler.dto.PgPatrolerDto;
import com.casic.PgInterface.patroler.manager.PgPatrolerManager;
@@ -82,8 +81,8 @@
msg = "用户名已经存在!";
} else {
pgPatroler.setUserName(userName);
- String pass = StringUtils.getMD5(password);
- pgPatroler.setPassword(pass);
+ //String pass = StringUtils.getMD5(password);
+ pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
pgPatroler.setPost(post);
pgPatroler.setPhoneNumber(phoneNumber);
@@ -122,7 +121,7 @@
String result = "";
String msg = "";
try {
- PgPatroler pgPatroler = pgPatrolerManager.get(id);
+ PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id));
pgPatroler.setUserName(userName);
pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
@@ -137,6 +136,9 @@
msg = "编辑失败";
e.printStackTrace();
}
+
+ resultMap.put("result",result);
+ resultMap.put("msg",msg);
return resultMap;
}
@@ -153,7 +155,7 @@
String result="false";
try {
- PgPatroler pgPatroler=pgPatrolerManager.get(id);
+ PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id));
if(pgPatroler==null) {
msg = "不存在该人员信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index 4774573..6d55e33 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -131,7 +131,7 @@
result = "false";
msg = "不存在该管廊信息";
} else {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
pgPartition.setParCode(parCode);
pgPartition.setParName(parName);
pgPartition.setPipeGalleryId(pipeGallery);
@@ -163,7 +163,7 @@
String result="false";
try {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
if(pgPartition==null) {
msg = "不存在该分区信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
index 1610c07..cf2520c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
@@ -1,6 +1,5 @@
package com.casic.PgInterface.rs;
-import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.patroler.domain.PgPatroler;
import com.casic.PgInterface.patroler.dto.PgPatrolerDto;
import com.casic.PgInterface.patroler.manager.PgPatrolerManager;
@@ -82,8 +81,8 @@
msg = "用户名已经存在!";
} else {
pgPatroler.setUserName(userName);
- String pass = StringUtils.getMD5(password);
- pgPatroler.setPassword(pass);
+ //String pass = StringUtils.getMD5(password);
+ pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
pgPatroler.setPost(post);
pgPatroler.setPhoneNumber(phoneNumber);
@@ -122,7 +121,7 @@
String result = "";
String msg = "";
try {
- PgPatroler pgPatroler = pgPatrolerManager.get(id);
+ PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id));
pgPatroler.setUserName(userName);
pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
@@ -137,6 +136,9 @@
msg = "编辑失败";
e.printStackTrace();
}
+
+ resultMap.put("result",result);
+ resultMap.put("msg",msg);
return resultMap;
}
@@ -153,7 +155,7 @@
String result="false";
try {
- PgPatroler pgPatroler=pgPatrolerManager.get(id);
+ PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id));
if(pgPatroler==null) {
msg = "不存在该人员信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index ce12696..df10aa6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -158,7 +158,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgPipeLine pgPipeLine = pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
pgPipeLine.setLineCode(lineCode);
pgPipeLine.setLineType(lineType);
@@ -195,7 +195,7 @@
String result="false";
try {
- PgPipeLine pgPipeLine=pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
if(pgPipeLine==null) {
msg = "不存在该管线信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index 4774573..6d55e33 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -131,7 +131,7 @@
result = "false";
msg = "不存在该管廊信息";
} else {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
pgPartition.setParCode(parCode);
pgPartition.setParName(parName);
pgPartition.setPipeGalleryId(pipeGallery);
@@ -163,7 +163,7 @@
String result="false";
try {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
if(pgPartition==null) {
msg = "不存在该分区信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
index 1610c07..cf2520c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
@@ -1,6 +1,5 @@
package com.casic.PgInterface.rs;
-import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.patroler.domain.PgPatroler;
import com.casic.PgInterface.patroler.dto.PgPatrolerDto;
import com.casic.PgInterface.patroler.manager.PgPatrolerManager;
@@ -82,8 +81,8 @@
msg = "用户名已经存在!";
} else {
pgPatroler.setUserName(userName);
- String pass = StringUtils.getMD5(password);
- pgPatroler.setPassword(pass);
+ //String pass = StringUtils.getMD5(password);
+ pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
pgPatroler.setPost(post);
pgPatroler.setPhoneNumber(phoneNumber);
@@ -122,7 +121,7 @@
String result = "";
String msg = "";
try {
- PgPatroler pgPatroler = pgPatrolerManager.get(id);
+ PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id));
pgPatroler.setUserName(userName);
pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
@@ -137,6 +136,9 @@
msg = "编辑失败";
e.printStackTrace();
}
+
+ resultMap.put("result",result);
+ resultMap.put("msg",msg);
return resultMap;
}
@@ -153,7 +155,7 @@
String result="false";
try {
- PgPatroler pgPatroler=pgPatrolerManager.get(id);
+ PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id));
if(pgPatroler==null) {
msg = "不存在该人员信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index ce12696..df10aa6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -158,7 +158,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgPipeLine pgPipeLine = pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
pgPipeLine.setLineCode(lineCode);
pgPipeLine.setLineType(lineType);
@@ -195,7 +195,7 @@
String result="false";
try {
- PgPipeLine pgPipeLine=pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
if(pgPipeLine==null) {
msg = "不存在该管线信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
index a8a0e2d..cf48cb6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
@@ -155,7 +155,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgTexture pgTexture=pgTextureManager.get(id);
+ PgTexture pgTexture=pgTextureManager.get(Long.valueOf(id));
pgTexture.setTextureCode(textureCode);
pgTexture.setTextureName(textureName);
pgTexture.setTextureMaterial(textureMaterial);
@@ -190,7 +190,7 @@
String result="false";
try {
- PgTexture pgTexture=pgTextureManager.get(id);
+ PgTexture pgTexture=pgTextureManager.get(Long.valueOf(id));
if(pgTexture==null) {
msg = "不存在该部件信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index 4774573..6d55e33 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -131,7 +131,7 @@
result = "false";
msg = "不存在该管廊信息";
} else {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
pgPartition.setParCode(parCode);
pgPartition.setParName(parName);
pgPartition.setPipeGalleryId(pipeGallery);
@@ -163,7 +163,7 @@
String result="false";
try {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
if(pgPartition==null) {
msg = "不存在该分区信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
index 1610c07..cf2520c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
@@ -1,6 +1,5 @@
package com.casic.PgInterface.rs;
-import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.patroler.domain.PgPatroler;
import com.casic.PgInterface.patroler.dto.PgPatrolerDto;
import com.casic.PgInterface.patroler.manager.PgPatrolerManager;
@@ -82,8 +81,8 @@
msg = "用户名已经存在!";
} else {
pgPatroler.setUserName(userName);
- String pass = StringUtils.getMD5(password);
- pgPatroler.setPassword(pass);
+ //String pass = StringUtils.getMD5(password);
+ pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
pgPatroler.setPost(post);
pgPatroler.setPhoneNumber(phoneNumber);
@@ -122,7 +121,7 @@
String result = "";
String msg = "";
try {
- PgPatroler pgPatroler = pgPatrolerManager.get(id);
+ PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id));
pgPatroler.setUserName(userName);
pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
@@ -137,6 +136,9 @@
msg = "编辑失败";
e.printStackTrace();
}
+
+ resultMap.put("result",result);
+ resultMap.put("msg",msg);
return resultMap;
}
@@ -153,7 +155,7 @@
String result="false";
try {
- PgPatroler pgPatroler=pgPatrolerManager.get(id);
+ PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id));
if(pgPatroler==null) {
msg = "不存在该人员信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index ce12696..df10aa6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -158,7 +158,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgPipeLine pgPipeLine = pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
pgPipeLine.setLineCode(lineCode);
pgPipeLine.setLineType(lineType);
@@ -195,7 +195,7 @@
String result="false";
try {
- PgPipeLine pgPipeLine=pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
if(pgPipeLine==null) {
msg = "不存在该管线信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
index a8a0e2d..cf48cb6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
@@ -155,7 +155,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgTexture pgTexture=pgTextureManager.get(id);
+ PgTexture pgTexture=pgTextureManager.get(Long.valueOf(id));
pgTexture.setTextureCode(textureCode);
pgTexture.setTextureName(textureName);
pgTexture.setTextureMaterial(textureMaterial);
@@ -190,7 +190,7 @@
String result="false";
try {
- PgTexture pgTexture=pgTextureManager.get(id);
+ PgTexture pgTexture=pgTextureManager.get(Long.valueOf(id));
if(pgTexture==null) {
msg = "不存在该部件信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index d390ad0..2f180a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -102,7 +102,7 @@
String msg = "";
try {
- PipeGallery pipeGallery = pipeGalleryManager.get(id);
+ PipeGallery pipeGallery = pipeGalleryManager.get(Long.valueOf(id));
if (pipeGallery == null) {
result = "false";
msg = "不存在该管廊信息";
@@ -136,7 +136,7 @@
String result="false";
try {
- PipeGallery pipeGallery=pipeGalleryManager.get(id);
+ PipeGallery pipeGallery=pipeGalleryManager.get(Long.valueOf(id));
if(pipeGallery==null) {
msg = "不存在该管廊信息";
result="false";
diff --git a/PgInterface.iml b/PgInterface.iml
index 1bbc2a6..9215f5a 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -13,8 +13,6 @@
-
-
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index c93e491..97202ad 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -97,7 +97,7 @@
try {
PgAlarm pgAlarm=new PgAlarm();
- pgAlarm=pgAlarmManager.get(id);
+ pgAlarm=pgAlarmManager.get(Long.valueOf(id));
if(pgAlarm==null) {
msg = "不存在该报警信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
index 02c81aa..469f164 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java
@@ -104,7 +104,7 @@
String msg = "";
try{
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
pgAlarmType.setAlarmType(alarmType);
pgAlarmTypeManager.save(alarmType);
result = "true";
@@ -137,7 +137,7 @@
String result="false";
try {
- PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id);
+ PgAlarmType pgAlarmType=pgAlarmTypeManager.get(Long.valueOf(id));
if(pgAlarmType==null) {
msg = "不存在该报警类型信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 8b81073..ef26845 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -182,7 +182,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgDevice pgDevice = pgDeviceManager.get(id);
+ PgDevice pgDevice = pgDeviceManager.get(Long.valueOf(id));
pgDevice.setDevCode(devCode);
pgDevice.setDevName(devName);
pgDevice.setBrand(brand);
@@ -216,7 +216,7 @@
String result="false";
try {
- PgDevice pgDevice=pgDeviceManager.get(id);
+ PgDevice pgDevice=pgDeviceManager.get(Long.valueOf(id));
if(pgDevice==null) {
msg = "不存在该设备信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
index 4774573..6d55e33 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java
@@ -131,7 +131,7 @@
result = "false";
msg = "不存在该管廊信息";
} else {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
pgPartition.setParCode(parCode);
pgPartition.setParName(parName);
pgPartition.setPipeGalleryId(pipeGallery);
@@ -163,7 +163,7 @@
String result="false";
try {
- PgPartition pgPartition=pgPartitionManager.get(id);
+ PgPartition pgPartition=pgPartitionManager.get(Long.valueOf(id));
if(pgPartition==null) {
msg = "不存在该分区信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
index 1610c07..cf2520c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java
@@ -1,6 +1,5 @@
package com.casic.PgInterface.rs;
-import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.patroler.domain.PgPatroler;
import com.casic.PgInterface.patroler.dto.PgPatrolerDto;
import com.casic.PgInterface.patroler.manager.PgPatrolerManager;
@@ -82,8 +81,8 @@
msg = "用户名已经存在!";
} else {
pgPatroler.setUserName(userName);
- String pass = StringUtils.getMD5(password);
- pgPatroler.setPassword(pass);
+ //String pass = StringUtils.getMD5(password);
+ pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
pgPatroler.setPost(post);
pgPatroler.setPhoneNumber(phoneNumber);
@@ -122,7 +121,7 @@
String result = "";
String msg = "";
try {
- PgPatroler pgPatroler = pgPatrolerManager.get(id);
+ PgPatroler pgPatroler = pgPatrolerManager.get(Long.valueOf(id));
pgPatroler.setUserName(userName);
pgPatroler.setPassword(password);
pgPatroler.setDepartment(department);
@@ -137,6 +136,9 @@
msg = "编辑失败";
e.printStackTrace();
}
+
+ resultMap.put("result",result);
+ resultMap.put("msg",msg);
return resultMap;
}
@@ -153,7 +155,7 @@
String result="false";
try {
- PgPatroler pgPatroler=pgPatrolerManager.get(id);
+ PgPatroler pgPatroler=pgPatrolerManager.get(Long.valueOf(id));
if(pgPatroler==null) {
msg = "不存在该人员信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index ce12696..df10aa6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -158,7 +158,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgPipeLine pgPipeLine = pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine = pgPipeLineManager.get(Long.valueOf(id));
pgPipeLine.setLineCode(lineCode);
pgPipeLine.setLineType(lineType);
@@ -195,7 +195,7 @@
String result="false";
try {
- PgPipeLine pgPipeLine=pgPipeLineManager.get(id);
+ PgPipeLine pgPipeLine=pgPipeLineManager.get(Long.valueOf(id));
if(pgPipeLine==null) {
msg = "不存在该管线信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
index a8a0e2d..cf48cb6 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java
@@ -155,7 +155,7 @@
msg = "不存在管廊仓和分区信息";
} else {
try {
- PgTexture pgTexture=pgTextureManager.get(id);
+ PgTexture pgTexture=pgTextureManager.get(Long.valueOf(id));
pgTexture.setTextureCode(textureCode);
pgTexture.setTextureName(textureName);
pgTexture.setTextureMaterial(textureMaterial);
@@ -190,7 +190,7 @@
String result="false";
try {
- PgTexture pgTexture=pgTextureManager.get(id);
+ PgTexture pgTexture=pgTextureManager.get(Long.valueOf(id));
if(pgTexture==null) {
msg = "不存在该部件信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
index d390ad0..2f180a1 100644
--- a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java
@@ -102,7 +102,7 @@
String msg = "";
try {
- PipeGallery pipeGallery = pipeGalleryManager.get(id);
+ PipeGallery pipeGallery = pipeGalleryManager.get(Long.valueOf(id));
if (pipeGallery == null) {
result = "false";
msg = "不存在该管廊信息";
@@ -136,7 +136,7 @@
String result="false";
try {
- PipeGallery pipeGallery=pipeGalleryManager.get(id);
+ PipeGallery pipeGallery=pipeGalleryManager.get(Long.valueOf(id));
if(pipeGallery==null) {
msg = "不存在该管廊信息";
result="false";
diff --git a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java
index 40cb69f..f13dac6 100644
--- a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java
+++ b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java
@@ -95,7 +95,7 @@
String msg = "";
try {
- PgReservePlan pgReservePlan = pgReservePlanManager.get(id);
+ PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
if (pgReservePlan == null) {
result = "false";
msg = "不存在该预案信息";
@@ -128,7 +128,7 @@
try{
- PgReservePlan pgReservePlan=pgReservePlanManager.get(id);
+ PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
if(pgReservePlan==null)
{
result="false";