From 8b6e17ec0bb67544f45324df64d2c566eeda9b26 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 22 七月 2024 14:17:32 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml | 1
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java | 31 +++++
pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 220 ++++++++++++++++++++++---------------------
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java | 10 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/crop/CropCtrl.java | 8
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateScheduling/IrrigateSchedulingCtrl.java | 8
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java | 12 +-
10 files changed, 166 insertions(+), 132 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index 46c51d7..f774726 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -97,6 +97,7 @@
/**
* 鐢熸垚璁㈠崟鍙�
+ *
* @return
*/
public String generateOrderNo() {
@@ -114,12 +115,13 @@
/**
* 鏍规嵁鍙栨按鍙D鎴栭榾鎺у櫒鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄
+ *
* @param intakeId
* @return
*/
public JSONObject getRtu(Long intakeId, String rtuAddr) {
PrController prController = prControllerMapper.getRtu(intakeId, rtuAddr);
- if(prController == null) {
+ if (prController == null) {
return null;
}
JSONObject job_rtu = new JSONObject();
@@ -133,15 +135,16 @@
/**
* 鍒涘缓鍛戒护鏃ュ織瀵硅薄
- * @param comId 涓婚敭
+ *
+ * @param comId 涓婚敭
* @param commandCode 鍔熻兘鐮�
- * @param rtuAddr 闃�鎺у櫒鍦板潃
- * @param protocol 閫氳鍗忚鍚嶇О
- * @param param 鍙傛暟鏁版嵁
- * @param operator 鎿嶄綔鍛�
+ * @param rtuAddr 闃�鎺у櫒鍦板潃
+ * @param protocol 閫氳鍗忚鍚嶇О
+ * @param param 鍙傛暟鏁版嵁
+ * @param operator 鎿嶄綔鍛�
* @return
*/
- protected RmCommandHistory getComHistory(Long comId, String commandCode, String commandName, Long intakeId, String rtuAddr, String protocol, Object param, Long operator ) {
+ protected RmCommandHistory getComHistory(Long comId, String commandCode, String commandName, Long intakeId, String rtuAddr, String protocol, Object param, Long operator) {
RmCommandHistory rmCommandHistory = new RmCommandHistory();
rmCommandHistory.setComId(comId);
rmCommandHistory.setCommandCode(commandCode);
@@ -158,44 +161,53 @@
/**
* 鏋勯�犲懡浠ゅ璞�
- * @param comId 鍛戒护ID
+ *
+ * @param comId 鍛戒护ID
* @param commandCode 鍔熻兘鐮�
- * @param rtuAddr RTU鍦板潃
- * @param param 鍙傛暟鏁版嵁
+ * @param rtuAddr RTU鍦板潃
+ * @param param 鍙傛暟鏁版嵁
* @return 鏋勯�犲ソ鐨勫懡浠ゅ璞�
*/
- protected Command command(Long comId, String commandCode, String rtuAddr, String protocol, String rtuResultSendWebUrl, Object param){
- Command com = new Command() ;
+ protected Command command(Long comId, String commandCode, String rtuAddr, String protocol, String rtuResultSendWebUrl, Object param) {
+ Command com = new Command();
com.id = String.valueOf(comId);
- com.code = commandCode ;
- com.rtuAddr = rtuAddr ;
+ com.code = commandCode;
+ com.rtuAddr = rtuAddr;
com.protocol = protocol;
com.type = commandTypeOuter;
- com.rtuResultSendWebUrl = rtuResultSendWebUrl ;
+ com.rtuResultSendWebUrl = rtuResultSendWebUrl;
- com.param = param ;
+ com.param = param;
- return com ;
+ return com;
}
/**
* 澶勭悊鍥炶皟鍐呭
+ *
* @param comId
* @return
*/
- protected BaseResponse<Data> dealWithCallBack(Long comId) {
- CompletableFuture<Data> featureObject = new CompletableFuture<>();
- features.put(comId, featureObject);
+ protected BaseResponse<Data> dealWithCallBack(Long comId, Command com) {
+ CompletableFuture<Data> feature = new CompletableFuture<>();
+ features.put(comId, feature);
try {
- CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
- System.out.println("receive result ID:" + comId);
+ // 鍙戦�佸懡浠�
+ JSONObject response_SendCom = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ if (response_SendCom == null || !response_SendCom.getString("code").equals("0001")) {
+ // 璇锋眰澶辫触锛孯TU鏈笂绾匡紝娓呴櫎feature
+ features.remove(comId);
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
+ }
+
Data resultData = feature.get(180, TimeUnit.SECONDS);
features.remove(comId);
Long commandId = Long.parseLong(resultData.getCommandId());
- if(commandId.equals(comId)) {
+ if (commandId.equals(comId)) {
return BaseResponseUtils.buildSuccess(resultData);
- }else {
+ } else {
return BaseResponseUtils.buildSuccess();
}
} catch (InterruptedException e) {
@@ -211,9 +223,10 @@
/**
* 鍙戦�佸懡浠�
+ *
* @return
*/
- protected BaseResponse sendCom2Mw(Command com){
+ protected BaseResponse sendCom2Mw(Command com) {
String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
.toUriString();
@@ -231,6 +244,7 @@
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ *
* @param po
* @return
*/
@@ -255,91 +269,79 @@
rmCommandHistoryMapper.insert(rmCommandHistory);
comId = rmCommandHistory.getComId();
- // 鍙戦�佸懡浠�
- JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- // 璇锋眰鎴愬姛, 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
+ /**
+ * 澶勭悊鍥炶皟
+ * feature鍑嗗灏辩华鍚庡彂閫佸懡浠�
+ * 鍛戒护鍙戦�佸悗绔嬪嵆闃诲绛夊緟鍥炶皟
+ */
+ BaseResponse response_CallBack = dealWithCallBack(comId, com);
- // 鍥炶皟寮傚父
- if(!response_CallBack.getCode().equals("0001")) {
- // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setComId(comId);
- rmCommandHistory.setResult((byte)0);
- rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
- }
-
- // 鍥炶皟瓒呮椂
- if (response_CallBack.getContent().toString().equals(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
- /**
- * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
- * 鍛戒护缃负澶辫触
- * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
- */
-
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setComId(comId);
- rmCommandHistory.setResult((byte) 0);
- rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
- }
-
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- Boolean dealResult = job_subData.getBoolean("success");
- if(!dealResult) {
- /**
- * 鎵ц澶辫触
- * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
- */
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setComId(comId);
- rmCommandHistory.setResult((byte)0);
- rmCommandHistory.setResultTime(new Date());
- //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
- rmCommandHistory.setResultText(response_CallBack.getContent().toString());
- rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
- }
-
- /**
- * 鎵ц鎴愬姛
- * 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
- * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
- * 杩斿洖鍥炶皟鍐呭
- */
- if(comType != null) {
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
- if(comType == 1) {
- virtualCard.setInUse((byte) 1);
- }else {
- virtualCard.setInUse((byte) 0);
- }
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
- }
-
- // 鍥炶皟杩斿洖鐨勫唴瀹�
- Data myData = (Data)response_CallBack.getContent();
-
- // 鏇存柊鍛戒护鏃ュ織锛氭墽琛岀粨鏋溿�佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
- //rmCommandHistory = new RmCommandHistory();
- //rmCommandHistory.setComId(comId);
- //rmCommandHistory.setResult((byte)1);
- //rmCommandHistory.setResultTime(new Date());
- //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
- //rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
-
- return BaseResponseUtils.buildSuccess(myData) ;
- } else {
- // 璇锋眰澶辫触
- JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
+ // 鍥炶皟寮傚父
+ if (!response_CallBack.getCode().equals("0001")) {
+ // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
}
+
+ // 鍥炶皟瓒呮椂
+ if (response_CallBack.getContent().toString().equals(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
+ /**
+ * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
+ * 鍛戒护缃负澶辫触
+ * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
+ */
+
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ }
+
+ // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
+ JSONObject job_content = (JSONObject) JSON.toJSON(response_CallBack.getContent());
+ JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
+ Boolean dealResult = job_subData.getBoolean("success");
+ if (!dealResult) {
+ /**
+ * 鎵ц澶辫触
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ */
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistory.setResultTime(new Date());
+ //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
+ rmCommandHistory.setResultText(response_CallBack.getContent().toString());
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ }
+
+ /**
+ * 鎵ц鎴愬姛
+ * 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ * 杩斿洖鍥炶皟鍐呭
+ */
+ if (comType != null) {
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ if (comType == 1) {
+ virtualCard.setInUse((byte) 1);
+ } else {
+ virtualCard.setInUse((byte) 0);
+ }
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ }
+
+ // 鍥炶皟杩斿洖鐨勫唴瀹癸紝鍥炶皟缁撴灉鍐欏叆鍛戒护鏃ュ織琛ㄧ殑浠诲姟鐢变腑闂翠欢瀹屾垚
+ Data myData = (Data) response_CallBack.getContent();
+ return BaseResponseUtils.buildSuccess(myData);
+
}
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
index 30f81cf..41ba0b1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
@@ -5,9 +5,9 @@
#name: pj
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 42b01c1..eee1c2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -147,3 +147,5 @@
tokennofilter:
urls:
- /sso/sso
+ - /remote/comRes/receive
+ - /wx/comRes/receive
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
index fcd9d78..34bb341 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
@@ -5,6 +5,7 @@
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/crop/CropCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/crop/CropCtrl.java
index 544ad1c..9bffcda 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/crop/CropCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/crop/CropCtrl.java
@@ -74,7 +74,7 @@
try {
Integer rec = Optional.ofNullable(cropSv.addCrop(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_CROP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("娣诲姞浣滅墿寮傚父", e);
@@ -102,13 +102,13 @@
@SsoAop()
public BaseResponse<Boolean> delete(@RequestBody Map map) {
if (map == null || map.size() <= 0) {
- BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
+ BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_CROP_ID.getMessage());
}
Long cropId = Long.parseLong(map.get("id").toString());
try {
Integer rows = cropSv.deleteCrop(cropId);
if (rows == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_CROP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒犻櫎浣滅墿寮傚父", e);
@@ -142,7 +142,7 @@
try {
Integer rec = Optional.ofNullable(cropSv.updateCrop(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_CROP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("淇敼浣滅墿寮傚父", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
index e3d4abe..aaed9d3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
@@ -71,7 +71,7 @@
try {
Integer rec = Optional.ofNullable(irrigateGroupSv.addIrrigateGroup(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_GROUP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒涘缓杞亴缁勫紓甯�", e);
@@ -100,13 +100,13 @@
@SsoAop()
public BaseResponse<Boolean> delete(@RequestBody Map map) {
if (map == null || map.size() <= 0) {
- BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
+ BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_GROUP_ID.getMessage());
}
Long groupId = Long.parseLong(map.get("id").toString());
try {
Integer rows = irrigateGroupSv.deleteIrrigateGroup(groupId);
if (rows == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_GROUP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒犻櫎杞亴缁勫紓甯�", e);
@@ -134,7 +134,7 @@
try {
Integer rows = irrigateGroupSv.deleteIrrigateGroup(groupId);
if (rows == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_GROUP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒犻櫎杞亴缁勫紓甯�", e);
@@ -170,7 +170,7 @@
try {
Integer rec = Optional.ofNullable(irrigateGroupSv.updateIrrigateGroup(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_GROUP_FAIL.getMessage());
}
} catch (Exception e) {
log.error("淇敼杞亴缁勫紓甯�", e);
@@ -264,7 +264,7 @@
irGroupUnit.setOperator(operator);
Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.GROUP_ADD_UNIT_FAIL.getMessage());
}
}
} catch (Exception e) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateScheduling/IrrigateSchedulingCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateScheduling/IrrigateSchedulingCtrl.java
index 8874125..50cdabe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateScheduling/IrrigateSchedulingCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateScheduling/IrrigateSchedulingCtrl.java
@@ -71,7 +71,7 @@
try {
Integer rec = Optional.ofNullable(irIrrigateSchedulingSv.addScheduling(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_SCHEDULING_FAIL.getMessage());
}
} catch (Exception e) {
log.error("娣诲姞浣滅墿鐏屾簤鍒跺害寮傚父", e);
@@ -98,13 +98,13 @@
@SsoAop()
public BaseResponse<Boolean> delete(@RequestBody Map map) {
if (map == null || map.size() <= 0) {
- BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
+ BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_SCHEDULING_ID.getMessage());
}
Long schedulingId = Long.parseLong(map.get("id").toString());
try {
Integer rows = irIrrigateSchedulingSv.deleteScheduling(schedulingId);
if (rows == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_SCHEDULING_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒犻櫎浣滅墿鐏屾簤鍒跺害寮傚父", e);
@@ -138,7 +138,7 @@
try {
Integer rec = Optional.ofNullable(irIrrigateSchedulingSv.updateScheduling(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_SCHEDULING_FAIL.getMessage());
}
} catch (Exception e) {
log.error("淇敼浣滅墿鐏屾簤鍒跺害寮傚父", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java
index 496e055..80700e6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java
@@ -71,7 +71,7 @@
try {
Integer rec = Optional.ofNullable(irrigateUnitSv.addIrrigateUnit(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_UNIT_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒涘缓鐏屾簤鍗曞厓寮傚父", e);
@@ -99,13 +99,13 @@
@SsoAop()
public BaseResponse<Boolean> delete(@RequestBody Map map) {
if (map == null || map.size() <= 0) {
- BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
+ BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_UNIT_ID.getMessage());
}
Long unitId = Long.parseLong(map.get("id").toString());
try {
Integer rows = irrigateUnitSv.deleteUnit(unitId);
if (rows == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_UNIT_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒犻櫎鐏屾簤鍗曞厓寮傚父", e);
@@ -132,7 +132,7 @@
try {
Integer rows = irrigateUnitSv.deleteUnit(unitId);
if (rows == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_UNIT_FAIL.getMessage());
}
} catch (Exception e) {
log.error("鍒犻櫎鐏屾簤鍗曞厓寮傚父", e);
@@ -167,7 +167,7 @@
try {
Integer rec = Optional.ofNullable(irrigateUnitSv.updateUnit(po)).orElse(0);
if (rec == 0) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_UNIT_FAIL.getMessage());
}
} catch (Exception e) {
log.error("淇敼鐏屾簤鍗曞厓寮傚父", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java
index da259a9..c13d4b1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java
@@ -26,13 +26,40 @@
* 鐏屾簤鍗曞厓
*/
UNIT_ASSOCIATE_CLIENT_FAIL(20001, "鐏屾簤鍗曞厓鍒嗛厤澶辫触"),
+ ADD_UNIT_FAIL(20002, "鐏屾簤鍗曞厓娣诲姞澶辫触"),
+ PLEASE_INPUT_UNIT_ID(20003, "璇疯緭鍏ョ亴婧夊崟鍏僆D"),
+ DELETE_UNIT_FAIL(20004, "鐏屾簤鍗曞厓鍒犻櫎澶辫触"),
+ UPDATE_UNIT_FAIL(20005, "鐏屾簤鍗曞厓淇敼澶辫触"),
/**
* 杞亴缁�
*/
- GRPUP_ASSOCIATE_CLIENT_FAIL(30001, "杞亴缁勫叧鑱斿啘鎴峰け璐�");
+ GRPUP_ASSOCIATE_CLIENT_FAIL(30001, "杞亴缁勫叧鑱斿啘鎴峰け璐�"),
+ ADD_GROUP_FAIL(30002, "杞亴缁勬坊鍔犲け璐�"),
+ PLEASE_INPUT_GROUP_ID(30003, "璇疯緭鍏ヨ疆鐏岀粍ID"),
+ DELETE_GROUP_FAIL(30004, "杞亴缁勫垹闄ゅけ璐�"),
+ UPDATE_GROUP_FAIL(30005, "杞亴缁勪慨鏀瑰け璐�"),
+ GROUP_ADD_UNIT_FAIL(30006, "杞亴缁勬坊鍔犵亴婧夊崟鍏冨け璐�"),
+ GROUP_DELETE_UNIT_FAIL(30007, "杞亴缁勭Щ闄ょ亴婧夊崟鍏冨け璐�"),
+ UPDATE_GROUP_BIND_UNIT_FAIL(30008, "淇敼杞亴缁勭粦瀹氱殑鐏屾簤鍗曞厓澶辫触"),
-// ADD_IRRIGATE_UNIT_FAIL(20001, "鍒涘缓鐏屾簤鍗曞厓澶辫触"),
+ /**
+ * 浣滅墿
+ */
+ ADD_CROP_FAIL(40001, "浣滅墿娣诲姞澶辫触"),
+ PLEASE_INPUT_CROP_ID(40002, "璇疯緭鍏ヤ綔鐗㊣D"),
+ DELETE_CROP_FAIL(40003, "浣滅墿鍒犻櫎澶辫触"),
+ UPDATE_CROP_FAIL(40004, "浣滅墿淇敼澶辫触"),
+
+ /**
+ * 浣滅墿鐏屾簤鍒跺害
+ */
+ ADD_SCHEDULING_FAIL(50001, "浣滅墿鐏屾簤鍒跺害娣诲姞澶辫触"),
+ PLEASE_INPUT_SCHEDULING_ID(50002, "璇疯緭鍏ヤ綔鐗╃亴婧夊埗搴D"),
+ DELETE_SCHEDULING_FAIL(50003, "浣滅墿鐏屾簤鍒跺害鍒犻櫎澶辫触"),
+ UPDATE_SCHEDULING_FAIL(50004, "浣滅墿鐏屾簤鍒跺害淇敼澶辫触");
+
+
private final Integer code;
private final String message;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
index 32c9029..d9d64c5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
@@ -34,6 +34,8 @@
CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
if(feature != null) {
feature.complete(data);
+ }else{
+ log.error("feature is null");
}
return BaseResponseUtils.buildSuccess("ok");
}
--
Gitblit v1.8.0