From 3a6b5b34e2931fd5ff54e80330bd603efc7f1d84 Mon Sep 17 00:00:00 2001
From: fs-danaus <danaus314@qq.com>
Date: 星期二, 13 七月 2021 17:44:21 +0800
Subject: [PATCH] 完善删单提示
---
src/com/yc/action/panval/PanelCommitAction.java | 5 ++++-
src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java | 2 +-
src/com/yc/multiData/MultiDataSource.java | 51 ++++++++++++++++++++++++++-------------------------
3 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/src/com/yc/action/panval/PanelCommitAction.java b/src/com/yc/action/panval/PanelCommitAction.java
index f4c5468..9ca296e 100644
--- a/src/com/yc/action/panval/PanelCommitAction.java
+++ b/src/com/yc/action/panval/PanelCommitAction.java
@@ -14,6 +14,7 @@
import com.yc.utils.SessionKey;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -218,6 +219,8 @@
SpObserver.setDBtoInstance("_"+dbid);
formType_int = base.getJdbcTemplate().queryForObject("select formtype from _sysmenu where formid=?",
new Object[]{formid}, Integer.class);
+ }catch (IncorrectResultSizeDataAccessException e) {
+ return callBackMessage.sendErrorMessage("鍦�9810鍙戠幇鏈夊涓�"+formid+"瀹氫箟锛屼笉鑳芥墽琛屽垹闄�");
}finally {
SpObserver.setDBtoInstance();
}
@@ -322,7 +325,7 @@
return callBackMessage.sendErrorMessage("鏃犳硶鍒犻櫎璇ュ崟鎹紝璇锋鏌ヨ鍗曟嵁鐨勭姸鎬佹槸鍚﹀凡琚敼鍙樻垨宸插垹闄ゃ��");
}
} catch (Exception e) {
- return callBackMessage.sendErrorMessage(e.getCause().getMessage());
+ return callBackMessage.sendErrorMessage(e.getCause()!=null?e.getCause().getMessage():e.getMessage());
}
}
diff --git a/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java b/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java
index e495866..71e5711 100644
--- a/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java
+++ b/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java
@@ -1530,7 +1530,7 @@
}
if (!flag) {// 鍦ㄥ綋鍓嶈〃鏍兼暟鎹壘涓嶅埌鍒欐煡鎵句互@寮�澶寸殑鍙橀噺
if (env.get(s.toLowerCase()) != null) {
- str += "'" + env.get(s.toLowerCase().trim()) + "',";
+ str += "'" + String.valueOf(env.get(s.toLowerCase().trim())) + "',";
}else {// 鍙傛暟鏈韩灏辨槸浣滀负鍊间紶杩囧幓
if (fg) { // 宸茬粡鍘婚櫎''鍙凤紝鎵�浠ヨ鍐嶅姞涓�
str += "'" + s + "',";
diff --git a/src/com/yc/multiData/MultiDataSource.java b/src/com/yc/multiData/MultiDataSource.java
index 555db08..2b1261a 100644
--- a/src/com/yc/multiData/MultiDataSource.java
+++ b/src/com/yc/multiData/MultiDataSource.java
@@ -1,5 +1,27 @@
package com.yc.multiData;
+import com.mchange.v2.c3p0.ComboPooledDataSource;
+import com.yc.action.panval.InvGet;
+import com.yc.entity.DataSourceEntity;
+import com.yc.entity.DemoConstant;
+import com.yc.factory.FactoryBean;
+import com.yc.sdk.password.action.ChangePassword;
+import com.yc.sdk.shopping.util.SettingKey;
+import com.yc.sdk.weixinmp.util.MD5Util;
+import com.yc.service.demo.DemoIfc;
+import com.yc.service.impl.DBHelper;
+import com.yc.utils.SessionKey;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.dao.DataAccessException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
@@ -10,30 +32,6 @@
import java.util.Map;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.sql.DataSource;
-
-import com.yc.sdk.weixinmp.util.MD5Util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.dao.DataAccessException;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-import com.yc.action.panval.InvGet;
-import com.yc.entity.DataSourceEntity;
-import com.yc.entity.DemoConstant;
-import com.yc.factory.FactoryBean;
-import com.yc.sdk.password.action.ChangePassword;
-import com.yc.sdk.shopping.util.SettingKey;
-import com.yc.service.demo.DemoIfc;
-import com.yc.service.impl.DBHelper;
-import com.yc.utils.SessionKey;
@@ -129,7 +127,10 @@
dbId = (session.getAttribute(SessionKey.SHOPPING_DBID)== null?null :
(String) session.getAttribute(SessionKey.SHOPPING_DBID));
}
-
+ //瑙ｅ喅棣栭〉鐧诲綍锛屽湪澶氬叕鍙镐腑鏈夐儴鍒嗘暟鎹簮杩囨湡鐨勬儏鍐碉紝浼氬鑷撮噷闈㈡甯哥殑鏁版嵁婧愪篃鐢ㄤ笉鐨勯棶棰橈紝by danaus 2021/7/9 9:38
+ if(StringUtils.isBlank(dbId)){
+ dbId=request.getParameter("dataName")!=null?request.getParameter("dataName"):null;
+ }
//鎸夊凡缁忓瓨鍦ㄧ殑 浼氳瘽 dbid鏌ユ壘
if (dbId !=null &&!"".equals(dbId)) {
dataSourceEntity = getDataSourceMap(dbId) ;
--
Gitblit v1.8.0