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

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>90012</param-value>
 	</context-param>
   
   <context-param>
@@ -46,12 +46,12 @@
   <context-param>
     <description>ftp上传路径</description>
     <param-name>ftp_upload_path</param-name>
-    <param-value>D:\\upload</param-value>
+    <param-value></param-value>
   </context-param>
    <context-param>
     <description>ftp图片路径</description>
     <param-name>ftp_view_path</param-name>
-    <param-value>D:\\jyxkzAndFz</param-value>
+    <param-value></param-value>
   </context-param>
   <context-param>
     <description>地市简称</description>

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

@@ -98,10 +98,13 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 					f.setPort(Integer.parseInt(GlobalData.FTP_PORT));
 					f.setUserName(GlobalData.DSJC);
 					f.setPwd(GlobalData.DSJC);
-					f.setPath(GlobalData.FTP_UPLOAD_PATH);
+					f.setPath("");
 					if (FtpUtil.connectFtp(f)) {
-						FtpUtil.makeDirFile(filePath);
-						File ftpFile = new File(filePath + filename);
+						String ftpPath = GlobalData.UPLOAD_FILE_PATH +File.separator + sstype ;
+						FtpUtil.makeDirFile(ftpPath);
+						ftpPath = ftpPath +File.separator + GlobalData.CITY_CODE + File.separator;
+						FtpUtil.makeDirFile(ftpPath);
+						File ftpFile = new File(ftpPath + filename);
 						if (ftpFile != null) {
 							flag = FtpUtil.upload(ftpFile);// 把文件上传在ftp上
 							System.out.println("ok");
@@ -180,11 +183,11 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 					// ftp 上传
 					Ftp f = new Ftp();
-					f.setIpAddr("127.0.0.1");
+					f.setIpAddr(GlobalData.FTP_IP);
 					f.setPort(21);
 					f.setUserName(GlobalData.FTP_VIEW_USER);
 					f.setPwd(GlobalData.FTP_VIEW_USER);
-					f.setPath(GlobalData.FTP_VIEW_PATH);
+					f.setPath("");
 					if (FtpUtil.connectFtp(f)) {
 						String ftppath = GlobalData.VIEW_FILE_PATH + File.separator + jyr.getSzd();
 						FtpUtil.makeDirFile(ftppath);

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

@@ -429,10 +429,16 @@ public class BaseWebCtl extends BaseCtl {
 			while ((tmp = br.readLine()) != null) {
 				buffer.append(tmp);
 			}
-			System.out.println(buffer.toString());
+			String result = buffer.toString();
+			if (result.indexOf("true") > 0) {
+				flag = true;
+			}
+
 		} catch (MalformedURLException e) {
+			flag = false;
 			e.printStackTrace();
 		} catch (IOException e) {
+			flag = false;
 			e.printStackTrace();
 		}
 		return flag;

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

@@ -209,15 +209,16 @@ public class FtpUtil {
 
 	public static void main(String[] args) throws Exception {
 		Ftp f = new Ftp();
-		f.setIpAddr("127.0.0.1");
+		f.setIpAddr("192.168.30.145");
 		f.setPort(21);
 		f.setUserName("test");
 		f.setPwd("test");
 		f.setPath(GlobalData.FTP_VIEW_PATH);
 		FtpUtil.connectFtp(f);
-		// File file = new File(path);
-		// FtpUtil.upload(file);// 把文件上传在ftp上
-		FtpUtil.startDown(f, "E:\\upload\\jdtx\\", "/jdtx/", "20160718164041.txt");// 下载ftp文件测试
+		String path = "D:\\upload\\xkzsq";
+		 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/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -651,7 +651,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				} else {
 					jsjdcbsj.setAxspjb(null);
 				}
-				jsjdcbsj.setTbzt(Constants.NO);
+				jsjdcbsj.setSftb(Constants.NO);
 				jsjdcbsj = jsjdcbsjService.save(jsjdcbsj);
 			} else {
 				// String id = UUID.randomUUID().toString().replaceAll("-", "");
@@ -702,7 +702,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					axspjbdx.setId(axspjbid);
 					code.setAxspjb(axspjbdx);
 				}
-				code.setTbzt(Constants.NO);
+				code.setSftb(Constants.NO);
 				jsjdcbsj = jsjdcbsjService.save(code);
 			}
 		} catch (Exception e) {
@@ -718,13 +718,16 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	public WebJsonResult saveTbzt(Model model, String id) {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
-		entity.setTbzt(Constants.YES);
+		entity.setSftb(Constants.YES);
 		jsjdcbsjService.save(entity);
 		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID="+id;
 		boolean flag = getTbStatus(url);
 		if (flag) {
-			entity.setSftb(Constants.YES);
+			entity.setTbzt(Constants.YES);
 			jsjdcbsjService.save(entity);
+		}else{
+			wr.setSuccess(false);
+			wr.setMessage("同步失败");
 		}
 		return wr;
 	}
@@ -878,8 +881,13 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 						Ftp f = getftp();
 						// 本地目录
 						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+						File newfile = new File(localBaseDir);
+						// 如果文件夹不存在则创建
+						if (!newfile.exists() && !newfile.isDirectory()) {
+							newfile.mkdirs();
+						}
 						// 远程目录
-						String remoteBaseDir = "/jsjdcbsj/";
+						String remoteBaseDir = acc.getFilepath();
 						// 下载ftp文件
 						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
 						if (downflag) {