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

gkjsjy/trunk/src/com/xt/jygl/accessory/ctl/AccessoryCtl.java

@@ -23,6 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xtframe.core.base.ctl.WebJsonResult;
 
 /**
@@ -64,7 +65,7 @@ public class AccessoryCtl extends BaseWebCtl {
 		try {
 			AccessoryEntity entity = accessoryService.findOne(id);
 			// path是指欲下载的文件的路径。
-			String path = entity.getFilepath() + entity.getFilename();
+			String path = GlobalData.UPLOAD_FILE_PATH + entity.getFilepath() + entity.getFilename();
 			// 以流的形式下载文件。
 			InputStream fis = new BufferedInputStream(new FileInputStream(path));
 			byte[] buffer = new byte[fis.available()];

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

@@ -20,8 +20,11 @@ import org.springframework.web.multipart.MultipartFile;
 import com.xt.jygl.accessory.dao.AccessoryDao;
 import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.service.JyglBaseService;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.GkjyrVo;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.common.SecRepository;
@@ -71,31 +74,31 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 		String filePath = "";
 		String path = "";
 		boolean flag = false;
+		AccessoryEntity accessoryEntity = new AccessoryEntity();
 		if (!file.isEmpty()) {
 			try {
 				SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 				Date today = new Date();
 				filename = dateTimeFormat.format(today) + "." + suffix;
 				// 文件保存路径
-				path = File.separator + sstype + File.separator;
+				path = File.separator + sstype + File.separator + GlobalData.CITY_CODE + File.separator;
 				filePath = GlobalData.UPLOAD_FILE_PATH + path;
 				File newfile = new File(filePath);
 
 				// 如果文件夹不存在则创建
 				if (!newfile.exists() && !newfile.isDirectory()) {
-					newfile.mkdir();
+					newfile.mkdirs();
 				}
 				// 转存文件
 				file.transferTo(new File(filePath + filename));
-
-				/*if (!"jsjdcbsj".equals(sstype)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 					// ftp 上传
 					Ftp f = new Ftp();
-					f.setIpAddr("127.0.0.1");
-					f.setPort(21);
+					f.setIpAddr(GlobalData.FTP_IP);
+					f.setPort(Integer.parseInt(GlobalData.FTP_PORT));
 					f.setUserName(GlobalData.DSJC);
 					f.setPwd(GlobalData.DSJC);
-					// f.setPath(GlobalData.FTP_UPLOAD_PATH);
+					f.setPath(GlobalData.FTP_UPLOAD_PATH);
 					if (FtpUtil.connectFtp(f)) {
 						FtpUtil.makeDirFile(filePath);
 						File ftpFile = new File(filePath + filename);
@@ -104,18 +107,17 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 							System.out.println("ok");
 						}
 					}
-				}else{
-					flag =true;
-				}*/
+					if (flag) {
+						accessoryEntity.setFjbz("1");
+					}
+				}
+
 			} catch (Exception e) {
 				e.printStackTrace();
+			} finally {
+				FtpUtil.closeFtp();
 			}
 		}
-
-		AccessoryEntity accessoryEntity = new AccessoryEntity();
-		if (flag) {
-			accessoryEntity.setFjbz("1");
-		}
 		accessoryEntity.setSstype(sstype);
 		accessoryEntity.setLength(file.getSize());
 		accessoryEntity.setName(fileName);
@@ -158,6 +160,7 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 		String filePath = "";
 		String path = "";
 		boolean flag = false;
+		AccessoryEntity accessoryEntity = new AccessoryEntity();
 		if (!file.isEmpty()) {
 			try {
 				SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -174,42 +177,41 @@ public class AccessoryServiceImpl extends JyglBaseService<AccessoryEntity, Strin
 				}
 				// 转存文件
 				file.transferTo(new File(filePath + filename));
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+					// ftp 上传
+					Ftp f = new Ftp();
+					f.setIpAddr("127.0.0.1");
+					f.setPort(21);
+					f.setUserName(GlobalData.FTP_VIEW_USER);
+					f.setPwd(GlobalData.FTP_VIEW_USER);
+					f.setPath(GlobalData.FTP_VIEW_PATH);
+					if (FtpUtil.connectFtp(f)) {
+						String ftppath = GlobalData.VIEW_FILE_PATH + File.separator + jyr.getSzd();
+						FtpUtil.makeDirFile(ftppath);
+						ftppath = ftppath + File.separator + jyr.getSzgk();
+						FtpUtil.makeDirFile(ftppath);
+						ftppath = ftppath + File.separator + jyr.getSzgq();
+						FtpUtil.makeDirFile(ftppath);
+						ftppath = ftppath + File.separator + jyr.getId();
+						FtpUtil.makeDirFile(ftppath);
 
-				/*// ftp 上传
-				Ftp f = new Ftp();
-				f.setIpAddr("127.0.0.1");
-				f.setPort(21);
-				f.setUserName(GlobalData.FTP_VIEW_USER);
-				f.setPwd(GlobalData.FTP_VIEW_USER);
-				// f.setPath(GlobalData.FTP_VIEW_PATH);
-				if (FtpUtil.connectFtp(f)) {
-					String ftppath = GlobalData.VIEW_FILE_PATH + File.separator + jyr.getSzd();
-					FtpUtil.makeDirFile(ftppath);
-					ftppath = ftppath + File.separator + jyr.getSzgk();
-					FtpUtil.makeDirFile(ftppath);
-					ftppath = ftppath + File.separator + jyr.getSzgq();
-					FtpUtil.makeDirFile(ftppath);
-					ftppath = ftppath + File.separator + jyr.getId();
-					FtpUtil.makeDirFile(ftppath);
-
-					File ftpFile = new File(ftppath + File.separator + filename);
-					if (ftpFile != null) {
-						flag = FtpUtil.upload(ftpFile);// 把文件上传在ftp上
-						System.out.println("ok");
+						File ftpFile = new File(ftppath + File.separator + filename);
+						if (ftpFile != null) {
+							flag = FtpUtil.upload(ftpFile);// 把文件上传在ftp上
+							System.out.println("ok");
+						}
+						if (flag) {
+							accessoryEntity.setFjbz("1");
+						}
 					}
 				}
-*/
 			} catch (Exception e) {
 				e.printStackTrace();
 			} finally {
-				//FtpUtil.closeFtp();
+				FtpUtil.closeFtp();
 			}
 		}
 
-		AccessoryEntity accessoryEntity = new AccessoryEntity();
-		if (flag) {
-			accessoryEntity.setFjbz("1");
-		}
 		accessoryEntity.setSstype(sstype);
 		accessoryEntity.setLength(file.getSize());
 		accessoryEntity.setName(fileName);

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

@@ -1,5 +1,11 @@
 package com.xt.jygl.common;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
@@ -28,6 +34,7 @@ import rtx.RTXSvrApi;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.liandi.encrypt.Des;
+import com.xt.jygl.ftp.Ftp;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
@@ -408,4 +415,37 @@ public class BaseWebCtl extends BaseCtl {
 			e.printStackTrace();
 		}
 	}
+
+	public boolean getTbStatus(String uStr) {
+		boolean flag = false;
+		try {
+			String str = "http://192.168.57.74:9090/xtdsp/task/run";
+			URL url = new URL(str + uStr);
+			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+			con.connect();
+			BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
+			StringBuffer buffer = new StringBuffer();
+			String tmp = null;
+			while ((tmp = br.readLine()) != null) {
+				buffer.append(tmp);
+			}
+			System.out.println(buffer.toString());
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return flag;
+	}
+
+	public Ftp getftp() {
+		// ftp 参数设置
+		Ftp f = new Ftp();
+		f.setIpAddr(GlobalData.FTP_IP);
+		f.setPort(Integer.parseInt(GlobalData.FTP_PORT));
+		f.setUserName(GlobalData.DSJC);
+		f.setPwd(GlobalData.DSJC);
+		f.setPath(GlobalData.FTP_UPLOAD_PATH);
+		return f;
+	}
 }

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

@@ -145,5 +145,4 @@ public class GlobalData {
 			FTP_PORT = prop;
 		}
 	}
-
 }

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

@@ -0,0 +1,60 @@
+package com.xt.jygl.ftp;
+
+/**
+ * ftp链接常量
+ *
+ */
+public class Ftp {
+
+	private String ipAddr;//ip地址
+	
+	private Integer port;//端口号
+	
+	private String userName;//用户名
+	
+	private String pwd;//密码
+	
+	private String path;//aaa路径
+
+	public String getIpAddr() {
+		return ipAddr;
+	}
+
+	public void setIpAddr(String ipAddr) {
+		this.ipAddr = ipAddr;
+	}
+
+	public Integer getPort() {
+		return port;
+	}
+
+	public void setPort(Integer port) {
+		this.port = port;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getPwd() {
+		return pwd;
+	}
+
+	public void setPwd(String pwd) {
+		this.pwd = pwd;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+	
+	
+}

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

@@ -0,0 +1,238 @@
+package com.xt.jygl.ftp;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.apache.log4j.Logger;
+
+import com.xt.jygl.common.GlobalData;
+
+public class FtpUtil {
+
+	private static Logger logger = Logger.getLogger(FtpUtil.class);
+
+	private static FTPClient ftp;
+
+	/**
+	 * 获取ftp连接
+	 * 
+	 * @param f
+	 * @return
+	 * @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;
+		}
+		flag = ftp.changeWorkingDirectory(f.getPath());
+		return flag;
+	}
+
+	/**
+	 * 关闭ftp连接
+	 */
+	public static void closeFtp() {
+		if (ftp != null && ftp.isConnected()) {
+			try {
+				ftp.logout();
+				ftp.disconnect();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * ftp上传文件
+	 * 
+	 * @param f
+	 * @throws Exception
+	 */
+	@SuppressWarnings("finally")
+	public static boolean upload(File file) {
+		boolean flag = true;
+		try {
+			if (file.isDirectory()) {
+				ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"), "iso-8859-1"));
+				ftp.changeWorkingDirectory(file.getName());
+				String[] files = file.list();
+				for (int i = 0; i < files.length; i++) {
+					File file1 = new File(file.getPath() + "\\" + files[i]);
+					if (file1.isDirectory()) {
+						upload(file1);
+						ftp.changeToParentDirectory();
+					} else {
+						File file2 = new File(file.getPath() + "\\" + files[i]);
+						FileInputStream input = new FileInputStream(file2);
+						ftp.storeFile(file2.getName(), input);
+						input.close();
+					}
+				}
+			} else {
+				FileInputStream input = new FileInputStream(file);
+				ftp.setControlEncoding("UTF-8");
+				ftp.storeFile(new String(file.getName().getBytes("UTF-8"), "iso-8859-1"), input);
+				input.close();
+			}
+		} catch (Exception e) {
+			flag = false;
+			e.printStackTrace();
+		} finally {
+			closeFtp();
+			return flag;
+		}
+
+	}
+
+	/**
+	 * 下载链接配置
+	 * 
+	 * @param f
+	 * @param localBaseDir
+	 *            本地目录
+	 * @param remoteBaseDir
+	 *            远程目录
+	 * @throws Exception
+	 */
+	public static boolean startDown(Ftp f, String localBaseDir, String remoteBaseDir, String filename) throws Exception {
+		boolean flag = false;
+		if (FtpUtil.connectFtp(f)) {
+			try {
+				FTPFile[] files = null;
+				boolean changedir = ftp.changeWorkingDirectory(remoteBaseDir);
+				if (changedir) {
+					ftp.setControlEncoding("GBK");
+					files = ftp.listFiles();
+					for (int i = 0; i < files.length; i++) {
+						if (filename.equals(files[i].getName())) {
+							try {
+								flag = downloadFile(files[i], localBaseDir, remoteBaseDir);
+							} catch (Exception e) {
+								logger.error(e);
+								logger.error("<" + files[i].getName() + ">下载失败");
+							}
+						}
+					}
+				}
+			} catch (Exception e) {
+				logger.error(e);
+				logger.error("下载过程中出现异常");
+			} finally {
+				closeFtp();
+			}
+		} else {
+			logger.error("链接失败！");
+			flag = false;
+		}
+		return flag;
+	}
+
+	/**
+	 * 
+	 * 下载FTP文件 当你需要下载FTP文件的时候，调用此方法 根据<b>获取的文件名，本地地址，远程地址</b>进行下载
+	 * 
+	 * @param ftpFile
+	 * @param relativeLocalPath
+	 * @param relativeRemotePath
+	 */
+	private static boolean downloadFile(FTPFile ftpFile, String relativeLocalPath, String relativeRemotePath) {
+		boolean flag = false;
+		if (ftpFile.isFile()) {
+			if (ftpFile.getName().indexOf("?") == -1) {
+				OutputStream outputStream = null;
+				try {
+					File locaFile = new File(relativeLocalPath + ftpFile.getName());
+					// 判断文件是否存在，存在则返回
+					if (locaFile.exists()) {
+						return true;
+					} else {
+						outputStream = new FileOutputStream(relativeLocalPath + ftpFile.getName());
+						ftp.retrieveFile(ftpFile.getName(), outputStream);
+						outputStream.flush();
+						outputStream.close();
+						flag = true;
+					}
+				} catch (Exception e) {
+					logger.error(e);
+				} finally {
+					try {
+						if (outputStream != null) {
+							outputStream.close();
+						}
+					} catch (IOException e) {
+						logger.error("输出文件流异常");
+					}
+				}
+			}
+		} else {
+			String newlocalRelatePath = relativeLocalPath + ftpFile.getName();
+			String newRemote = new String(relativeRemotePath + ftpFile.getName().toString());
+			File fl = new File(newlocalRelatePath);
+			if (!fl.exists()) {
+				fl.mkdirs();
+			}
+			try {
+				newlocalRelatePath = newlocalRelatePath + '/';
+				newRemote = newRemote + "/";
+				String currentWorkDir = ftpFile.getName().toString();
+				boolean changedir = ftp.changeWorkingDirectory(currentWorkDir);
+				if (changedir) {
+					FTPFile[] files = null;
+					files = ftp.listFiles();
+					for (int i = 0; i < files.length; i++) {
+						downloadFile(files[i], newlocalRelatePath, newRemote);
+					}
+				}
+				if (changedir) {
+					ftp.changeToParentDirectory();
+				}
+			} catch (Exception e) {
+				logger.error(e);
+			}
+		}
+		return flag;
+	}
+
+	public static void main(String[] args) throws Exception {
+		Ftp f = new Ftp();
+		f.setIpAddr("127.0.0.1");
+		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文件测试
+		System.out.println("ok");
+
+	}
+
+	public static void makeDirFile(String path) {
+		File file = new File(path);
+		if (file.isDirectory()) {
+			try {
+				ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"), "iso-8859-1"));
+				ftp.changeWorkingDirectory(file.getName());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+		}
+	}
+
+}

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

@@ -0,0 +1,118 @@
+package com.xt.jygl.ftp;
+
+import java.io.File;
+import java.io.FileInputStream;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPReply;
+
+public class Test {
+
+	private static FTPClient ftp;
+
+	/**
+	 * 
+	 * @param path
+	 *            上传到ftp服务器哪个路径下
+	 * @param addr
+	 *            地址
+	 * @param port
+	 *            端口号
+	 * @param username
+	 *            用户名
+	 * @param password
+	 *            密码
+	 * @return
+	 * @throws Exception
+	 */
+	private boolean connect(String path, String addr, int port, String username, String password) throws Exception {
+		boolean result = false;
+		ftp = new FTPClient();
+		int reply;
+		ftp.connect(addr, port);
+		ftp.login(username, password);
+		ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
+		reply = ftp.getReplyCode();
+		if (!FTPReply.isPositiveCompletion(reply)) {
+			ftp.disconnect();
+			return result;
+		}
+		ftp.changeWorkingDirectory(path);
+		result = true;
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param file
+	 *            上传的文件或文件夹
+	 * @throws Exception
+	 */
+	private void upload(File file,String filename) {
+		try {
+			if (file.isDirectory()) {
+				ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
+				ftp.changeWorkingDirectory(file.getName());
+				String[] files = file.list();
+				for (int i = 0; i < files.length; i++) {
+					File file1 = new File(file.getPath() + "\\" + files[i]);
+					if (file1.isDirectory()) {
+						upload(file1,filename);
+						ftp.changeToParentDirectory();
+					} else {
+						if(filename.equals(files[i])){
+							File file2 = new File(file.getPath() + "\\" + files[i]);
+							FileInputStream input = new FileInputStream(file2);
+							ftp.storeFile(file2.getName(), input);
+							input.close();
+						}
+					}
+				}
+			} else {
+				FileInputStream input = new FileInputStream(file);
+				ftp.setControlEncoding("UTF-8");
+				ftp.storeFile(new String(file.getName().getBytes("UTF-8"),"iso-8859-1"), input);
+				input.close();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public static void makeDir(File file){
+		
+	} 
+	
+	public static void main(String[] args) throws Exception {
+		Test t = new Test();
+		t.connect("", "127.0.0.1", 21, "test", "test");
+		File file = new File("E:\\upload\\2");
+		if(file.isDirectory()){
+			ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
+			ftp.changeWorkingDirectory(file.getName());
+		}
+		file = new File("E:\\upload\\2\\2");
+		if(file.isDirectory()){
+			ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
+			ftp.changeWorkingDirectory(file.getName());
+		}
+		file = new File("E:\\upload\\2\\2\\2");
+		if(file.isDirectory()){
+			ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
+			ftp.changeWorkingDirectory(file.getName());
+		}
+		file = new File("E:\\upload\\2\\2\\2\\2");
+		if(file.isDirectory()){
+			ftp.makeDirectory(new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
+			ftp.changeWorkingDirectory(file.getName());
+		}
+		File[] files = file.listFiles();
+		if(files != null && files.length >0){
+			for (int i = 0; i < files.length; i++) {
+				t.upload(files[i],"1.txt");
+				}
+		}
+		
+		System.out.println("ok");
+
+	}
+}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/ctl/JgbgCtl.java

@@ -291,7 +291,7 @@ public class JgbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JgbgEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JgbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -346,7 +346,14 @@ public class JgbgCtl extends BaseWebCtl {
 				jgbg.setAxcd(code.getAxcd());
 				jgbg.setBwdj(code.getBwdj());
 				jgbg.setBwyt(code.getBwyt());
+				jgbg.setJcsj(code.getJcsj());
+				jgbg.setZftze(code.getZftze());
+				jgbg.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgbg.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -401,7 +408,10 @@ public class JgbgCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -453,7 +463,7 @@ public class JgbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(JgbgEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submitAudit(JgbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		JgbgEntity jgbg = new JgbgEntity();
 		try {
@@ -469,7 +479,14 @@ public class JgbgCtl extends BaseWebCtl {
 				jgbg.setAxcd(code.getAxcd());
 				jgbg.setBwdj(code.getBwdj());
 				jgbg.setBwyt(code.getBwyt());
+				jgbg.setJcsj(code.getJcsj());
+				jgbg.setZftze(code.getZftze());
+				jgbg.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgbg.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -541,7 +558,7 @@ public class JgbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, JgbgEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, JgbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -596,7 +613,14 @@ public class JgbgCtl extends BaseWebCtl {
 				jgbg.setAxcd(code.getAxcd());
 				jgbg.setBwdj(code.getBwdj());
 				jgbg.setBwyt(code.getBwyt());
+				jgbg.setJcsj(code.getJcsj());
+				jgbg.setZftze(code.getZftze());
+				jgbg.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgbg.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -651,7 +675,10 @@ public class JgbgCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -716,7 +743,8 @@ public class JgbgCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
-
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
@@ -742,6 +770,8 @@ public class JgbgCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		if (entity.getJyrid() != null) {
 			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 		}
@@ -835,7 +865,10 @@ public class JgbgCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("jcsj", dateTimeFormat.format(today));
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
@@ -937,7 +970,7 @@ public class JgbgCtl extends BaseWebCtl {
 					entity.setFlowstatus("1");
 				}
 				jgbgService.save(entity);
-			}else{
+			} else {
 				// rtx提醒
 				if (!StringUtils.isEmpty(userids)) {
 					rtxSend(userids, "", "你有一条建设进度竣工验收变更待办事务，请及时处理！");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/entity/JgbgEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgbg.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -48,6 +50,45 @@ public class JgbgEntity extends BaseEntity<String> implements Cloneable {
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
 	private String flowstatus = "0";
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/vo/JgbgVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgbg.vo;
 
+import java.util.Date;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -58,6 +60,53 @@ public class JgbgVo extends BaseVo {
 	private String sfqswj;/* 是否缺失文件*/
 	private String showjsjd;/* 是否显示建设进度*/
 	private String flowstatus;
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	private String sylxzw;
+	
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

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

@@ -51,6 +51,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -84,6 +85,7 @@ public class JgsqCtl extends BaseWebCtl {
 	private JgsqfjService jgsqfjService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jgsq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -270,14 +272,9 @@ public class JgsqCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("jgsq:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
-		JgsqEntity entity = jgsqService.findOne(id);
-		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
-			wr.setSuccess(false);
-			wr.setMessage("该项目在流程中，无法删除！");
-			return wr;
-		}
 		try {
 			// 逻辑删除
 			jgsqService.logicDelete(id);
@@ -291,7 +288,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JgsqEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -346,7 +343,14 @@ public class JgsqCtl extends BaseWebCtl {
 				jgsq.setAxcd(code.getAxcd());
 				jgsq.setBwdj(code.getBwdj());
 				jgsq.setBwyt(code.getBwyt());
+				jgsq.setJcsj(code.getJcsj());
+				jgsq.setZftze(code.getZftze());
+				jgsq.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgsq.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -402,6 +406,10 @@ public class JgsqCtl extends BaseWebCtl {
 					code.setJyrid(jyr);
 				}
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -454,7 +462,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(JgsqEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submitAudit(JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		JgsqEntity jgsq = new JgsqEntity();
 		try {
@@ -470,7 +478,14 @@ public class JgsqCtl extends BaseWebCtl {
 				jgsq.setAxcd(code.getAxcd());
 				jgsq.setBwdj(code.getBwdj());
 				jgsq.setBwyt(code.getBwyt());
+				jgsq.setJcsj(code.getJcsj());
+				jgsq.setZftze(code.getZftze());
+				jgsq.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgsq.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -542,7 +557,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, JgsqEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -597,7 +612,14 @@ public class JgsqCtl extends BaseWebCtl {
 				jgsq.setAxcd(code.getAxcd());
 				jgsq.setBwdj(code.getBwdj());
 				jgsq.setBwyt(code.getBwyt());
+				jgsq.setJcsj(code.getJcsj());
+				jgsq.setZftze(code.getZftze());
+				jgsq.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgsq.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -653,6 +675,10 @@ public class JgsqCtl extends BaseWebCtl {
 					code.setJyrid(jyr);
 				}
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -702,6 +728,7 @@ public class JgsqCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jgsq:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		// 附件
@@ -717,6 +744,8 @@ public class JgsqCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
@@ -743,6 +772,8 @@ public class JgsqCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		if (entity.getJyrid() != null) {
 			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 		}
@@ -828,6 +859,7 @@ public class JgsqCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jgsq:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -836,7 +868,10 @@ public class JgsqCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("jcsj", dateTimeFormat.format(today));
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/entity/JgsqEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgsq.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -48,6 +50,11 @@ public class JgsqEntity extends BaseEntity<String> implements Cloneable {
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
 	private String flowstatus = "0";
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")
@@ -246,5 +253,38 @@ public class JgsqEntity extends BaseEntity<String> implements Cloneable {
 	public void setFlowstatus(String flowstatus) {
 		this.flowstatus = flowstatus;
 	}
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/vo/JgsqVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgsq.vo;
 
+import java.util.Date;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -58,6 +60,52 @@ public class JgsqVo extends BaseVo {
 	private String sfqswj;/* 是否缺失文件*/
 	private String showjsjd;/* 是否显示建设进度*/
 	private String flowstatus;
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	private String sylxzw;
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/ctl/JgzxCtl.java

@@ -51,6 +51,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -84,6 +85,7 @@ public class JgzxCtl extends BaseWebCtl {
 	private JgzxfjService jgzxfjService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jgzx:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -223,25 +225,12 @@ public class JgzxCtl extends BaseWebCtl {
 				} else {
 					vo.setShowjsjd("N");
 				}
-				/*
-				 * List<TzjhglEntity> tzjh =
-				 * tzjhglService.findByXmid(entity.getId() != null ?
-				 * entity.getId() : ""); if (tzjh.size() != 0) { String
-				 * flagForYear = "1"; vo.setFlagForYear(flagForYear); }
-				 */
 				List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JgzxEntity.PROCESS_DEFINITION_KEY);
 				String flag = "";
 				if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					flag = "1";
 					vo.setFlag(flag);
 				}
-				/*
-				 * boolean judge = false; for (TzjhglEntity tz : tzjh) { if
-				 * (("是").equals(tz.getSfyzjbz().getText())) { judge = true; }
-				 * 
-				 * } if (judge) { vo.setSfyzjbz("是"); } else {
-				 * vo.setSfyzjbz("否"); }
-				 */
 
 				voList.add(vo);
 			}
@@ -270,14 +259,9 @@ public class JgzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("jgzx:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
-		JgzxEntity entity = jgzxService.findOne(id);
-		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
-			wr.setSuccess(false);
-			wr.setMessage("该项目在流程中，无法删除！");
-			return wr;
-		}
 		try {
 			// 逻辑删除
 			jgzxService.logicDelete(id);
@@ -291,7 +275,7 @@ public class JgzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JgzxEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JgzxEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -346,7 +330,14 @@ public class JgzxCtl extends BaseWebCtl {
 				jgzx.setAxcd(code.getAxcd());
 				jgzx.setBwdj(code.getBwdj());
 				jgzx.setBwyt(code.getBwyt());
+				jgzx.setJcsj(code.getJcsj());
+				jgzx.setZftze(code.getZftze());
+				jgzx.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgzx.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -402,6 +393,10 @@ public class JgzxCtl extends BaseWebCtl {
 					code.setJyrid(jyr);
 				}
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -453,7 +448,7 @@ public class JgzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(JgzxEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submitAudit(JgzxEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		JgzxEntity jgzx = new JgzxEntity();
 		try {
@@ -469,7 +464,14 @@ public class JgzxCtl extends BaseWebCtl {
 				jgzx.setAxcd(code.getAxcd());
 				jgzx.setBwdj(code.getBwdj());
 				jgzx.setBwyt(code.getBwyt());
+				jgzx.setJcsj(code.getJcsj());
+				jgzx.setZftze(code.getZftze());
+				jgzx.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgzx.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -541,7 +543,7 @@ public class JgzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, JgzxEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, JgzxEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -596,7 +598,14 @@ public class JgzxCtl extends BaseWebCtl {
 				jgzx.setAxcd(code.getAxcd());
 				jgzx.setBwdj(code.getBwdj());
 				jgzx.setBwyt(code.getBwyt());
+				jgzx.setJcsj(code.getJcsj());
+				jgzx.setZftze(code.getZftze());
+				jgzx.setXmbm(code.getXmbm());
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jgzx.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -652,6 +661,10 @@ public class JgzxCtl extends BaseWebCtl {
 					code.setJyrid(jyr);
 				}
 
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -701,6 +714,7 @@ public class JgzxCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jgzx:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		// 附件
@@ -716,6 +730,8 @@ public class JgzxCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
@@ -742,6 +758,8 @@ public class JgzxCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		if (entity.getJyrid() != null) {
 			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 		}
@@ -827,6 +845,7 @@ public class JgzxCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jgzx:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -835,7 +854,10 @@ public class JgzxCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("jcsj", dateTimeFormat.format(today));
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/entity/JgzxEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgzx.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -48,6 +50,45 @@ public class JgzxEntity extends BaseEntity<String> implements Cloneable {
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
 	private String flowstatus = "0";
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/vo/JgzxVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jgzx.vo;
 
+import java.util.Date;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -58,6 +60,53 @@ public class JgzxVo extends BaseVo {
 	private String sfqswj;/* 是否缺失文件*/
 	private String showjsjd;/* 是否显示建设进度*/
 	private String flowstatus;
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	private String sylxzw;
+	
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

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

@@ -45,12 +45,12 @@ import com.xt.jygl.gkjsgl.jsjdbg.vo.JsjdbgVo;
 import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
-import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -84,6 +84,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 	private JsjdbgfjService jsjdbgfjService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jsjdbg:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -270,6 +271,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("jsjdbg:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
@@ -291,7 +293,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JsjdbgEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JsjdbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -346,7 +348,13 @@ public class JsjdbgCtl extends BaseWebCtl {
 				jsjdbg.setAxcd(code.getAxcd());
 				jsjdbg.setBwdj(code.getBwdj());
 				jsjdbg.setBwyt(code.getBwyt());
-
+				jsjdbg.setJcsj(code.getJcsj());
+				jsjdbg.setZftze(code.getZftze());
+				jsjdbg.setXmbm(code.getXmbm());
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdbg.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -401,7 +409,11 @@ public class JsjdbgCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					sylx.setId(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -452,7 +464,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(JsjdbgEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submitAudit(JsjdbgEntity code,String sylxid,String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		JsjdbgEntity jsjdbg = new JsjdbgEntity();
 		try {
@@ -468,7 +480,13 @@ public class JsjdbgCtl extends BaseWebCtl {
 				jsjdbg.setAxcd(code.getAxcd());
 				jsjdbg.setBwdj(code.getBwdj());
 				jsjdbg.setBwyt(code.getBwyt());
-
+				jsjdbg.setJcsj(code.getJcsj());
+				jsjdbg.setZftze(code.getZftze());
+				jsjdbg.setXmbm(code.getXmbm());
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdbg.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -518,7 +536,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 				}
 				jsjdbg = jsjdbgService.save(jsjdbg);
 			}
-		
+
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -541,7 +559,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, JsjdbgEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, JsjdbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -596,7 +614,13 @@ public class JsjdbgCtl extends BaseWebCtl {
 				jsjdbg.setAxcd(code.getAxcd());
 				jsjdbg.setBwdj(code.getBwdj());
 				jsjdbg.setBwyt(code.getBwyt());
-
+				jsjdbg.setJcsj(code.getJcsj());
+				jsjdbg.setZftze(code.getZftze());
+				jsjdbg.setXmbm(code.getXmbm());
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdbg.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -651,7 +675,11 @@ public class JsjdbgCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					sylx.setId(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -701,6 +729,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jsjdbg:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		// 附件
@@ -708,7 +737,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		model.addAttribute("fjList", accessoryList);
 
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
-		XmxxglVo vo = new XmxxglVo();
+		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);
 		vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
 		vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
@@ -716,7 +745,8 @@ public class JsjdbgCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
-
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
@@ -742,6 +772,8 @@ public class JsjdbgCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		if (entity.getJyrid() != null) {
 			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 		}
@@ -827,6 +859,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jsjdbg:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -835,7 +868,10 @@ public class JsjdbgCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("jcsj", dateTimeFormat.format(today));
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
@@ -937,7 +973,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 					entity.setFlowstatus("1");
 				}
 				jsjdbgService.save(entity);
-			}else{
+			} else {
 				// rtx提醒
 				if (!StringUtils.isEmpty(userids)) {
 					rtxSend(userids, "", "你有一条建设进度初步设计变更待办事务，请及时处理！");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/entity/JsjdbgEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdbg.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -43,11 +45,50 @@ public class JsjdbgEntity extends BaseEntity<String> implements Cloneable {
 	private GkEntity szgk;/* 所在港口 */
 	private GqEntity szgq;/* 所在港区 */
 	private GkjyrEntity jyrid;
-	private String bwyt;/* 泊位用途*/
-	private CodeEntity zyhbwfl;/* 专业化泊位分类*/
-	private String lcjd;/* 流程节点*/
-	private String sfqswj;/* 是否缺失文件*/
+	private String bwyt;/* 泊位用途 */
+	private CodeEntity zyhbwfl;/* 专业化泊位分类 */
+	private String lcjd;/* 流程节点 */
+	private String sfqswj;/* 是否缺失文件 */
 	private String flowstatus = "0";
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")
@@ -212,7 +253,7 @@ public class JsjdbgEntity extends BaseEntity<String> implements Cloneable {
 	public void setBwyt(String bwyt) {
 		this.bwyt = bwyt;
 	}
-	
+
 	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "zyhbwfl")
 	public CodeEntity getZyhbwfl() {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/vo/JsjdbgVo.java

@@ -1,9 +1,6 @@
 package com.xt.jygl.gkjsgl.jsjdbg.vo;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-import org.hibernate.annotations.GenericGenerator;
+import java.util.Date;
 
 import com.xtframe.sec.common.BaseVo;
 
@@ -58,9 +55,52 @@ public class JsjdbgVo extends BaseVo {
 	private String sfqswj;/* 是否缺失文件*/
 	private String showjsjd;/* 是否显示建设进度*/
 	private String flowstatus;
-	@Id
-	@GenericGenerator(name = "systemUUID", strategy = "uuid")
-	@GeneratedValue(generator = "systemUUID")
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	private String sylxzw;
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 	public String getId() {
 		return id;
 	}

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

@@ -34,10 +34,11 @@ import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
-import com.xt.jygl.gkjsgl.jsjdcbsj.client.JsjdcbsjWebService;
 import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjfjEntity;
 import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjService;
@@ -45,7 +46,6 @@ import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjfjService;
 import com.xt.jygl.gkjsgl.jsjdcbsj.vo.JsjdcbsjVo;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
-import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
@@ -276,7 +276,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JsjdcbsjEntity code, String userids, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JsjdcbsjEntity code, String sylxid, String userids, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -331,12 +331,18 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				jsjdcbsj.setAxcd(code.getAxcd());
 				jsjdcbsj.setBwdj(code.getBwdj());
 				jsjdcbsj.setBwyt(code.getBwyt());
-
+				jsjdcbsj.setJcsj(code.getJcsj());
+				jsjdcbsj.setZftze(code.getZftze());
+				jsjdcbsj.setXmbm(code.getXmbm());
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
 					jsjdcbsj.setJyrid(jyr);
 				}
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdcbsj.setSylx(sylx);
+				}
 
 				if (!StringUtils.isEmpty(zyhbwflid)) {
 					CodeEntity zyhbwfl = new CodeEntity(zyhbwflid);
@@ -386,7 +392,11 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					sylx.setId(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -437,7 +447,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(JsjdcbsjEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submitAudit(JsjdcbsjEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity jsjdcbsj = new JsjdcbsjEntity();
 		try {
@@ -453,12 +463,18 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				jsjdcbsj.setAxcd(code.getAxcd());
 				jsjdcbsj.setBwdj(code.getBwdj());
 				jsjdcbsj.setBwyt(code.getBwyt());
-
+				jsjdcbsj.setJcsj(code.getJcsj());
+				jsjdcbsj.setZftze(code.getZftze());
+				jsjdcbsj.setXmbm(code.getXmbm());
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
 					jsjdcbsj.setJyrid(jyr);
 				}
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdcbsj.setSylx(sylx);
+				}
 
 				if (!StringUtils.isEmpty(zyhbwflid)) {
 					CodeEntity zyhbwfl = new CodeEntity(zyhbwflid);
@@ -526,7 +542,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, JsjdcbsjEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, JsjdcbsjEntity code, String ssjyrid, String sylxid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -582,13 +598,18 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				jsjdcbsj.setAxcd(code.getAxcd());
 				jsjdcbsj.setBwdj(code.getBwdj());
 				jsjdcbsj.setBwyt(code.getBwyt());
-
+				jsjdcbsj.setJcsj(code.getJcsj());
+				jsjdcbsj.setZftze(code.getZftze());
+				jsjdcbsj.setXmbm(code.getXmbm());
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
 					jsjdcbsj.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdcbsj.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(zyhbwflid)) {
 					CodeEntity zyhbwfl = new CodeEntity(zyhbwflid);
 					jsjdcbsj.setZyhbwfl(zyhbwfl);
@@ -640,7 +661,11 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					sylx.setId(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -690,25 +715,16 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
-	public WebJsonResult saveTbzt(Model model) {
+	public WebJsonResult saveTbzt(Model model, String id) {
 		WebJsonResult wr = success();
-		List<JsjdcbsjEntity> lists = jsjdcbsjService.findByTbzt();
-		if (lists != null && lists.size() > 0) {
-			for (JsjdcbsjEntity entity : lists) {
-				entity.setTbzt(Constants.YES);
-				jsjdcbsjService.save(entity);
-				try {
-					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
-					JsjdcbsjEntity jsjdcbsj = webService.saveJsjdcbsj(entity, null, null);
-					if (jsjdcbsj != null) {
-						entity.setSftb(Constants.YES);
-						jsjdcbsjService.save(entity);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-
-			}
+		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
+		entity.setTbzt(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);
+			jsjdcbsjService.save(entity);
 		}
 		return wr;
 	}
@@ -722,7 +738,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		model.addAttribute("fjList", accessoryList);
 
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
-		XmxxglVo vo = new XmxxglVo();
+		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);
 		vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
 		vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
@@ -730,14 +746,16 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
-
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
 		vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
+
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		model.addAttribute("roleCode", Constants.ROLE_LD);
@@ -757,6 +775,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		if (entity.getJyrid() != null) {
 			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 		}
@@ -851,6 +871,29 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 		List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsid(id);
 		if (fjlist != null && fjlist.size() > 0) {
+			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				for (JsjdcbsjfjEntity fj : fjlist) {
+					AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+					try {
+						Ftp f = getftp();
+						// 本地目录
+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+						// 远程目录
+						String remoteBaseDir = "/jsjdcbsj/";
+						// 下载ftp文件
+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+						if (downflag) {
+							System.out.println("ok");
+							acc.setFjbz("1");
+							accessoryService.save(acc);
+						}
+
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			}
+
 			model.addAttribute("fjlist", fjlist);
 		}
 
@@ -869,7 +912,10 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("jcsj", dateTimeFormat.format(today));
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
@@ -936,7 +982,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				for (int i = 0; i < slist.size(); i++) {
 					TaskInfoEntity taskentity = slist.get(i);
 					if ("zjps".equals(taskentity.getTaskKey())) {
-						userids = taskentity.getAuditUser()+",";
+						userids = taskentity.getAuditUser() + ",";
 					}
 				}
 			}
@@ -948,25 +994,29 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				} else {
 					entity.setFlowstatus("1");
 				}
+				entity.setTbzt("Y");
 				entity = jsjdcbsjService.save(entity);
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
-					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
 					List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsid(id);
-					List<AccessoryEntity> lists = new ArrayList<AccessoryEntity>();
+					String fjids = "";
 					if (fjlist != null && fjlist.size() > 0) {
 						for (JsjdcbsjfjEntity fj : fjlist) {
 							AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
 							if (acc != null) {
-								lists.add(acc);
+								fjids=acc.getId()+",";
 							}
 						}
 					}
-					JsjdcbsjEntity newEntity = webService.saveJsjdcbsj(entity, fjlist, lists);
-					if (newEntity != null) {
-						entity.setTbzt("Y");
+					String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID="+entity.getId()+";FJID_IN="+fjids;
+					boolean tbflag = getTbStatus(url);
+					if (tbflag) {
+						entity.setSftb("Y");
 						jsjdcbsjService.save(entity);
+
 					}
+
+					
 				} catch (Exception e) {
 					e.printStackTrace();
 				}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/entity/JsjdcbsjEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdcbsj.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -48,6 +50,10 @@ public class JsjdcbsjEntity extends BaseEntity<String> implements Cloneable {
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
 	private String flowstatus = "0";
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
 	
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
@@ -248,4 +254,38 @@ public class JsjdcbsjEntity extends BaseEntity<String> implements Cloneable {
 		this.flowstatus = flowstatus;
 	}
 
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/vo/JsjdcbsjVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdcbsj.vo;
 
+import java.util.Date;
+
 import com.xtframe.sec.common.BaseVo;
 
 public class JsjdcbsjVo extends BaseVo {
@@ -53,6 +55,29 @@ public class JsjdcbsjVo extends BaseVo {
 	private String sfqswj;/* 是否缺失文件 */
 	private String showjsjd;/* 是否显示建设进度 */
 	private String flowstatus;
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	private String sylxzw;
+	private String bl;
+	private String tbzt;
+	
+	public String getTbzt() {
+		return tbzt;
+	}
+
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
 
 	public String getId() {
 		return id;
@@ -446,4 +471,44 @@ public class JsjdcbsjVo extends BaseVo {
 		this.flowstatus = flowstatus;
 	}
 
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
+	public String getBl() {
+		return bl;
+	}
+
+	public void setBl(String bl) {
+		this.bl = bl;
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/webservice/JsjdcbsjWebService.java

@@ -30,15 +30,18 @@ public class JsjdcbsjWebService {
 	private JsjdcbsjfjService jsjdcbsjfjService;
 	@Autowired
 	private AccessoryService accessoryService;
+
 	/**
 	 * 保存信息
 	 */
 	public JsjdcbsjEntity saveJsjdcbsj(JsjdcbsjEntity entity, List<JsjdcbsjfjEntity> fjlist, List<AccessoryEntity> acclist) {
-		JsjdcbsjEntity newjsjdcbsj = new JsjdcbsjEntity();
-		BeanUtils.copyProperties(entity, newjsjdcbsj);
-		entity.setTbzt(Constants.NO);
-		newjsjdcbsj.setId(entity.getId());
-		newjsjdcbsj = jsjdcbsjService.save(newjsjdcbsj);
+		JsjdcbsjEntity newEntity = new JsjdcbsjEntity();
+		BeanUtils.copyProperties(entity, newEntity);
+		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {// 省调市
+		} else {// 市调省
+			newEntity.setTbzt(Constants.NO);
+		}
+		newEntity = jsjdcbsjService.save(newEntity);
 
 		Ftp f = new Ftp();
 		f.setIpAddr("127.0.0.1");
@@ -71,7 +74,6 @@ public class JsjdcbsjWebService {
 						}
 
 					}
-
 					jsjdcbsjfjService.save(fj);
 				}
 			}
@@ -79,7 +81,7 @@ public class JsjdcbsjWebService {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return newjsjdcbsj;
+		return newEntity;
 	}
 
 	/*

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/ctl/JsjdzxCtl.java

@@ -45,12 +45,12 @@ import com.xt.jygl.gkjsgl.jsjdzx.service.JsjdzxfjService;
 import com.xt.jygl.gkjsgl.jsjdzx.vo.JsjdzxVo;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
-import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -84,6 +84,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 	private JsjdzxfjService jsjdzxfjService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jsjdzx:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -270,14 +271,9 @@ public class JsjdzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("jsjdzx:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
-		JsjdzxEntity entity = jsjdzxService.findOne(id);
-		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
-			wr.setSuccess(false);
-			wr.setMessage("该项目在流程中，无法删除！");
-			return wr;
-		}
 		try {
 			// 逻辑删除
 			jsjdzxService.logicDelete(id);
@@ -291,7 +287,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JsjdzxEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JsjdzxEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -346,7 +342,13 @@ public class JsjdzxCtl extends BaseWebCtl {
 				jsjdzx.setAxcd(code.getAxcd());
 				jsjdzx.setBwdj(code.getBwdj());
 				jsjdzx.setBwyt(code.getBwyt());
-
+				jsjdzx.setJcsj(code.getJcsj());
+				jsjdzx.setZftze(code.getZftze());
+				jsjdzx.setXmbm(code.getXmbm());
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdzx.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -401,7 +403,10 @@ public class JsjdzxCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -452,7 +457,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(JsjdzxEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submitAudit(JsjdzxEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		JsjdzxEntity jsjdzx = new JsjdzxEntity();
 		try {
@@ -468,7 +473,13 @@ public class JsjdzxCtl extends BaseWebCtl {
 				jsjdzx.setAxcd(code.getAxcd());
 				jsjdzx.setBwdj(code.getBwdj());
 				jsjdzx.setBwyt(code.getBwyt());
-
+				jsjdzx.setJcsj(code.getJcsj());
+				jsjdzx.setZftze(code.getZftze());
+				jsjdzx.setXmbm(code.getXmbm());
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdzx.setSylx(sylx);
+				}
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -540,7 +551,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, JsjdzxEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, JsjdzxEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -595,6 +606,18 @@ public class JsjdzxCtl extends BaseWebCtl {
 				jsjdzx.setAxcd(code.getAxcd());
 				jsjdzx.setBwdj(code.getBwdj());
 				jsjdzx.setBwyt(code.getBwyt());
+				jsjdzx.setJcsj(code.getJcsj());
+				jsjdzx.setZftze(code.getZftze());
+				jsjdzx.setXmbm(code.getXmbm());
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					jsjdzx.setSylx(sylx);
+				}
+				if (!StringUtils.isEmpty(ssjyrid)) {
+					GkjyrEntity jyr = new GkjyrEntity();
+					jyr.setId(ssjyrid);
+					jsjdzx.setJyrid(jyr);
+				}
 
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
@@ -650,7 +673,10 @@ public class JsjdzxCtl extends BaseWebCtl {
 					jyr.setId(ssjyrid);
 					code.setJyrid(jyr);
 				}
-
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity(sylxid);
+					code.setSylx(sylx);
+				}
 				// 新增直接保存
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
@@ -700,6 +726,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jsjdzx:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		// 附件
@@ -707,7 +734,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 		model.addAttribute("fjList", accessoryList);
 
 		JsjdzxEntity entity = jsjdzxService.findOne(id);
-		XmxxglVo vo = new XmxxglVo();
+		JsjdzxVo vo = new JsjdzxVo();
 		BeanUtils.copyProperties(entity, vo);
 		vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
 		vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
@@ -715,7 +742,8 @@ public class JsjdzxCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
-
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
@@ -741,6 +769,8 @@ public class JsjdzxCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		if (entity.getJyrid() != null) {
 			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 		}
@@ -826,6 +856,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jsjdzx:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -834,7 +865,10 @@ public class JsjdzxCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("jcsj", dateTimeFormat.format(today));
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/entity/JsjdzxEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdzx.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -48,6 +50,10 @@ public class JsjdzxEntity extends BaseEntity<String> implements Cloneable {
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
 	private String flowstatus = "0";
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")
@@ -246,5 +252,37 @@ public class JsjdzxEntity extends BaseEntity<String> implements Cloneable {
 	public void setFlowstatus(String flowstatus) {
 		this.flowstatus = flowstatus;
 	}
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
 
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/vo/JsjdzxVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdzx.vo;
 
+import java.util.Date;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -58,6 +60,52 @@ public class JsjdzxVo extends BaseVo {
 	private String sfqswj;/* 是否缺失文件*/
 	private String showjsjd;/* 是否显示建设进度*/
 	private String flowstatus;
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	private String sylxzw;
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -1,6 +1,5 @@
 package com.xt.jygl.gkjsgl.xmxxgl.ctl;
 
-import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -80,6 +80,7 @@ public class LhbgCtl extends BaseWebCtl {
 	private AccessoryService accessoryService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("lhbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -157,6 +158,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("lhlh:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -188,6 +190,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("lhbg:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		LhbgEntity lhbg = lhbgService.findOne(id);
@@ -332,7 +335,7 @@ public class LhbgCtl extends BaseWebCtl {
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
-	@RequiresPermissions("gkjyxkbg:delete")
+	@RequiresPermissions("lhbg:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		try {

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

@@ -43,6 +43,7 @@ import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.vo.GdmcVo;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.vo.LhsqVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.SimplePageRequest;
@@ -70,6 +71,7 @@ public class LhsqCtl extends BaseWebCtl {
 	private AccessoryService accessoryService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("lhsq:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -145,6 +147,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("lhsq:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -175,6 +178,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("lhsq:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		LhsqEntity lhsq = lhsqService.findOne(id);
@@ -357,6 +361,7 @@ public class LhsqCtl extends BaseWebCtl {
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("lhsq:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		try {

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

@@ -44,6 +44,7 @@ import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.service.LhyxfjService;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.vo.LhyxVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
@@ -84,6 +85,7 @@ public class LhyxCtl extends BaseWebCtl {
 	private XkzxxService xkzxxService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("lhyx:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -160,6 +162,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("lhyx:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -201,6 +204,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("lhyx:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		LhyxEntity lhyx = lhyxService.findOne(id);
@@ -359,6 +363,7 @@ public class LhyxCtl extends BaseWebCtl {
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("lhyx:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		try {

gkjsjy/trunk/src/com/xtframe/core/webService/ClientHandler.java

@@ -57,9 +57,9 @@ public class ClientHandler implements SOAPHandler<SOAPMessageContext> {
 			if (hdr == null)
 				hdr = env.addHeader();
 			SOAPHeaderElement userAuth = hdr.addHeaderElement(qname);
-			SimpleHash hash = new SimpleHash(credentialsMatcher.getHashAlgorithmName(), SystemParam.getDefaultPwd(), null, credentialsMatcher.getHashIterations());
+			//SimpleHash hash = new SimpleHash(credentialsMatcher.getHashAlgorithmName(), SystemParam.getDefaultPwd(), null, credentialsMatcher.getHashIterations());
 			userAuth.setActor(SOAPConstants.URI_SOAP_1_2_ROLE_NEXT);
-			userAuth.addTextNode(GlobalData.TB_USER_CODE + "&" + hash.toHex());
+			userAuth.addTextNode(GlobalData.TB_USER_CODE + "&8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92");
 			msg.saveChanges();
 			return true;
 		} catch (Exception e) {

gkjsjy/trunk/src/com/xtframe/sec/job/ctl/JobCtl.java

@@ -0,0 +1,76 @@
+package com.xtframe.sec.job.ctl;
+
+import java.util.List;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.SchedulerContext;
+import org.springframework.context.ApplicationContext;
+
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
+import com.xt.jygl.ggfwxxgl.jdjc.entity.JdjcEntity;
+import com.xt.jygl.ggfwxxgl.jdjc.entity.JdjcfjEntity;
+import com.xt.jygl.ggfwxxgl.jdjc.service.JdjcService;
+import com.xt.jygl.ggfwxxgl.jdjc.service.JdjcfjService;
+
+/***
+ * 每天执行一次，在距办理期限还有两天以上时间的每天提醒一次
+ * 
+ * @author Administrator
+ *
+ */
+public class JobCtl extends BaseWebCtl implements Job {
+
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		try {
+			// // 获取JobExecutionContext中的service对象
+			SchedulerContext schCtx = context.getScheduler().getContext();
+			// // 获取Spring中的上下文
+			ApplicationContext appCtx = (ApplicationContext) schCtx.get("applicationContext");
+			JdjcService jdjcService = (JdjcService) appCtx.getBean(JdjcService.class);
+			AccessoryService accessoryService = (AccessoryService) appCtx.getBean(AccessoryService.class);
+			JdjcfjService jdjcfjService = (JdjcfjService) appCtx.getBean(JdjcfjService.class);
+			List<JdjcEntity> list = jdjcService.findByFlowflag("1");
+			if (list != null && list.size() > 0) {
+				for (JdjcEntity entity : list) {
+					List<JdjcfjEntity> fjlist = jdjcfjService.findByJdjcid(entity.getId(), "1");// 1为行政人员附件0.为经营人员
+					if (fjlist != null && fjlist.size() > 0) {
+						try {
+							Ftp f = new Ftp();
+							f.setIpAddr("127.0.0.1");
+							f.setPort(21);
+							f.setUserName("test");
+							f.setPwd("test");
+							// f.setPath(GlobalData.FTP_UPLOAD_PATH);
+							for (JdjcfjEntity fjentity : fjlist) {
+								AccessoryEntity acc = accessoryService.findOne(fjentity.getFjid());
+								// 本地目录
+								String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+								// 远程目录
+								String remoteBaseDir = "/jdtx/";
+								boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());// 下载ftp文件测试
+								if (downflag) {
+									entity.setIsflag("1");
+									jdjcService.save(entity);
+									System.out.println("ok");
+								}
+							}
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+					}
+				}
+			}
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+	}
+
+}

gkjsjy/trunk/src/rtx/SetSvrIpPort.java

@@ -0,0 +1,22 @@
+package rtx;  
+public class SetSvrIpPort
+ {
+
+    public static void main(String[] args) {
+
+    	String SvrIP = "192.168.57.37";	//rtx服务器所在ip地址，请修改
+    	int iPort = 6000;	//端口
+    
+    	RTXSvrApi  RtxsvrapiObj = new RTXSvrApi();        		
+    	if( RtxsvrapiObj.Init())
+    	{   
+    		RtxsvrapiObj.setServerIP(SvrIP);
+    		RtxsvrapiObj.setServerPort(iPort);
+    		System.out.println("操作成功"+ "\n"+ "服务器地址:" +SvrIP + "\n" + "服务器端口:"+iPort);
+    		
+		     
+	    }	
+    	RtxsvrapiObj.UnInit();
+    	
+    }
+}

gkjsjy/trunk/src/rtx/javaServlet.java

@@ -0,0 +1,41 @@
+
+package rtx;
+
+import rtx.RTXSvrApi;
+
+/**
+ * Ctrl+F11直接运行
+ * @author luhaiyuan
+ * 2016年3月14日
+ */
+public class javaServlet {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		System.out.println("初始化RTXSvrApi!");
+		// 测试发送消息
+		String receivers = "guanj"; // 接收消息的人员，对应对方的rtx账号
+		String title = "测试"; // 消息的标题
+		String msg = "消息提醒测试,[腾讯|http://www.qq.com]"; // 消息的内容
+		String type = "0"; // 消息的类型
+		String delayTime = "0"; // 消息的延迟发送时间设置
+
+		int iRet = -1;
+		RTXSvrApi RtxsvrapiObj = new RTXSvrApi();
+		if (RtxsvrapiObj.Init()) {
+			iRet = RtxsvrapiObj.sendNotify(receivers, title, msg, type, delayTime);
+			if (iRet == 0) {
+				System.out.println("发送成功");
+
+			} else {
+				System.out.println("发送失败");
+			}
+
+		}
+		RtxsvrapiObj.UnInit();
+
+	}
+
+}