git-svn-id: https://192.168.57.71/svn/jsgkj@878 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/xzdwxxgl/xzglryxx/xzglrymain.jsp

@@ -71,13 +71,13 @@
                         <td class="left" colspan="2">
 	                         <a class="btn btn-default btn-sm" href="#" onclick="xzglry.main.add1()">
 							   <i class="glyphicon glyphicon-plus"></i> 
-							            新增部门/科室</a>
+							            新增部门/处科室</a>
 							 <a class="btn btn-default btn-sm" href="#"  onclick="xzglry.main.editbm()">
 							   <i class="glyphicon glyphicon-pencil"></i> 
-							            编辑部门/科室</a>
+							            编辑部门/处科室</a>
 							 <a class="btn btn-default btn-sm" href="#"  onclick="xzglry.main.deletebm()">
 							   <i class="glyphicon glyphicon-wrench"></i> 
-							            删除部门/科室</a>	
+							            删除部门/处科室</a>	
 	                        	
                         </td>
                          <td class="right" >
@@ -215,7 +215,7 @@
 	<div class="theme-popover" style="width: 900px;height: 430px;" id="theme-popover2">
 	     <div class="theme-poptit">
 	          <div class="popTitle">
-	          	<h4><span id="act1"></span>部门/科室</h4>
+	          	<h4><span id="act1"></span>部门/处科室</h4>
 	          </div>
 	          <div class="close">
 	          		<a href="#" title="关闭" class="guanbibm">×</a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp

@@ -95,7 +95,7 @@
  <input type="hidden" name="id" value="${record.id }">		
 <input type="hidden" name="xmid" value="${record.xmid }">	
   <input type="hidden" class="form-control"  name="fjzdids" id="fjzdids">
- <input type="text" class="form-control"  name="accids" id="accids">	
+ <input type="hidden" class="form-control"  name="accids" id="accids">	
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 <input type="hidden" id="userids"	name="userids"/>	
  <input type="hidden" class="form-control"  name="roleCode" id="roleCode" value="${roleCode }">

gkjsjy/trunk/WebContent/WEB-INF/web.xml

@@ -20,12 +20,12 @@
    <context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
-		<param-value>0</param-value>
+		<param-value>1</param-value>
 	</context-param>
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>900</param-value>
+		<param-value>90015</param-value>
 	</context-param>
   
   <context-param>
@@ -53,10 +53,15 @@
     <param-name>ftp_view_path</param-name>
     <param-value></param-value>
   </context-param>
+   <context-param>
+    <description>ftp是否上传</description>
+    <param-name>ftp_flag</param-name>
+    <param-value>Y</param-value>
+  </context-param>
   <context-param>
     <description>地市简称</description>
     <param-name>dsjc</param-name>
-    <param-value>SZ</param-value>
+    <param-value>NTNH</param-value>
   </context-param>
   <context-param>
     <description>Ftp许可证用户</description>

gkjsjy/trunk/src/com/xt/jygl/accessory/service/impl/AccessoryServiceImpl.java

@@ -91,7 +91,7 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 				}
 				// 转存文件
 				file.transferTo(new File(filePath + filename));
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					// ftp 上传
 					Ftp f = new Ftp();
 					f.setIpAddr(GlobalData.FTP_IP);
@@ -180,7 +180,7 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 				}
 				// 转存文件
 				file.transferTo(new File(filePath + filename));
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					// ftp 上传
 					Ftp f = new Ftp();
 					f.setIpAddr(GlobalData.FTP_IP);

gkjsjy/trunk/src/com/xt/jygl/common/GlobalData.java

@@ -39,6 +39,7 @@ public class GlobalData {
 	public static String FTP_VIEW_PATH = "";
 	public static String FTP_XK_USER = "";
 	public static String FTP_QT_USER = "";
+	public static String FTP_FLAG = "Y";
 
 	public static String CORPID = "wxa70527e1ffa01384";
 	public static String WEIXIN_IP = "";
@@ -66,7 +67,12 @@ public class GlobalData {
 		if (StringUtils.hasLength(ftp_upload_path)) {
 			FTP_UPLOAD_PATH = ftp_upload_path;
 		}
+		String ftp_flag = sc.getInitParameter("ftp_flag");
+		if (StringUtils.hasLength(ftp_flag)) {
+			FTP_FLAG = ftp_flag;
+		}
 
+		
 		String view_file_path = sc.getInitParameter("view_file_path");
 		if (StringUtils.hasLength(view_file_path)) {
 			VIEW_FILE_PATH = view_file_path;
@@ -156,6 +162,10 @@ public class GlobalData {
 		if (StringUtils.hasLength(prop)) {
 			FTP_PORT = prop;
 		}
+		prop = String.valueOf(p.get("main.ftp.port"));
+		if (StringUtils.hasLength(prop)) {
+			FTP_PORT = prop;
+		}
 		prop = String.valueOf(p.get("weixin.ip"));
 		if (StringUtils.hasLength(prop)) {
 			WEIXIN_IP = prop;

gkjsjy/trunk/src/com/xt/jygl/ftp/FtpUtil.java

@@ -27,19 +27,24 @@ public class FtpUtil {
 	 * @throws Exception
 	 */
 	public static boolean connectFtp(Ftp f) throws Exception {
-		ftp = new FTPClient();
 		boolean flag = false;
-		int reply;
-		ftp.connect(f.getIpAddr(), f.getPort());
-		ftp.login(f.getUserName(), f.getPwd());
-		ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
-		reply = ftp.getReplyCode();
-		if (!FTPReply.isPositiveCompletion(reply)) {
-			ftp.disconnect();
-			return flag;
+		try {
+			ftp = new FTPClient();
+			ftp.connect(f.getIpAddr(), f.getPort());
+			ftp.login(f.getUserName(), f.getPwd());
+			ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
+			int reply = ftp.getReplyCode();
+			if (!FTPReply.isPositiveCompletion(reply)) {
+				ftp.disconnect();
+				return flag;
+			}
+			ftp.changeWorkingDirectory(f.getPath());
+			flag = true;
+		} catch (Exception e) {
+			flag = false;
+			logger.error(e);
+			logger.error("FTP链接失败");
 		}
-		ftp.changeWorkingDirectory(f.getPath());
-		flag = true;
 		return flag;
 	}
 
@@ -111,8 +116,9 @@ public class FtpUtil {
 	 */
 	public static boolean startDown(Ftp f, String localBaseDir, String remoteBaseDir, String filename) throws Exception {
 		boolean flag = false;
-		if (FtpUtil.connectFtp(f)) {
-			try {
+		try {
+			if (FtpUtil.connectFtp(f)) {
+
 				FTPFile[] files = null;
 				boolean changedir = ftp.changeWorkingDirectory(remoteBaseDir);
 				if (changedir) {
@@ -129,15 +135,17 @@ public class FtpUtil {
 						}
 					}
 				}
-			} catch (Exception e) {
-				logger.error(e);
-				logger.error("下载过程中出现异常");
-			} finally {
-				closeFtp();
+
+			} else {
+				logger.error("链接失败！");
+				flag = false;
 			}
-		} else {
-			logger.error("链接失败！");
+		} catch (Exception e) {
 			flag = false;
+			logger.error(e);
+			logger.error("FTP下载过程中链接失败");
+		} finally {
+			closeFtp();
 		}
 		return flag;
 	}
@@ -217,9 +225,10 @@ public class FtpUtil {
 		f.setPath(GlobalData.FTP_VIEW_PATH);
 		FtpUtil.connectFtp(f);
 		String path = "D:\\upload\\xkzsq";
-		 File file = new File(path);
-		 FtpUtil.upload(file);// 把文件上传在ftp上
-		//FtpUtil.startDown(f, "E:\\upload\\jdtx\\", "/jdtx/", "20160718164041.txt");// 下载ftp文件测试
+		File file = new File(path);
+		FtpUtil.upload(file);// 把文件上传在ftp上
+		// FtpUtil.startDown(f, "E:\\upload\\jdtx\\", "/jdtx/",
+		// "20160718164041.txt");// 下载ftp文件测试
 		System.out.println("ok");
 
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -780,7 +780,7 @@ public class JgsqCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1001,7 +1001,7 @@ public class JgsqCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -796,7 +796,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -948,7 +948,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -750,7 +750,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -957,7 +957,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -799,7 +799,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -977,7 +977,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -792,7 +792,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1011,7 +1011,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -816,7 +816,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1035,7 +1035,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -605,7 +605,7 @@ public class JsjdglCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				/*if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -628,7 +628,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
-				}
+				}*/
 				model.addAttribute("fjList" + s, fjnamevo);
 				model.addAttribute("xiazaibz", s);
 			}
@@ -807,7 +807,7 @@ public class JsjdglCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+			/*	if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -830,7 +830,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
-				}
+				}*/
 				model.addAttribute("fjList" + s, fjnamevo);
 				model.addAttribute("xiazaibz", s);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -227,7 +227,7 @@ public class LhbgCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhbgfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -268,7 +268,7 @@ public class LhsqCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhsqfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -235,7 +235,7 @@ public class LhyxCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhyxfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录