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

gkjsjy/trunk/src/com/cxfws/accessory/service/impl/AccessoryxxService.java

@@ -5,6 +5,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.jws.WebMethod;
 import javax.jws.WebResult;
@@ -63,7 +65,12 @@ public class AccessoryxxService extends BaseWebCtl implements IAccessoryxxServic
 				throw new IOException("读取文件不正确");
 			}
 			bufferedInputStream.close();
-			JSONArray jsons = JSONArray.fromObject(bytes);
+			
+			//新增一个map对象用来保存entity和byte【】的返回值
+			Map map=new HashMap<>();
+			map.put("accessory",accessory );
+			map.put("dataStream ", bytes);
+			JSONArray jsons = JSONArray.fromObject(map);
 			return jsons.toString();
 		}else{
 			return "";

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/IJzxhxhbglService.java

@@ -15,6 +15,6 @@ public interface IJzxhxhbglService {
 	public String findOne(String id);
 	
 	//月份列表
-	public String findHxhbgl(final String ssjyr,final String szdid,final String szgkid,final String szgqid,final String hxlrsjq,final String hxlrsjz);
+	public String findHxhbgl(int pages, int rows,final String ssjyr,final String szdid,final String szgkid,final String szgqid,final String hxlrsjq,final String hxlrsjz);
 	
 }

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/ITzggService.java

@@ -18,5 +18,5 @@ public interface ITzggService {
 	public String findOne(String id);
 	
 	//列表
-	public String findTzgg(String bt);
+	public String findTzgg(int pages,int rows,String bt);
 }

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/impl/JzxhxhbglService.java

@@ -14,6 +14,7 @@ import javax.persistence.criteria.Root;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +25,7 @@ import com.xt.jygl.ggfwxxgl.hxhbgl.service.HxhbglService;
 import com.xt.jygl.ggfwxxgl.hxhbgl.vo.HxhbglVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
 
@@ -55,10 +57,11 @@ public class JzxhxhbglService extends BaseWebCtl implements IJzxhxhbglService {
 	}
 		
 	//月份列表
-	public String findHxhbgl(final String ssjyr,final String szdid,final String szgkid,final String szgqid,final String hxlrsjq,final String hxlrsjz){
+	public String findHxhbgl(int pages, int rows,final String ssjyr,final String szdid,final String szgkid,final String szgqid,final String hxlrsjq,final String hxlrsjz){
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		// 查詢條件
 				Specification<HxhbglEntity> spec = new Specification<HxhbglEntity>() {
 
@@ -109,8 +112,18 @@ public class JzxhxhbglService extends BaseWebCtl implements IJzxhxhbglService {
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				
-				List<HxhbglEntity> list = query.findAll(spec,HxhbglEntity.class);
+				if (page.getPage() < 1) {
+//					Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//					if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//						xmxxpage = "1";
+//					}
+					page.setPage(1);
+				}
+
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<HxhbglEntity> list = query.findAll(spec, toPageRequest(page), HxhbglEntity.class);
+				//List<HxhbglEntity> list = query.findAll(spec,HxhbglEntity.class);
 				List<HxhbglVo> voList = new ArrayList<HxhbglVo>();
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				for (HxhbglEntity entity : list) {

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/impl/TzggService.java

@@ -5,13 +5,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
 import javax.jws.WebService;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +34,6 @@ import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
 
-import cache.CacheSearchCondition;
 import net.sf.json.JSONArray;
 
 @Service("tzggWebService")
@@ -123,10 +120,11 @@ public class TzggService extends BaseWebCtl implements ITzggService  {
 	 * */
 	
 	@Override
-	public String findTzgg(final String bt){
+	public String findTzgg(int pages, int rows,final String bt){
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		List<GgEntity> list=null;
 		Specification<GgxxEntity> spec = new Specification<GgxxEntity>() {
 			// 查询条件
@@ -140,9 +138,19 @@ public class TzggService extends BaseWebCtl implements ITzggService  {
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
 
-		List<GgxxEntity> chenyichao = query.findAll(spec,GgxxEntity.class);
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+
+		Page<GgxxEntity> chenyichao = query.findAll(spec, toPageRequest(page),GgxxEntity.class);
 		List<GgxxVo> voList = new ArrayList<GgxxVo>();
 		UserEntity user = securityMgr.getCurrUser();
 		

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IAxxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IAxxxService {
 	@WebMethod(operationName = "findAx",action="http://service.web.jsjty.com/findAx")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findAx(String szdid,String szgkid,String szgqid,String axmc,String lyztid,String ssjyr);
+	public String findAx(int page,int rows, String szdid,String szgkid,String szgqid,String axmc,String lyztid,String ssjyr);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/ICbxxService.java

@@ -7,6 +7,6 @@ import javax.jws.WebService;
 public interface ICbxxService {
 	@WebMethod(operationName = "findCb",action="http://service.web.jsjty.com/findCb")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findCb(String zwcm,String ywcm,String cbsyr);
+	public String findCb(int page,int rows, String zwcm,String ywcm,String cbsyr);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IFbdxxService.java

@@ -7,6 +7,6 @@ import javax.jws.WebService;
 public interface IFbdxxService {
 	@WebMethod(operationName = "findFbd",action="http://service.web.jsjty.com/findFbd")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findFbd(String szdid,String szgkid,String szgqid,String fbdmc,String fbdlx);
+	public String findFbd(int page,int rows,String szdid,String szgkid,String szgqid,String fbdmc,String fbdlx);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IGkxxService.java

@@ -7,6 +7,6 @@ import javax.jws.WebService;
 public interface IGkxxService {
 	@WebMethod(operationName = "findGk",action="http://service.web.jsjty.com/findGk")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findGk(String szd,String ssgkglbm,String gkmc);
+	public String findGk(int page,int rows,String szd,String ssgkglbm,String gkmc);
 
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IGqxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IGqxxService {
 	@WebMethod(operationName = "findGq",action="http://service.web.jsjty.com/findGq")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findGq(String szd,String ssgkglbm,String szgkid,String gqszsylx,String gqmc);
+	public String findGq(int pages, int rows,String szd,String ssgkglbm,String szgkid,String gqszsylx,String gqmc);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IJghdxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IJghdxxService {
 	@WebMethod(operationName = "findJxhd",action="http://service.web.jsjty.com/findJxhd")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findJxhd(String szdid,String szgkid,String hdmc);
+	public String findJxhd(int pages, int rows,String szdid,String szgkid,String hdmc);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IMdxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IMdxxService {
 	@WebMethod(operationName = "findMd",action="http://service.web.jsjty.com/findMd")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findMd(String szdid,String szgkid,String mdmc,String xzhghid);
+	public String findMd(int pages, int rows,String szdid,String szgkid,String mdmc,String xzhghid);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IXzdwryxxService.java

@@ -8,5 +8,5 @@ import javax.jws.WebService;
 public interface IXzdwryxxService {
 	@WebMethod(operationName = "findXzglry",action="http://service.web.jsjty.com/findXzglry")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findXzglry(/*String id,String szd,*/String ssbm);
+	public String findXzglry(String ssbm);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IZyqxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IZyqxxService {
 	@WebMethod(operationName = "findZyq",action="http://service.web.jsjty.com/findZyq")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findZyq(String zyqmc,String szgkid,String szgqid,String szdid);
+	public String findZyq(int pages,int rows,String zyqmc,String szgkid,String szgqid,String szdid);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/AxxxService.java

@@ -12,8 +12,11 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +24,13 @@ import com.cxfws.gkjcxx.service.IAxxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.ax.dao.AxDao;
 import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
+import com.xt.jygl.gkjcxx.ax.vo.AxVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
 /**
  * 岸线信息查询
  */
@@ -40,10 +47,11 @@ public class AxxxService extends BaseWebCtl  implements IAxxxService{
 	@Override
 	@WebMethod(operationName = "findAx", action = "http://service.web.jsjty.com/findAx")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findAx(final String szdid, final String szgkid, final String szgqid, final String axmc, final String lyztid, final String ssjyr) {
+	public String findAx(int pages,int rows, final String szdid, final String szgkid, final String szgqid, final String axmc, final String lyztid, final String ssjyr) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<AxEntity> spec = new Specification<AxEntity>() {
 			// 查询条件
 			@Override
@@ -73,9 +81,42 @@ public class AxxxService extends BaseWebCtl  implements IAxxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<AxEntity> axlist = query.findAll(spec, AxEntity.class);
-		JSONArray jsons=JSONArray.fromObject(axlist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object axpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "axpage");
+//			if (StringUtils.isEmpty(axpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(axpage))) {
+//				axpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<AxEntity> list = query.findAll(spec, toPageRequest(page), AxEntity.class);
+		//List<AxEntity> axlist = query.findAll(spec, AxEntity.class);
+		List<AxVo> voList = new ArrayList<AxVo>();
+		for (AxEntity entity : list) {
+			AxVo vo = new AxVo();
+			if (null != entity) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setAxlxzw(entity.getAxlx() != null ? entity.getAxlx().getText() : "");
+				vo.setAxgnzw(entity.getAxgn() != null ? entity.getAxgn().getText() : "");
+				vo.setLyztzw(entity.getLyzt() != null ? entity.getLyzt().getText() : "");
+				vo.setNbazw(entity.getNba() != null?entity.getNba().getText() : "");
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				vo.setAxlx(entity.getAxlx() != null ? entity.getAxlx().getId() : "");
+				vo.setAxgn(entity.getAxgn() != null ? entity.getAxgn().getId() : "");
+				vo.setLyzt(entity.getLyzt() != null ? entity.getLyzt().getId() : "");
+				vo.setNba(entity.getNba() != null?entity.getNba().getId() : "");
+				voList.add(vo);
+			}
+		}
+		return JSONArray.fromObject(voList).toString();
 	}
 	/**
 	 * 根据id查询岸线信息

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/CbxxService.java

@@ -14,6 +14,7 @@ import javax.persistence.criteria.Root;
 import net.sf.json.JSONArray;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +23,10 @@ import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.cb.dao.CbDao;
 import com.xt.jygl.gkjcxx.cb.entity.CbEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
 /**
  * 船舶信息查询
  */
@@ -39,12 +43,12 @@ public class CbxxService extends BaseWebCtl  implements ICbxxService{
 	@Override
 	@WebMethod(operationName = "findCb", action = "http://service.web.jsjty.com/findCb")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findCb(final String zwcm, final String ywcm, final String cbsyr) {
+	public String findCb(int pages,int rows, final String zwcm, final String ywcm, final String cbsyr) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<CbEntity> spec = new Specification<CbEntity>() {
-
 			@Override
 			public Predicate toPredicate(Root<CbEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
@@ -60,9 +64,21 @@ public class CbxxService extends BaseWebCtl  implements ICbxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<CbEntity> cblist = query.findAll(spec, CbEntity.class);
-		JSONArray jsons=JSONArray.fromObject(cblist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object cbpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "cbpage");
+//			if (StringUtils.isEmpty(cbpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(cbpage))) {
+//				cbpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<CbEntity> list = query.findAll(spec, toPageRequest(page), CbEntity.class);
+		List<CbEntity> voList = new ArrayList<CbEntity>();
+		for (CbEntity entity : list) {
+			voList.add(entity);
+		}
+		return JSONArray.fromObject(voList).toString();
 	}
 	/**
 	 * 根据id查找船舶信息

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/FbdxxService.java

@@ -13,7 +13,9 @@ import javax.persistence.criteria.Root;
 
 import net.sf.json.JSONArray;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +23,13 @@ import com.cxfws.gkjcxx.service.IFbdxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.fbd.dao.FbdDao;
 import com.xt.jygl.gkjcxx.fbd.entity.FbdEntity;
+import com.xt.jygl.gkjcxx.fbd.vo.FbdVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
 /**
  * 防波堤信息查询
  * 
@@ -41,10 +47,11 @@ public class FbdxxService extends BaseWebCtl  implements IFbdxxService{
 	@Override
 	@WebMethod(operationName = "findFbd", action = "http://service.web.jsjty.com/findFbd")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findFbd(final String szdid,final String szgkid,final String szgqid,final String fbdmc,final String fbdlx) {
+	public String findFbd(int pages,int rows,final String szdid,final String szgkid,final String szgqid,final String fbdmc,final String fbdlx) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<FbdEntity> spec = new Specification<FbdEntity>() {
 			@Override
 			public Predicate toPredicate(Root<FbdEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -68,9 +75,30 @@ public class FbdxxService extends BaseWebCtl  implements IFbdxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<FbdEntity> fbdlist = query.findAll(spec, FbdEntity.class);
-		JSONArray jsons=JSONArray.fromObject(fbdlist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object fbdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fbdpage");
+//			if (StringUtils.isEmpty(fbdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(fbdpage))) {
+//				fbdpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<FbdEntity> list = query.findAll(spec, toPageRequest(page), FbdEntity.class);
+		List<FbdVo> voList = new ArrayList<FbdVo>();
+		for (FbdEntity entity : list) {
+			FbdVo vo = new FbdVo();
+			if (entity != null && entity.getRecordStatus() != 9) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				voList.add(vo);
+			}
+		}
+		return JSONArray.fromObject(voList).toString();
+		 
 	}
 	/**
 	 * 根据id查询防波堤信息

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/GkxxService.java

@@ -13,7 +13,9 @@ import javax.persistence.criteria.Root;
 
 import net.sf.json.JSONArray;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +23,13 @@ import com.cxfws.gkjcxx.service.IGkxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.gk.dao.GkDao;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.vo.GkVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
 /**
  * 根据查询条件所在地，所属部门，港口名称查询
  *
@@ -38,11 +44,12 @@ public class GkxxService  extends BaseWebCtl implements IGkxxService{
 	@Override
 	@WebMethod(operationName = "findGk", action = "http://service.web.jsjty.com/findGk")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findGk(final String szd,final String ssgkglbm,final String gkmc) {
+	public String findGk(int pages,int rows,final String szd,final String ssgkglbm,final String gkmc) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
-				// 查询条件
+		SimplePageRequest page = new SimplePageRequest(pages, rows);	
+		// 查询条件
 				Specification<GkEntity> spec = new Specification<GkEntity>() {
 					@Override
 					public Predicate toPredicate(Root<GkEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -60,9 +67,25 @@ public class GkxxService  extends BaseWebCtl implements IGkxxService{
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				List<GkEntity> listGk = query.findAll(spec, GkEntity.class);
-				JSONArray jsons=JSONArray.fromObject(listGk);
-		return jsons.toString();
+				if (page.getPage() < 1) {
+//					Object gkpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkpage");
+//					if (StringUtils.isEmpty(gkpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(gkpage))) {
+//						gkpage = "1";
+//					}
+					page.setPage(1);
+				}
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<GkEntity> list = query.findAll(spec, toPageRequest(page), GkEntity.class);
+				List<GkVo> voList = new ArrayList<GkVo>();
+				for (GkEntity entity : list) {
+					GkVo vo = new GkVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						voList.add(vo);
+					}
+				}
+				return JSONArray.fromObject(voList).toString();
 	}
 	
 }

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/GqxxService.java

@@ -13,16 +13,21 @@ import javax.persistence.criteria.Root;
 
 import net.sf.json.JSONArray;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import com.cxfws.gkjcxx.service.IGqxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.vo.GgxxVo;
 import com.xt.jygl.gkjcxx.gq.dao.GqDao;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjcxx.gq.vo.GqVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
 /**
  * 港区信息查询
@@ -38,10 +43,11 @@ public class GqxxService extends BaseWebCtl  implements IGqxxService{
 	@Override
 	@WebMethod(operationName = "findGq", action = "http://service.web.jsjty.com/excTable")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findGq(final String szd, final String ssgkglbm, final String szgkid, final String gqszsylx, final String gqmc) {
+	public String findGq(int pages, int rows,final String szd, final String ssgkglbm, final String szgkid, final String gqszsylx, final String gqmc) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		// 查询条件
 				Specification<GqEntity> spec = new Specification<GqEntity>() {
 					@Override
@@ -68,8 +74,28 @@ public class GqxxService extends BaseWebCtl  implements IGqxxService{
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				List<GqEntity> gqlist = query.findAll(spec, GqEntity.class);
-				JSONArray jsons=JSONArray.fromObject(gqlist);
+				if (page.getPage() < 1) {
+//					Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//					if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//						xmxxpage = "1";
+//					}
+					page.setPage(1);
+				}
+
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<GqEntity> gqlist = query.findAll(spec, toPageRequest(page),GqEntity.class);
+				//List<GqEntity> gqlist = query.findAll(spec, GqEntity.class);
+				
+				List<GqVo> voList = new ArrayList<GqVo>();
+				for(GqEntity entity:gqlist){
+					GqVo vo=new GqVo();
+					if(entity!=null){
+						BeanUtils.copyProperties(entity, vo);
+						voList.add(vo);
+					}
+				}
+				JSONArray jsons=JSONArray.fromObject(voList);
 				return jsons.toString();
 	}
 	/***
@@ -78,7 +104,9 @@ public class GqxxService extends BaseWebCtl  implements IGqxxService{
 	@Override
 	public String findOne(String id) {
 		GqEntity gq = dao.findOne(id);
-		JSONArray jsons=JSONArray.fromObject(gq);
+		GqVo vo=new GqVo();
+		BeanUtils.copyProperties(gq, vo);
+		JSONArray jsons=JSONArray.fromObject(vo);
 		return jsons.toString();
 	}
 

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/JghdxxService.java

@@ -11,9 +11,9 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import net.sf.json.JSONArray;
-
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +21,13 @@ import com.cxfws.gkjcxx.service.IJghdxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.jghd.dao.JghdDao;
 import com.xt.jygl.gkjcxx.jghd.entity.JghdEntity;
+import com.xt.jygl.gkjcxx.jghd.vo.JghdVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import net.sf.json.JSONArray;
 /**
  * 进港航道信息查询
  */
@@ -40,12 +44,13 @@ public class JghdxxService extends BaseWebCtl  implements IJghdxxService{
 	@Override
 	@WebMethod(operationName = "findJxhd", action = "http://service.web.jsjty.com/findJxhd")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findJxhd(final String szdid, final String szgkid, final String hdmc) {
+	public String findJxhd(int pages, int rows,final String szdid, final String szgkid, final String hdmc) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<JghdEntity> spec = new Specification<JghdEntity>() {
-
+		
 			// 查询条件
 			@Override
 			public Predicate toPredicate(Root<JghdEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -64,8 +69,27 @@ public class JghdxxService extends BaseWebCtl  implements IJghdxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<JghdEntity> jghdlist = query.findAll(spec, JghdEntity.class);
-		JSONArray jsons=JSONArray.fromObject(jghdlist);
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<JghdEntity> jghdlist = query.findAll(spec,toPageRequest(page), JghdEntity.class);
+		//List<JghdEntity> jghdlist = query.findAll(spec, JghdEntity.class);
+		List<JghdVo> voList = new ArrayList<JghdVo>();
+		for(JghdEntity entity:jghdlist){
+			JghdVo vo=new JghdVo();
+			if(entity!=null){
+				BeanUtils.copyProperties(entity, vo);
+				voList.add(vo);
+			}
+		}
+		JSONArray jsons=JSONArray.fromObject(voList);
 		return jsons.toString();
 	}
 	/**
@@ -74,7 +98,9 @@ public class JghdxxService extends BaseWebCtl  implements IJghdxxService{
 	@Override
 	public String findOne(String id) {
 		JghdEntity jghd = dao.findOne(id);
-		JSONArray jsons=JSONArray.fromObject(jghd);
+		JghdVo vo=new JghdVo();
+		BeanUtils.copyProperties(jghd, vo);
+		JSONArray jsons=JSONArray.fromObject(vo);
 		return jsons.toString();
 	}
 

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/MdxxService.java

@@ -11,9 +11,9 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import net.sf.json.JSONArray;
-
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +21,13 @@ import com.cxfws.gkjcxx.service.IMdxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.md.dao.MdDao;
 import com.xt.jygl.gkjcxx.md.entity.MdEntity;
+import com.xt.jygl.gkjcxx.md.vo.MdVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import net.sf.json.JSONArray;
 /**
  * 锚地信息查询
  */
@@ -40,7 +44,9 @@ public class MdxxService  extends BaseWebCtl implements IMdxxService{
 	@Override
 	public String findOne(String id) {
 		MdEntity md = dao.findOne(id);
-		JSONArray jsons=JSONArray.fromObject(md);
+		MdVo vo=new MdVo();
+		BeanUtils.copyProperties(md, vo);
+		JSONArray jsons=JSONArray.fromObject(vo);
 		return jsons.toString();
 	}
 	/**
@@ -49,12 +55,12 @@ public class MdxxService  extends BaseWebCtl implements IMdxxService{
 	@Override
 	@WebMethod(operationName = "findMd", action = "http://service.web.jsjty.com/findMd")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findMd(final String szdid, final String szgkid, final String mdmc, final String xzhghid) {
+	public String findMd(int pages, int rows,final String szdid, final String szgkid, final String mdmc, final String xzhghid) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<MdEntity> spec = new Specification<MdEntity>() {
-
 			@Override
 			public Predicate toPredicate(Root<MdEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
@@ -74,8 +80,27 @@ public class MdxxService  extends BaseWebCtl implements IMdxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<MdEntity> mdlist = query.findAll(spec, MdEntity.class);
-		JSONArray jsons=JSONArray.fromObject(mdlist);
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<MdEntity> mdlist = query.findAll(spec, toPageRequest(page),MdEntity.class);
+//		List<MdEntity> mdlist = query.findAll(spec, MdEntity.class);
+		List<MdVo> voList = new ArrayList<MdVo>();
+		for(MdEntity entity:mdlist){
+			MdVo vo=new MdVo();
+			if(entity!=null){
+				BeanUtils.copyProperties(entity, vo);
+				voList.add(vo);
+			}
+		}
+		JSONArray jsons=JSONArray.fromObject(voList);
 		return jsons.toString();
 	}
 

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/XzdwryxxService.java

@@ -1,5 +1,6 @@
 package com.cxfws.gkjcxx.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.jws.WebMethod;
@@ -8,13 +9,18 @@ import javax.jws.WebService;
 
 import net.sf.json.JSONArray;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import com.cxfws.gkjcxx.service.IXzdwryxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.dao.XzglryDao;
 import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.entity.XzglryEntity;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.vo.XzglryVo;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
+import com.xtframe.sec.common.SimplePageRequest;
 /***
  * 行政单位人员信息查询
  *
@@ -30,17 +36,32 @@ public class XzdwryxxService extends BaseWebCtl  implements IXzdwryxxService{
 	@Override
 	@WebMethod(operationName = "findXzglry", action = "http://service.web.jsjty.com/findXzglry")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findXzglry(/*String id,String szd,*/String ssbm) {
+	public String findXzglry(String ssbm) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		
 		JSONArray jsons = new JSONArray();
 		/*if((!id.equals("") && szd.equals("")) && ssbm.equals("")){
 		   XzglryEntity xzglry = dao.findOne(id);
 		   jsons=JSONArray.fromObject(xzglry);
 		}else */if(/*(id.equals("") && szd.equals("")) && */!ssbm.equals("")){
-		   List<XzglryEntity> glryList =  dao.queryXzglryByBmid(ssbm);
-		   jsons=JSONArray.fromObject(glryList);
+		   List<XzglryEntity> list =  dao.queryXzglryByBmid(ssbm);
+		   
+		   List<XzglryVo> voList = new ArrayList<XzglryVo>();
+			if (list != null) {
+				for (XzglryEntity xzglryEntity : list) {
+					XzglryVo vo = new XzglryVo();
+					BeanUtils.copyProperties(xzglryEntity, vo);
+					vo.setXb(xzglryEntity.getXb() != null ? xzglryEntity.getXb().getId() : "");
+					vo.setXbzw(xzglryEntity.getXb() != null ? xzglryEntity.getXb().getText() : "");
+					vo.setSsbm(xzglryEntity.getSsbm() != null ? xzglryEntity.getSsbm().getId() : "");
+					vo.setSsbmzw(xzglryEntity.getSsbm() != null ? xzglryEntity.getSsbm().getGkglbmqc() : "");
+					voList.add(vo);
+				}
+			}
+			
+		   jsons=JSONArray.fromObject(voList);
 		}/*else if((!szd.equals("")&&id.equals(""))&&ssbm.equals("")){
 		   List<XzglryEntity> glryListszd = dao.findBySzd(szd);
 		   jsons=JSONArray.fromObject(glryListszd);

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/XzdwxxService.java

@@ -16,6 +16,7 @@ import com.cxfws.gkjcxx.service.IXzdwxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.dao.XzglbmxxDao;
 import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
+import com.xtframe.sec.common.SimplePageRequest;
 /**
  * 行政单位信息查询(根据所在地)
  * @author b_zhaohang
@@ -38,6 +39,7 @@ public class XzdwxxService extends BaseWebCtl  implements IXzdwxxService{
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		
 		List<XzglbmxxEntity> list = dao.queryXzglbm(pid,szd);
 		JSONArray jsons=JSONArray.fromObject(list);
 		return jsons.toString();

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/ZyqxxService.java

@@ -1,6 +1,8 @@
 package com.cxfws.gkjcxx.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.jws.WebMethod;
@@ -13,7 +15,9 @@ import javax.persistence.criteria.Root;
 
 import net.sf.json.JSONArray;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +25,13 @@ import com.cxfws.gkjcxx.service.IZyqxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.gkjcxx.zyq.dao.ZyqDao;
 import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
+import com.xt.jygl.gkjcxx.zyq.vo.ZyqVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
 /**
  *作业区信息查询
  */
@@ -40,10 +48,12 @@ public class ZyqxxService extends BaseWebCtl  implements IZyqxxService{
 	@Override
 	@WebMethod(operationName = "findZyq", action = "http://service.web.jsjty.com/findZyq")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findZyq(final String zyqmc, final String szgkid, final String szgqid, final String szdid) {
+	public String findZyq(int pages,int rows,final String zyqmc, final String szgkid, final String szgqid, final String szdid) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		//封装查询条件
 		Specification<ZyqEntity> spec = new Specification<ZyqEntity>() {
 			@Override
@@ -65,8 +75,31 @@ public class ZyqxxService extends BaseWebCtl  implements IZyqxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
+		
+		if (page.getPage() < 1) {
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<ZyqEntity> list = query.findAll(spec, toPageRequest(page), ZyqEntity.class);
+		
 		List<ZyqEntity> zyqlist = query.findAll(spec, ZyqEntity.class);
-		JSONArray jsons=JSONArray.fromObject(zyqlist);
+		
+		List<ZyqVo> voList = new ArrayList<ZyqVo>();
+		for (ZyqEntity entity : zyqlist) {
+			ZyqVo vo = new ZyqVo();
+			BeanUtils.copyProperties(entity, vo);
+			vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+			vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+			vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+			vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+			vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+			vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+			voList.add(vo);
+		}
+		
+		JSONArray jsons=JSONArray.fromObject(voList);
 		return jsons.toString();
 	}
 	/**
@@ -75,7 +108,19 @@ public class ZyqxxService extends BaseWebCtl  implements IZyqxxService{
 	@Override
 	public String findOne(String id) {
 		ZyqEntity zyq = dao.findOne(id);
-		JSONArray jsons=JSONArray.fromObject(zyq);
+		
+		ZyqVo vo = new ZyqVo();
+		BeanUtils.copyProperties(zyq, vo);
+		vo.setSzd(zyq.getSzd() != null ? zyq.getSzd().getId() : "");
+		vo.setSzgk(zyq.getSzgk() != null ? zyq.getSzgk().getId() : "");
+		vo.setSzgq(zyq.getSzgq() != null ? zyq.getSzgq().getId() : "");
+		if(StringUtils.isEmpty(vo.getZyid())){
+			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+			String zyid = dateTimeFormat.format(new Date());
+			vo.setZyid(zyid);
+		}
+		
+		JSONArray jsons=JSONArray.fromObject(vo);
 		return jsons.toString();
 	}
 	

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzbgWebService.java

@@ -6,7 +6,7 @@ import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
 
 @WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzbgWebServicePort", serviceName = "xkzbgWebService")
 public interface IXkzbgWebService {
-	public String findXkzbg(String lczt,String szdid,String szgkid,String szgqid,String gkjyr,String fddbr,String bgdd);
+	public String findXkzbg(int pages, int rows,String szdid,String szgkid,String szgqid,String gkjyr,String fddbr,String bgdd);
 	public String findOne(String id);
 	public Boolean submit(XkzbgEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
 	public Boolean audit(String shyj, String id, boolean flag);

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzsqWebService.java

@@ -10,7 +10,7 @@ import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
 public interface IXkzsqWebService {
 	@WebMethod(operationName = "findGkjyxksq",action="http://service.web.jsjty.com/findGkjyxksq")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findGkjyxksq(String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
+	public String findGkjyxksq(int pages, int rows,String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
 	public String findOne(String id);
 	public Boolean submit(XkzsqEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
 	public Boolean audit(String shyj, String id, boolean flag);

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzyxWebService.java

@@ -5,7 +5,7 @@ import javax.jws.WebService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxEntity;
 @WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzyxWebServicePort", serviceName = "xkzyxWebService")
 public interface IXkzyxWebService {
-	public String findXkzyx(String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
+	public String findXkzyx(int pages, int rows,String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
 	public String findOne(String id);
 	public Boolean submit(XkzyxEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
 	public Boolean audit(String shyj, String id, boolean flag);

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzzxWebService.java

@@ -6,7 +6,7 @@ import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
 
 @WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzzxWebServicePort", serviceName = "xkzzxWebService")
 public interface IXkzzxWebService {
-	public String findXkzzx(String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
+	public String findXkzzx(int pages, int rows,String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
 	public String findOne(String id);
 	public Boolean submit(XkzzxEntity  code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
 	public Boolean audit(String shyj, String id, boolean flag);

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzbgWebService.java

@@ -18,13 +18,13 @@ import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.gkjyxkgl.service.IXkzbgWebService;
 import com.cxfws.gkjyxkgl.service.vo.XkzbgfVo;
-import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
@@ -33,7 +33,6 @@ import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
 import com.xt.jygl.gkjcxx.mt.service.MtService;
-import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
 import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
 import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
@@ -50,10 +49,8 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
 import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
 import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
-import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
 import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
 import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
-import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
@@ -64,25 +61,21 @@ import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgfjEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgfjService;
-import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgjdsService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.vo.XkzbgVo;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqglbEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqzscsEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XzjydyEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
-import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
-import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqfjService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqglbService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqzscsService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XzjydyService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
-import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxService;
-import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxfjService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -128,40 +121,23 @@ public class XkzbgWebService extends BaseWebCtl implements IXkzbgWebService{
 	@Autowired
 	private XkzbgfjService xkzbgfjService;
 	@Autowired
-	private AccessoryService accessoryService;
-	@Autowired
 	private XkzjyfwService xkzjyfwService;
 	@Autowired
-	private XkzbgjdsService xkzbgjdsService;
-	@Autowired
 	private XkzxxService xkzxxService;
 	@Autowired
 	private XkzglbService xkzglbService;
 	@Autowired
-	private RyzsService ryzsService;
-	@Autowired
 	private ZxjxService zxjxService;
-	@Autowired
-	private XkzfzService xkzfzService;
-	@Autowired
-	private XkzsqService xkzsqService;
-	@Autowired
-	private XkzyxService xkzyxService;
-	@Autowired
-	private XkzyxfjService xkzyxfjService;
-	@Autowired
-	private XkzsqfjService xkzsqfjService;
-	@Autowired
-	private XzglbmxxService xzglbmxxService;
 	@Resource
 	private WebServiceContext wscontext;
 	@Autowired
 	private UserDao userdao;
 	@Override
-	public String findXkzbg(final String lczt,final String szdid, final String szgkid,final  String szgqid,final  String gkjyr, final String fddbr, final String bgdd) {
+	public String findXkzbg(int pages, int rows,final String szdid, final String szgkid,final  String szgqid,final  String gkjyr, final String fddbr, final String bgdd) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		// 查询条件
 				Specification<XkzbgEntity> spec = new Specification<XkzbgEntity>() {
 					@Override
@@ -215,7 +191,17 @@ public class XkzbgWebService extends BaseWebCtl implements IXkzbgWebService{
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				List<XkzbgEntity> list = query.findAll(spec, XkzbgEntity.class);
+				if (page.getPage() < 1) {
+//					Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//					if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//						xmxxpage = "1";
+//					}
+					page.setPage(1);
+				}
+
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<XkzbgEntity> list = query.findAll(spec,toPageRequest(page), XkzbgEntity.class);
 				List<XkzbgVo> voList = new ArrayList<XkzbgVo>();
 				for (XkzbgEntity entity : list) {
 					XkzbgVo vo = new XkzbgVo();

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzsqWebService.java

@@ -19,6 +19,7 @@ import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -75,6 +76,7 @@ import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -135,10 +137,11 @@ public class XkzsqWebService extends BaseWebCtl implements IXkzsqWebService{
 	@Override
 	@WebMethod(operationName = "findGkjyxksq", action = "http://service.web.jsjty.com/findGkjyxksq")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findGkjyxksq(final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd) {
+	public String findGkjyxksq(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<XkzsqEntity> spec = new Specification<XkzsqEntity>() {
 			@Override
 			public Predicate toPredicate(Root<XkzsqEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -178,7 +181,16 @@ public class XkzsqWebService extends BaseWebCtl implements IXkzsqWebService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<XkzsqEntity> XkzsqEntityList = query.findAll(spec, XkzsqEntity.class);
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<XkzsqEntity> XkzsqEntityList = query.findAll(spec,toPageRequest(page), XkzsqEntity.class);
 		List<XkzsqVo> voList = new ArrayList<XkzsqVo>();
 		for (XkzsqEntity entity : XkzsqEntityList) {
 			XkzsqVo vo1 = new XkzsqVo();

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzyxWebService.java

@@ -18,6 +18,7 @@ import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -66,6 +67,7 @@ import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.service.WorkflowMangerService;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -121,10 +123,11 @@ public class XkzyxWebService extends BaseWebCtl implements IXkzyxWebService {
 	@Autowired
 	private UserDao userdao;
 	@Override
-	public String findXkzyx(final String szdid,final String szgkid,final String szgqid,final String gkjyr,final String fddbr,final String bgdd) {
+	public String findXkzyx(int pages, int rows,final String szdid,final String szgkid,final String szgqid,final String gkjyr,final String fddbr,final String bgdd) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		// 查询条件
 				Specification<XkzyxEntity> spec = new Specification<XkzyxEntity>() {
 					@Override
@@ -167,7 +170,16 @@ public class XkzyxWebService extends BaseWebCtl implements IXkzyxWebService {
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				List<XkzyxEntity> list = query.findAll(spec,XkzyxEntity.class);
+				if (page.getPage() < 1) {
+//					Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//					if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//						xmxxpage = "1";
+//					}
+					page.setPage(1);
+				}
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<XkzyxEntity> list = query.findAll(spec,toPageRequest(page),XkzyxEntity.class);
 				List<XkzyxVo> voList = new ArrayList<XkzyxVo>();
 
 				for (XkzyxEntity entity : list) {

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzzxWebService.java

@@ -17,6 +17,7 @@ import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -79,6 +80,7 @@ import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.service.WorkflowMangerService;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -154,10 +156,11 @@ public class XkzzxWebService extends BaseWebCtl implements IXkzzxWebService {
 	@Autowired
 	private UserDao userdao;
 	@Override
-	public String findXkzzx(final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd) {
+	public String findXkzzx(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		// 查询条件
 				Specification<XkzzxEntity> spec = new Specification<XkzzxEntity>() {
 					@Override
@@ -207,7 +210,16 @@ public class XkzzxWebService extends BaseWebCtl implements IXkzzxWebService {
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				List<XkzzxEntity> list = query.findAll(spec,XkzzxEntity.class);
+				if (page.getPage() < 1) {
+//					Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//					if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//						xmxxpage = "1";
+//					}
+					page.setPage(1);
+				}
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<XkzzxEntity> list = query.findAll(spec,toPageRequest(page),XkzzxEntity.class);
 				List<XkzzxVo> voList = new ArrayList<XkzzxVo>();
 
 				for (XkzzxEntity entity : list) {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IBwxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IBwxxService {
 	@WebMethod(operationName = "findBw",action="http://service.web.jsjty.com/findBw")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findBw(String szdid,String szgkid,String szgqid,String ssjyr,String bwmc,String wxpbwid,String sfdwkfid,String fwlxid,String bwbwyt);
+	public String findBw(int pages, int rows,String szdid,String szgkid,String szgqid,String ssjyr,String bwmc,String wxpbwid,String sfdwkfid,String fwlxid,String bwbwyt);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/ICgxxService.java

@@ -7,6 +7,6 @@ import javax.jws.WebService;
 public interface ICgxxService {
 	@WebMethod(operationName = "findCg",action="http://service.web.jsjty.com/findCg")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findCg(String szdid,String szgkid,String szgqid,String cgmc,String ssjyr);
+	public String findCg(int pages, int rows,String szdid,String szgkid,String szgqid,String cgmc,String ssjyr);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/ICkxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface ICkxxService {
 	@WebMethod(operationName = "findCk",action="http://service.web.jsjty.com/findCk")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findCk(String szdid,String szgkid,String szgqid,String ssmt,String ckmc,String ssjyr,String wxpckid);
+	public String findCk(int pages, int rows,String szdid,String szgkid,String szgqid,String ssmt,String ckmc,String ssjyr,String wxpckid);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IDcxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IDcxxService {
 	@WebMethod(operationName = "findDc",action="http://service.web.jsjty.com/findDc")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findDc(String szdid,String szgkid,String szgqid,String ssjyr,String dcmc,String wxpdcid);
+	public String findDc(int pages, int rows,String szdid,String szgkid,String szgqid,String ssjyr,String dcmc,String wxpdcid);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IJyrjbxxService.java

@@ -1,7 +1,5 @@
 package com.cxfws.jyrxxgl.service;
 
-import java.util.Date;
-
 import javax.jws.WebMethod;
 import javax.jws.WebResult;
 import javax.jws.WebService;
@@ -10,6 +8,6 @@ import javax.jws.WebService;
 public interface IJyrjbxxService {
 	@WebMethod(operationName = "findJyr",action="http://service.web.jsjty.com/findJyr")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findJyr(String szdid,String szgkid,String szgqid,String bwyt,String whfzbh,String qyxz,String sfcswhzy,String sfcyxkz, String gkjyr,String gkjyxkzh,String fddbr,Date xkzstartDate,Date xkzendDate,Date fzstartDate,Date fzendDate,String jyrxkzsfdq);
+	public String findJyr(int pages, int rows,String szdid,String szgkid,String szgqid,String bwyt,String whfzbh,String qyxz,String sfcswhzy,String sfcyxkz, String gkjyr,String gkjyxkzh,String fddbr,String xkzstartDate,String xkzendDate,String fzstartDate,String fzendDate,String jyrxkzsfdq);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IMtxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IMtxxService {
 	@WebMethod(operationName = "findMt",action="http://service.web.jsjty.com/findMt")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findMt(String szdid,String szgkid,String szgqid,String mtmc,String jyr,String sfdwkfid,String sfwhpid,String fwlxid,String mtyt);
+	public String findMt(int pages, int rows,String szdid,String szgkid,String szgqid,String mtmc,String jyr,String sfdwkfid,String sfwhpid,String fwlxid,String mtyt);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IQytzxxService.java

@@ -7,6 +7,6 @@ import javax.jws.WebService;
 public interface IQytzxxService {
 	@WebMethod(operationName = "findQytz",action="http://service.web.jsjty.com/findQytz")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findQytz(String szdid,String szgkid,String szgqid,String jyr,String tzrmc);
+	public String findQytz(int pages, int rows,String szdid,String szgkid,String szgqid,String jyr,String tzrmc);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IRyService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "ryWebServicePort", serviceName = "ryWebService")
+public interface IRyService {
+	@WebMethod(operationName = "findRy",action="http://service.web.jsjty.com/findRy")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findRy(int pages, int rows, String xm,  String szgkid,  String szgqid,  String jyr,  String szdid,  String rylxid);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IRyzsService.java

@@ -0,0 +1,12 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "ryzsWebServicePort", serviceName = "ryzsWebService")
+public interface IRyzsService {
+	@WebMethod(operationName = "findRyzs",action="http://service.web.jsjty.com/findRyzs")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findRyzs(String ryid);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/ISssbxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface ISssbxxService {
 	@WebMethod(operationName = "findSssb",action="http://service.web.jsjty.com/findSssb")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findSssb(String szdid,String szgkid,String szgqid,String jyr,String ssmc);
+	public String findSssb(int pages, int rows,String szdid,String szgkid,String szgqid,String jyr,String ssmc);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IXkzfzWebService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzfzWebServicePort", serviceName = "xkzfzWebService")
+public interface IXkzfzWebService {
+	
+	//许可证附证列表
+	public String findXkzfz(int pages, int rows,final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String fzsqh, final String fzsfyx, final String wxhwpm, final String fzsfdq);
+	
+	//许可证详情
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IXkzxxWebService.java

@@ -0,0 +1,19 @@
+package com.cxfws.jyrxxgl.service;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.jws.WebService;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.vo.XkzxxVo;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzxxWebServicePort", serviceName = "xkzxxWebService")
+public interface IXkzxxWebService {
+	
+	//许可证列表
+	public String findXkzxx(int pages, int rows,final String gkjyr, final String szgqid, final String gkjyxkzh, final String szdid, final String yxqz, final String szgkid, final String yxq1, final String yxq2, final String sfyx, final String xkzsfdq);
+	
+	//许可证详情
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IZxjxxxService.java

@@ -8,6 +8,6 @@ import javax.jws.WebService;
 public interface IZxjxxxService {
 	@WebMethod(operationName = "findZxjx",action="http://service.web.jsjty.com/findZxjx")
 	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
-	public String findZxjx(String szdid,String szgkid,String szgqid,String jyr,String jxlbmcid);
+	public String findZxjx(int pages, int rows,String szdid,String szgkid,String szgqid,String jyr,String jxlbmcid);
 	public String findOne(String id);
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/BwxxService.java

@@ -18,6 +18,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,7 @@ import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
 import com.xtframe.sec.code.entity.CodeEntity;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -63,10 +65,11 @@ public class BwxxService extends BaseWebCtl implements IBwxxService{
 	@Override
 	@WebMethod(operationName = "findBw", action = "http://service.web.jsjty.com/findBw")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findBw(final String szdid,final  String szgkid,final  String szgqid, final String ssjyr, final String bwmc,final  String wxpbwid,final  String sfdwkfid, final String fwlxid, final String bwbwyt) {
+	public String findBw(int pages, int rows,final String szdid,final  String szgkid,final  String szgqid, final String ssjyr, final String bwmc,final  String wxpbwid,final  String sfdwkfid, final String fwlxid, final String bwbwyt) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		// 查詢條件
 				Specification<BwEntity> spec = new Specification<BwEntity>() {
 
@@ -129,8 +132,81 @@ public class BwxxService extends BaseWebCtl implements IBwxxService{
 						return cb.and(list.toArray(new Predicate[] {}));
 					}
 				};
-				List<BwEntity> bwlist = query.findAll(spec, BwEntity.class);
-				return Object2JsonStr(bwlist);
+				if (page.getPage() < 1) {
+//					Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//					if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//						xmxxpage = "1";
+//					}
+					page.setPage(1);
+				}
+				page.setSort("id");
+				page.setOrder("desc");
+				Page<BwEntity> bwlist = query.findAll(spec,  toPageRequest(page),BwEntity.class);
+				List<BwVo> voList = new ArrayList<BwVo>();
+				for (BwEntity entity : bwlist) {
+					BwVo vo = new BwVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+						vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+						vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+						vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+						vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
+						vo.setBwsxzw(entity.getBwsx() != null ? entity.getBwsx().getText() : "");
+						vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
+						vo.setWxpbwzw(entity.getWxpbw() != null ? entity.getWxpbw().getText() : "");
+						vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+						vo.setSffzzw(entity.getSffz() != null ? entity.getSffz().getText() : "");
+						vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
+						vo.setBwszsxzw(entity.getBwszsx() != null ? entity.getBwszsx().getText() : "");
+						vo.setSclxzw(entity.getSclx() != null ? entity.getSclx().getText() : "");
+						vo.setJgxszw(entity.getJgxs() != null ? entity.getJgxs().getText() : "");
+						if (entity.getBwyt() != null) {
+							String bwytzw = "";
+							String[] s = entity.getBwyt().split(",");
+							/*
+							 * for (String string : s) { bwytzw +=
+							 * securityMgr.codeService().findOne(string).getText(); }
+							 */
+							for (int i = 0; i < s.length; i++) {
+								CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+								if (ce != null) {
+									bwytzw += ce.getText();
+									if (i != s.length - 1) {
+										bwytzw += ",";
+									}
+								}
+							}
+							vo.setBwytzw(bwytzw);
+						}
+
+						vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+						vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+						vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+						vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+						vo.setSsmt(entity.getSsmt() != null ? entity.getSsmt().getId() : "");
+						vo.setBwsx(entity.getBwsx() != null ? entity.getBwsx().getId() : "");
+						vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
+						vo.setWxpbw(entity.getWxpbw() != null ? entity.getWxpbw().getId() : "");
+						vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
+						vo.setSffz(entity.getSffz() != null ? entity.getSffz().getId() : "");
+						vo.setSfdwkf(entity.getSfdwkf() != null ? entity.getSfdwkf().getId() : "");
+						vo.setBwszsx(entity.getBwszsx() != null ? entity.getBwszsx().getId() : "");
+						vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
+						vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
+						vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+
+						vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
+						vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
+						vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
+						vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
+						vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
+						vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
+
+						voList.add(vo);
+
+					}}
+				return Object2JsonStr(voList);
 	}
 
 	@Override

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/CgxxService.java

@@ -20,6 +20,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +33,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.vo.CgVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -57,10 +59,11 @@ public class CgxxService extends BaseWebCtl implements ICgxxService{
 	@Override
 	@WebMethod(operationName = "findCg", action = "http://service.web.jsjty.com/findCg")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findCg(final String szdid,final String szgkid,final String szgqid,final String cgmc,final String ssjyr) {
+	public String findCg(int pages, int rows,final String szdid,final String szgkid,final String szgqid,final String cgmc,final String ssjyr) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<CgEntity> spec = new Specification<CgEntity>() {
 			@Override
 			public Predicate toPredicate(Root<CgEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -103,9 +106,40 @@ public class CgxxService extends BaseWebCtl implements ICgxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<CgEntity> cglist = query.findAll(spec, CgEntity.class);
-		JSONArray jsons=JSONArray.fromObject(cglist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<CgEntity> cglist = query.findAll(spec, toPageRequest(page), CgEntity.class);
+		List<CgVo> voList = new ArrayList<CgVo>();
+		for (CgEntity entity : cglist) {
+			CgVo vo = new CgVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setCgxszw(entity.getCgxs() != null ? entity.getCgxs().getText() : "");
+				vo.setCgwxzw(entity.getCgwx() != null ? entity.getCgwx().getText() : "");
+				vo.setCgczzw(entity.getCgcz() != null ? entity.getCgcz().getText() : "");
+				vo.setWxydjzw(entity.getWxydj() != null ? entity.getWxydj().getText() : "");
+				vo.setYwfhdzw(entity.getYwfhd() != null ? entity.getYwfhd().getText() : "");
+				vo.setCgazxszw(entity.getCgazxs() != null ? entity.getCgazxs().getText() : "");
+				vo.setWzztzw(entity.getWzzt() != null ? entity.getWzzt().getText() : "");
+				vo.setJlfszw(entity.getJlfs() != null ? entity.getJlfs().getText() : "");
+				vo.setClfszw(entity.getClfs() != null ? entity.getClfs().getText() : "");
+				vo.setSfwxpcgzw(entity.getSfwxpcg() != null ? entity.getSfwxpcg().getText() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
 		}
 	/**
 	 * 储罐信息详情

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/CkxxService.java

@@ -18,6 +18,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +31,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
 import com.xt.jygl.gkjygl.gkjyr.jyrck.vo.CkVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -55,10 +57,11 @@ public class CkxxService extends BaseWebCtl implements ICkxxService{
 	@Override
 	@WebMethod(operationName = "findCk", action = "http://service.web.jsjty.com/findCk")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findCk(final String szdid,final String szgkid,final String szgqid,final String ssmt,final String ckmc,final String ssjyr,final String wxpckid) {
+	public String findCk(int pages, int rows,final String szdid,final String szgkid,final String szgqid,final String ssmt,final String ckmc,final String ssjyr,final String wxpckid) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<CkEntity> spec = new Specification<CkEntity>() {
 			@Override
 			public Predicate toPredicate(Root<CkEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -107,9 +110,41 @@ public class CkxxService extends BaseWebCtl implements ICkxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<CkEntity> cklist = query.findAll(spec, CkEntity.class);
-		JSONArray jsons=JSONArray.fromObject(cklist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<CkEntity> cklist = query.findAll(spec, toPageRequest(page),CkEntity.class);
+		List<CkVo> voList = new ArrayList<CkVo>();
+		for (CkEntity entity : cklist) {
+			CkVo vo = new CkVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setWxpckzw(entity.getWxpck() != null ? entity.getWxpck().getText() : "");
+				vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+				
+				vo.setSzzyq(entity.getSzzyq() != null ?entity.getSzzyq().getId():"");
+				vo.setSzzyqzw(entity.getSzzyq() != null ?entity.getSzzyq().getZyqmc():"");
+				vo.setSsbw(entity.getSsbw() != null ? entity.getSsbw().getId():"");
+				vo.setSsbwzw(entity.getSsbw() != null ? entity.getSsbw().getBwmc():"");
+				vo.setCklx(entity.getCklx() != null ? entity.getCklx().getId() :"");
+				vo.setCklxzw(entity.getCklx() != null ? entity.getCklx().getText() : "");
+				vo.setKcsclx(entity.getKcsclx() != null ? entity.getKcsclx().getId() : "");
+				vo.setKcsclxzw(entity.getKcsclx() != null ? entity.getKcsclx().getText() : "");
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
 	}
 	/**
 	 * 根据id查询仓库信息

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/DcxxService.java

@@ -18,6 +18,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +31,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
 import com.xt.jygl.gkjygl.gkjyr.jyrdc.vo.DcVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -57,10 +59,11 @@ public class DcxxService extends BaseWebCtl implements IDcxxService{
 	@Override
 	@WebMethod(operationName = "findDc", action = "http://service.web.jsjty.com/findDc")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findDc(final String szdid, final String szgkid, final String szgqid, final String ssjyr, final String dcmc, final String wxpdcid) {
+	public String findDc(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String ssjyr, final String dcmc, final String wxpdcid) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<DcEntity> spec = new Specification<DcEntity>() {
 
 			@Override
@@ -107,9 +110,34 @@ public class DcxxService extends BaseWebCtl implements IDcxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}//
 		};
-		List<DcEntity> dclist = query.findAll(spec, DcEntity.class);
-		JSONArray jsons=JSONArray.fromObject(dclist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<DcEntity> dclist = query.findAll(spec,toPageRequest(page),DcEntity.class);
+		List<DcVo> voList = new ArrayList<DcVo>();
+		for (DcEntity entity : dclist) {
+			DcVo vo = new DcVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setWxpdczw(entity.getWxpdc() != null ? entity.getWxpdc().getText() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+				if(!StringUtils.isEmpty(vo.getZwdcyt())){
+					vo.setZwdcyt(vo.getZwdcyt().substring(0,vo.getZwdcyt().length()-1));
+				}
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
 	}
 	/**
 	 * 根据id查询堆场详情

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/JyrjbxxService.java

@@ -1,5 +1,6 @@
 package com.cxfws.jyrxxgl.service.impl;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -21,6 +22,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -56,6 +58,7 @@ import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
 import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.DateTime;
@@ -260,10 +263,13 @@ public class JyrjbxxService extends BaseWebCtl implements IJyrjbxxService {
 		@Override
 		@WebMethod(operationName = "findJyr", action = "http://service.web.jsjty.com/findJyr")
 		@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-		public String findJyr(final String szdid, final String szgkid, final String szgqid,final String bwyt, final String whfzbh, final String qyxz, final String sfcswhzy, final String sfcyxkz, final String gkjyr,  final String gkjyxkzh, final String fddbr, final Date xkzstartDate, final Date xkzendDate, final Date fzstartDate, final Date fzendDate, final String jyrxkzsfdq) {
+
+		public String findJyr(int pages, int rows,final String szdid, final String szgkid, final String szgqid,final String bwyt, final String whfzbh, final String qyxz, final String sfcswhzy, final String sfcyxkz, final String gkjyr,  final String gkjyxkzh, final String fddbr, final String xkzstartDate, final String xkzendDate, final String fzstartDate, final String fzendDate, final String jyrxkzsfdq) {
 			if (!this.checkUser()){
 				return BaseWebCtl.NOLOGIN;
 			}
+			final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimplePageRequest page = new SimplePageRequest(pages, rows);
 			// 查询条件
 			Specification<GkjyrEntity> spec = new Specification<GkjyrEntity>() {
 
@@ -337,10 +343,20 @@ public class JyrjbxxService extends BaseWebCtl implements IJyrjbxxService {
 
 					// 危货附证有效期
 					if (fzstartDate != null) {
-						list.add(cb.greaterThanOrEqualTo(root.get("fzyxq").as(Date.class), fzstartDate));
+						try {
+							list.add(cb.greaterThanOrEqualTo(root.get("fzyxq").as(Date.class), sdf.parse(fzstartDate)));
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 					} 
 					if (fzendDate != null) {
-						list.add(cb.lessThanOrEqualTo(root.get("fzyxq").as(Date.class), fzendDate));
+						try {
+							list.add(cb.lessThanOrEqualTo(root.get("fzyxq").as(Date.class), sdf.parse(fzendDate)));
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 					} 
 					// 子查询
 					Subquery<XkzxxEntity> subquery = query.subquery(XkzxxEntity.class);
@@ -352,11 +368,21 @@ public class JyrjbxxService extends BaseWebCtl implements IJyrjbxxService {
 					subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 					// 许可证有效期
 					if (xkzstartDate != null) {
-						subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzstartDate));
+						try {
+							subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), sdf.parse(xkzstartDate)));
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 						xkzflag = true;
 					} 
 					if (xkzendDate != null) {
-						subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzendDate));
+						try {
+							subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), sdf.parse(xkzendDate)));
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 						xkzflag = true;
 					} 
 					// 许可证是否将到期
@@ -401,8 +427,45 @@ public class JyrjbxxService extends BaseWebCtl implements IJyrjbxxService {
 				}
 				
 			};
-			List<GkjyrEntity> gkjyrlist = query.findAll(spec, GkjyrEntity.class);
-			JSONArray jsons=JSONArray.fromObject(gkjyrlist);
-			return jsons.toString();
+			if (page.getPage() < 1) {
+//				Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//				if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//					xmxxpage = "1";
+//				}
+				page.setPage(1);
+			}
+			page.setSort("id");
+			page.setOrder("desc");
+			Page<GkjyrEntity> gkjyrlist = query.findAll(spec,toPageRequest(page),GkjyrEntity.class);
+			List<GkjyrVo> voList = new ArrayList<GkjyrVo>();
+			for (GkjyrEntity entity : gkjyrlist) {
+				GkjyrVo vo = new GkjyrVo();
+				if (entity != null) {
+					BeanUtils.copyProperties(entity, vo);
+					vo.setSzdzw(null != entity.getSzd() ? entity.getSzd().getText() : "");
+					vo.setSzgkzw(null != entity.getSzgk() ? entity.getSzgk().getGkmc() : "");
+					vo.setSzgqzw(null != entity.getSzgq() ? entity.getSzgq().getGqmc() : "");
+					vo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");
+					vo.setSfwhqy(null != entity.getSfwhqy() ? entity.getSfwhqy().getText() : "");
+					List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());
+					for (XkzxxEntity xkz : xkzs) {
+						if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+							vo.setXkzyxq(xkz.getYxqz());
+							vo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
+							vo.setGkjyxkzh(xkz.getGkjyxkzh());
+							Date date = new Date();
+							long day = (xkz.getYxqz().getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
+							if (day <= 30) {
+								vo.setSfred("1");
+							} else {
+								vo.setSfred("2");
+							}
+						}
+					}
+
+					voList.add(vo);
+				}
+			}
+			return Object2JsonStr(voList);
 		}
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/MtxxService.java

@@ -19,6 +19,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,7 @@ import com.xt.jygl.gkjcxx.mt.service.MtService;
 import com.xt.jygl.gkjcxx.mt.vo.MtVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -56,10 +58,11 @@ public class MtxxService extends BaseWebCtl implements IMtxxService{
 	@Override
 	@WebMethod(operationName = "findMt", action = "http://service.web.jsjty.com/findMt")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findMt(final String szdid, final String szgkid, final String szgqid, final String mtmc, final String jyr, final String sfdwkfid, final String sfwhpid, final String fwlxid, final String mtyt) {
+	public String findMt(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String mtmc, final String jyr, final String sfdwkfid, final String sfwhpid, final String fwlxid, final String mtyt) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<MtEntity> spec = new Specification<MtEntity>() {
 
 			@Override
@@ -122,9 +125,67 @@ public class MtxxService extends BaseWebCtl implements IMtxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<MtEntity> mtlist = query.findAll(spec, MtEntity.class);
-		JSONArray jsons=JSONArray.fromObject(mtlist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<MtEntity> mtlist = query.findAll(spec,toPageRequest(page),MtEntity.class);
+		List<MtVo> voList = new ArrayList<MtVo>();
+		for (MtEntity entity : mtlist) {
+			MtVo vo = new MtVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
+				vo.setSfwhpzw(entity.getSfwhp() != null ? entity.getSfwhp().getText() : "");
+				vo.setSfwhpzw(entity.getSfwhp() != null ? entity.getSfwhp().getText() : "");
+				vo.setMtsfwarszw(entity.getMtsfwars() != null ? entity.getMtsfwars().getText() : "");
+				vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
+				vo.setMtxsdmzw(entity.getMtxsdm() != null ? entity.getMtxsdm().getText() : "");
+
+				String mtytName = "";
+				if (entity.getMtyt() != null) {
+					String[] mtytNameArray = entity.getMtyt().split(",");
+					/*
+					 * for (String m : mtytNameArray) { mtytName +=
+					 * codeService.findOne(m).getText() + " "; mtytName +=
+					 * securityMgr.codeService().findOne(m).getText() + " "; }
+					 */
+					for (int i = 0; i < mtytNameArray.length; i++) {
+						if (i != mtytNameArray.length - 1) {
+							mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText() + ",";
+						} else {
+							mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText();
+						}
+
+					}
+				}
+				vo.setMtytzw(mtytName);
+
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				vo.setSfdwkf(entity.getSfdwkf() != null ? entity.getSfdwkf().getId() : "");
+				vo.setSfwhp(entity.getSfwhp() != null ? entity.getSfwhp().getId() : "");
+				vo.setMtsfwars(entity.getMtsfwars() != null ? entity.getMtsfwars().getId() : "");
+				vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
+				// vo.setMtyt(entity.getMtyt()!=null?entity.getMtyt().getId():"");
+				vo.setMtxsdm(entity.getMtxsdm() != null ? entity.getMtxsdm().getId() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
 	}
 	/**
 	 * 根据id查详细

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/QytzxxService.java

@@ -18,6 +18,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +31,7 @@ import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
 import com.xt.jygl.gkjygl.gkjyr.qytz.vo.QytzVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -55,12 +57,12 @@ public class QytzxxService extends BaseWebCtl implements IQytzxxService{
 	@Override
 	@WebMethod(operationName = "findQytz", action = "http://service.web.jsjty.com/findQytz")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findQytz(final String szdid, final String szgkid, final String szgqid, final String jyr, final String tzrmc) {
+	public String findQytz(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String jyr, final String tzrmc) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<QytzEntity> spec = new Specification<QytzEntity>() {
-
 			@Override
 			public Predicate toPredicate(Root<QytzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
@@ -102,9 +104,40 @@ public class QytzxxService extends BaseWebCtl implements IQytzxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<QytzEntity> qytzlist = query.findAll(spec, QytzEntity.class);
-		JSONArray jsons=JSONArray.fromObject(qytzlist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<QytzEntity> qytzlist = query.findAll(spec, toPageRequest(page),QytzEntity.class);
+		List<QytzVo> voList = new ArrayList<QytzVo>();
+		for (QytzEntity entity : qytzlist) {
+			if (entity != null) {
+				QytzVo vo = new QytzVo();
+				BeanUtils.copyProperties(entity, vo);
+
+				vo.setSfws(entity.getSfws() != null ? entity.getSfws().getId() : "");
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				vo.setJjlx(entity.getJjlx() != null ? entity.getJjlx().getId() : "");
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSfwszw(entity.getSfws() != null ? entity.getSfws().getText() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setJjlxzw(entity.getJjlx() != null ? entity.getJjlx().getText() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
 	}
 	/**
 	 * 企业投资详情

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/RyWService.java

@@ -0,0 +1,165 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.jyrxxgl.service.IRyService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.RyVo;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.StringUtils;
+@Service("ryWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "ryWebServicePort", serviceName = "ryWebService")
+public class RyWService extends BaseWebCtl implements IRyService{
+	@Autowired
+	private SecurityMgr securityMgr;
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private RyzsService ryzsService;
+	@Autowired
+	private XkzglbService xkzglbService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Override
+	@WebMethod(operationName = "findRy", action = "http://service.web.jsjty.com/findRy")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findRy(int pages, int rows, final String xm,final String szgkid,
+			final String szgqid,final String jyr,final String szdid,final String rylxid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
+		// 查詢條件
+				Specification<RyEntity> spec = new Specification<RyEntity>() {
+
+					@Override
+					public Predicate toPredicate(Root<RyEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(xm)) {
+							list.add(cb.like(root.get("xm").as(String.class), "%" + xm + "%"));
+						} 
+						if (StringUtils.isNotEmpty(szdid)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+						} 
+						if (StringUtils.isNotEmpty(szgkid)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+						} 
+						if (StringUtils.isNotEmpty(szgqid)) {
+							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+						} 
+						if (StringUtils.isNotEmpty(jyr)) {
+							list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
+						} 
+						if (StringUtils.isNotEmpty(rylxid)) {
+							list.add(cb.like(root.get("rylx").get("id").as(String.class), "%" + rylxid + "%"));
+						} 
+						if (isJyr()) {
+							list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+						} else {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+						}
+						//状态为0,9,10,11不显示
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+
+				if (page.getPage() < 1) {
+					page.setPage(1);
+				}
+
+				Page<RyEntity> list = query.findAll(spec, toPageRequest(page), RyEntity.class);
+				List<RyVo> voList = new ArrayList<RyVo>();
+				for (RyEntity entity : list) {
+					RyVo vo = new RyVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+						vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+						vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+						vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+						vo.setXbzw(entity.getXb() != null ? entity.getXb().getText() : "");
+						vo.setRylxzw(entity.getRylx() != null ? entity.getRylx().getText() : "");
+						vo.setZjlxzw(entity.getZjlx() != null ? entity.getZjlx().getText() : "");
+
+						vo.setZjlx(entity.getZjlx() != null ? entity.getZjlx().getId() : "");
+						vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+						vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+						vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+						vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+						vo.setXb(entity.getXb() != null ? entity.getXb().getId() : "");
+						vo.setRylx(entity.getRylx() != null ? entity.getRylx().getId() : "");
+						vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+						voList.add(vo);
+					}
+				}
+				return Object2JsonStr(voList);
+	}
+
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		RyEntity entity = ryService.findOne(id);
+		RyVo vo = new RyVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setXbzw(entity.getXb() != null ? entity.getXb().getText() : "");
+		vo.setRylxzw(entity.getRylx() != null ? entity.getRylx().getText() : "");
+		vo.setZjlxzw(entity.getZjlx() != null ? entity.getZjlx().getText() : "");
+
+		vo.setZjlx(entity.getZjlx() != null ? entity.getZjlx().getId() : "");
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		vo.setXb(entity.getXb() != null ? entity.getXb().getId() : "");
+		vo.setRylx(entity.getRylx() != null ? entity.getRylx().getId() : "");
+		// 出生日期格式化
+		if (null != entity.getCsrq()) {
+			vo.setCsrqfmt(new SimpleDateFormat("yyyy-MM-dd").format(entity.getCsrq()));
+		}
+		return Object2JsonStr(vo);
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/RyzsWService.java

@@ -0,0 +1,65 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.jyrxxgl.service.IRyzsService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyzsEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.RyzsVo;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
+@Service("ryzsWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "ryzsWebServicePort", serviceName = "ryzsWebService")
+public class RyzsWService extends BaseWebCtl implements IRyzsService {
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private RyzsService ryzsService;
+	@Override
+	@WebMethod(operationName = "findRyzs", action = "http://service.web.jsjty.com/findRyzs")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findRyzs(String ryid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		RyEntity entity = ryService.findOne(ryid);
+		if(entity!=null){
+			List<RyzsEntity> ryzslist = ryService.findZs(entity);
+			if (ryzslist.size() == 0) {
+				ryzslist = ryzsService.findZsBysfzh(entity.getSfzh());
+			}
+			List<RyzsVo> voList = new ArrayList<RyzsVo>();
+			for (RyzsEntity zsentity : ryzslist) {
+				RyzsVo zsvo = new RyzsVo();
+				if (zsentity != null) {
+					BeanUtils.copyProperties(zsentity, zsvo);
+					zsvo.setId(zsentity.getId());
+					zsvo.setZsmc(zsentity.getZsmc());
+					zsvo.setZsbh(zsentity.getZsbh());
+					zsvo.setFzbm(zsentity.getFzbm());
+					zsvo.setZszl(zsentity.getZszl());
+					if (null != zsentity.getYxq()) {
+						zsvo.setYxqfmt(new SimpleDateFormat("yyyy-MM-dd").format(zsentity.getYxq()));
+					}
+					zsvo.setRyzw(zsentity.getRyid() != null ? zsentity.getRyid().getXm() : "");
+					zsvo.setRyid(zsentity.getRyid() != null ? zsentity.getRyid().getId() : "");
+					voList.add(zsvo);
+				}
+			}
+			return Object2JsonStr(voList);
+		}
+		return "找不到对应的证书信息";
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/SssbxxService.java

@@ -19,6 +19,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,7 @@ import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
 import com.xt.jygl.gkjygl.gkjyr.sssb.vo.SssbVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
@@ -56,10 +58,11 @@ public class SssbxxService extends BaseWebCtl implements ISssbxxService{
 	@Override
 	@WebMethod(operationName = "findSssb", action = "http://service.web.jsjty.com/findSssb")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findSssb(final String szdid, final String szgkid, final String szgqid, final String jyr, final String ssmc) {
+	public String findSssb(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String jyr, final String ssmc) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<SssbEntity> spec = new Specification<SssbEntity>() {
 
 			@Override
@@ -103,9 +106,40 @@ public class SssbxxService extends BaseWebCtl implements ISssbxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<SssbEntity> sssblist = query.findAll(spec, SssbEntity.class);
-		JSONArray jsons=JSONArray.fromObject(sssblist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<SssbEntity> sssblist = query.findAll(spec, toPageRequest(page), SssbEntity.class);
+		List<SssbVo> voList = new ArrayList<SssbVo>();
+		for (SssbEntity entity : sssblist) {
+			SssbVo vo = new SssbVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
+				vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+				vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
+				vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
+				vo.setSldw(entity.getSldw() != null ? entity.getSldw().getText() : "");
+				voList.add(vo);
+
+			}
+		}
+		return Object2JsonStr(voList);
 	}
 	/**
 	 * 根据id查询设施设备信息详情

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/XkzfzWebService.java

@@ -0,0 +1,257 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.jyrxxgl.service.IXkzfzWebService;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.SearchCondition;
+import com.xt.jygl.common.Utils;
+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.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.entity.XkzfzEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.vo.XkzfzVo;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xtframe.sec.code.entity.CodeEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.DateTime;
+import com.xtframe.util.StringUtils;
+
+import net.sf.json.JSONArray;
+
+@Service
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzfzWebServicePort", serviceName = "xkzfzWebService")
+public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
+	
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private AccessoryService accessoryService;
+	@Autowired
+	private XkzfzService xkzfzService;
+	//列表
+	@Override
+	public String findXkzfz(int pages, int rows,final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String fzsqh, final String fzsfyx, final String wxhwpm, final String fzsfdq){
+		
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
+		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+		// 查询条件
+		Specification<XkzfzEntity> spec = new Specification<XkzfzEntity>() {
+			
+			@Override
+			public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszdid) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szd").get("id").as(String.class),
+				// "%" + SearchCondition.xkzszdid + "%"));
+				// }
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").as(String.class), "%" + szgkid + "%"));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszgkid) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szgk").as(String.class), "%" +
+				// SearchCondition.xkzszgkid + "%"));
+				// }
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("ssgq").as(String.class), "%" + szgqid + "%"));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszgqid) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("ssgq").as(String.class), "%" +
+				// SearchCondition.xkzszgqid + "%"));
+				// }
+				if (StringUtils.isNotEmpty(ssjyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzgkjyr) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("gkjyr").as(String.class), "%" +
+				// SearchCondition.xkzgkjyr + "%"));
+				// }
+				if (StringUtils.isNotEmpty(fzsqh)) {
+					list.add(cb.like(root.get("fzsqh").as(String.class), "%" + fzsqh + "%"));
+				} 
+				if (StringUtils.isNotEmpty(wxhwpm)) {
+					list.add(cb.like(root.get("wxhwpm").as(String.class), wxhwpm));
+				}
+				if (StringUtils.isNotEmpty(fzsfyx)) {
+					if (("是").equals(fzsfyx)) {
+						list.add(cb.equal(root.get("recordStatus").as(String.class), "1"));
+					} else {
+						list.add(cb.notEqual(root.get("recordStatus").as(String.class), "1"));
+					}
+				}
+				
+				Date now = new Date();
+				if (StringUtils.isNotEmpty(fzsfdq)) {
+					if ((fzsfdq).equals("6103")) {
+						list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class), now));
+					} else if ((fzsfdq).equals("6101")) {
+						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
+					} else {
+						list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class), DateTime.addDays(now, 30)));
+					}
+
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					@SuppressWarnings("unchecked")
+					List<String> gqlist = gqService.findGqListByUserId(SecUtils.getCurrUser().getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("yxqjssj");
+		page.setOrder("desc");
+		Page<XkzfzEntity> list = query.findAll(spec, toPageRequest(page),XkzfzEntity.class);
+		List<XkzfzVo> voList = new ArrayList<XkzfzVo>();
+		for (XkzfzEntity entity : list) {
+			XkzfzVo vo = new XkzfzVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				if (null != entity.getFzsj()) {
+					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+				}
+				if (null != entity.getYxqkssj()) {
+					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+				}
+				if (null != entity.getYxqjssj()) {
+					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+				}
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				Calendar time = Calendar.getInstance();
+				time.set(Calendar.HOUR_OF_DAY, 0);
+				time.set(Calendar.MINUTE, 0);
+				time.set(Calendar.SECOND, 0);
+				if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+					vo.setRecordStatus(1);
+				} else {
+					vo.setRecordStatus(9);
+				}
+				voList.add(vo);
+			}
+		}
+		return JSONArray.fromObject(voList).toString();
+	}
+	
+	//详情查询
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		
+		XkzfzEntity entity = xkzfzService.findOne(id);
+		XkzfzVo vo = new XkzfzVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		if (null != entity.getFzsj()) {
+			vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+		}
+		if (null != entity.getYxqkssj()) {
+			vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+		}
+		if (null != entity.getYxqjssj()) {
+			vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+		}
+
+		// zycs cq whdj
+
+		if (vo.getZycs() != null) {
+			CodeEntity zycs = securityMgr.codeService().findOne(vo.getZycs());
+			if (null != zycs) {
+				vo.setZycszw(zycs.getText());
+			}
+		}
+		if (vo.getCq() != null) {
+			CodeEntity cq = securityMgr.codeService().findOne(vo.getCq());
+			if (null != cq) {
+				vo.setCqzw(cq.getText());
+			}
+		}
+		if (vo.getWhdj() != null) {
+			CodeEntity whdj = securityMgr.codeService().findOne(vo.getWhdj());
+			if (null != whdj) {
+				vo.setWhdjzw(whdj.getText());
+			}
+		}
+		List<CodeEntity> listZycs = securityMgr.codeService().findValidCodesByGroupCode("ZYCS");
+		List<GqEntity> listgq = gqService.findGq();
+		List<GkEntity> listgk = gkService.findGk();
+		return JSONArray.fromObject(vo).toString();
+    }
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/XkzxxWebService.java

@@ -0,0 +1,348 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+
+import com.cxfws.jyrxxgl.service.IXkzxxWebService;
+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.Constants;
+import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.common.SearchCondition;
+import com.xt.jygl.common.Utils;
+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.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.vo.XkzxxVo;
+import com.xt.jygl.set.user.client.UserService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.DateTime;
+import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@Service
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzxxWebServicePort", serviceName = "xkzxxWebService")
+public class XkzxxWebService extends BaseWebCtl implements IXkzxxWebService {
+	
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private AccessoryService accessoryService;
+	//列表
+	public String findXkzxx(int pages, int rows,final String gkjyr, final String szgqid, final String gkjyxkzh, final String szdid, final String yxqz, final String szgkid, final String yxq1, final String yxq2, final String sfyx, final String xkzsfdq){
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
+		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		// 查询条件
+		Specification<XkzxxEntity> spec = new Specification<XkzxxEntity>() {
+			
+			@Override
+			public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszdid) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szd").get("id").as(String.class),
+				// "%" + SearchCondition.xkzszdid + "%"));
+				// }
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").as(String.class), "%" + szgkid + "%"));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszgkid) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szgk").as(String.class), "%" +
+				// SearchCondition.xkzszgkid + "%"));
+				// }
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("ssgq").as(String.class), "%" + szgqid + "%"));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszgqid) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("ssgq").as(String.class), "%" +
+				// SearchCondition.xkzszgqid + "%"));
+				// }
+				if (StringUtils.isNotEmpty(gkjyr)) {
+					Subquery<GkjyrEntity> subquery = query.subquery(GkjyrEntity.class);
+					Root<GkjyrEntity> dpRoot = subquery.from(GkjyrEntity.class);
+					subquery.select(dpRoot);
+					List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+					subQueryPredicates.add(cb.equal(root.get("gkjyr").as(String.class), dpRoot.get("id").as(String.class)));
+					subQueryPredicates.add(cb.like(dpRoot.get("gkjyr").as(String.class), "%" + gkjyr + "%"));
+					subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+					list.add(cb.exists(subquery));
+				} 
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzgkjyr) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("gkjyr").as(String.class), "%" +
+				// SearchCondition.xkzgkjyr + "%"));
+				// }
+				if (StringUtils.isNotEmpty(gkjyxkzh)) {
+					list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + gkjyxkzh + "%"));
+				} 
+				if (StringUtils.isNotEmpty(sfyx)) {
+					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
+				}
+				if (StringUtils.isNotEmpty(yxq1)) {
+					Date yxq1_time;
+					try {
+						yxq1_time = sdf.parse(yxq1);
+						list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), yxq1_time));
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					
+				} 
+				// else if (SearchCondition.yxq1 != null && isGET(request)) {
+				// list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class),
+				// SearchCondition.yxq1));
+				// }
+				if (StringUtils.isNotEmpty(yxq2)) {
+					Date yxq2_time;
+					try {
+						yxq2_time = sdf.parse(yxq2);
+						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), yxq2_time));
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					
+				} 
+				// else if (SearchCondition.yxq2 != null && isGET(request)) {
+				// list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class),
+				// SearchCondition.yxq2));
+				// }
+
+				Date now = new Date();
+				if (StringUtils.isNotEmpty(xkzsfdq)) {
+					if ((xkzsfdq).equals("6103")) {
+						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), now));
+					} else if ((xkzsfdq).equals("6101")) {
+						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
+					} else {
+						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), DateTime.addDays(now, 30)));
+					}
+
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("ssgq").as(String.class));
+					//List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+					List<String> gqlist = gqService.findGqListByUserId(SecUtils.getCurrUser().getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+					// list.add(cb.like(root.get("szd").get("id").as(String.class),
+					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+				}
+				// 状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+//		String user1 = (String) Utils.getSession().getAttribute("user");
+//	
+//		String user2 = SecUtils.getCurrUser().getId();
+//		if (user2 != null) {
+//			if (!user2.equals(user1)) {
+//				SearchCondition.xkzpage = 1;
+//				SearchCondition.xkzgkjyr = "";
+//				SearchCondition.xkzszdid = "";
+//				SearchCondition.xkzszgqid = "";
+//				SearchCondition.xkzszgkid = "";
+//				SearchCondition.xkzgkjyxkzh = "";
+//				SearchCondition.sfyx = "";
+//				SearchCondition.yxq1 = null;
+//				SearchCondition.yxq2 = null;
+//				SearchCondition.xkzsfdq = "";
+//			}
+//
+//		}
+//		Utils.getSession().setAttribute("user", user2);
+
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setOrder("asc");
+		Page<XkzxxEntity> list = query.findAll(spec, toPageRequest(page),XkzxxEntity.class);
+		List<XkzxxVo> voList = new ArrayList<XkzxxVo>();
+		for (XkzxxEntity entity : list) {
+			XkzxxVo vo = new XkzxxVo();
+			if (entity != null && entity.getRecordStatus() != 9) {
+				BeanUtils.copyProperties(entity, vo);
+				Date date = new Date();
+				/*
+				 * SimpleDateFormat formatter = new
+				 * SimpleDateFormat("yyyy-MM-dd"); String
+				 * dqrq=formatter.format(date);
+				 */
+				long day = (entity.getYxqz().getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
+				if (day < 30 || day == 30) {
+					vo.setSfred("1");
+				} else {
+					vo.setSfred("2");
+				}
+				// 为所属港区中文赋值
+				// 先获取所属港区id
+				if (vo.getSsgq() != null) {
+					GqEntity gq = gqService.findOne(vo.getSsgq());
+					if (null != gq) {
+						vo.setSsgqzw(gq.getGqmc());
+					}
+				}
+				if (vo.getSzgk() != null) {
+					GkEntity gk = gkService.findOne(vo.getSzgk());
+					if (null != gk) {
+						vo.setSzgkzw(gk.getGkmc());
+					}
+				}
+
+				if (vo.getGkjyr() != null) {
+
+					GkjyrEntity jyr = gkjyrService.findOne(vo.getGkjyr());
+					if (null != jyr) {
+						vo.setGkjyrzw(jyr.getGkjyr());
+					}
+				}
+
+				voList.add(vo);
+			}
+		}
+
+		return JSONArray.fromObject(voList).toString();
+	}
+	
+	
+	//详情
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		XkzxxEntity entity = xkzxxService.findOne(id);
+		XkzxxVo vo = new XkzxxVo();
+
+		if (entity != null) {
+			BeanUtils.copyProperties(entity, vo);
+		}
+
+		if (vo.getGkjyr() != null) {
+			GkjyrEntity gkjyr = gkjyrService.findOne(vo.getGkjyr());
+			if (null != gkjyr) {
+				vo.setGkjyrzw(gkjyr.getGkjyr());
+			}
+
+		}
+
+		if (vo.getSsgq() != null) {
+			GqEntity gq = gqService.findOne(vo.getSsgq());
+			if (null != gq) {
+				vo.setSsgqzw(gq.getGqmc());
+			}
+		}
+
+		if ("1".equals(vo.getStype())) {
+			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				if (!StringUtils.isEmpty(entity.getZmpicid())) {
+					AccessoryEntity acc = accessoryService.findOne(entity.getZmpicid());
+					ftpDown(acc);
+				}
+				if (!StringUtils.isEmpty(entity.getFmpicid())) {
+					AccessoryEntity acc = accessoryService.findOne(entity.getFmpicid());
+					ftpDown(acc);
+				}
+			}
+		}
+		
+		return JSONArray.fromObject(vo).toString();
+	}
+	
+	public void ftpDown(AccessoryEntity acc) {
+		try {
+			Ftp f = new Ftp();
+			f.setIpAddr(GlobalData.FTP_IP);
+			f.setPort(Integer.parseInt(GlobalData.FTP_PORT));
+			f.setUserName(GlobalData.FTP_XK_USER);
+			f.setPwd(GlobalData.FTP_XK_USER);
+			f.setPath("");
+			// 本地目录
+			String localBaseDir = GlobalData.VIEW_FILE_PATH + acc.getFilepath();
+			File newfile = new File(localBaseDir);
+			// 如果文件夹不存在则创建
+			if (!newfile.exists() && !newfile.isDirectory()) {
+				newfile.mkdirs();
+			}
+			// 远程目录
+			String remoteBaseDir = acc.getFilepath();
+			// 下载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();
+		}
+	}
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/ZxjxxxService.java

@@ -18,6 +18,7 @@ import net.sf.json.JSONArray;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +31,7 @@ import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
 import com.xt.jygl.gkjygl.gkjyr.zxjx.vo.ZxjxVo;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.dao.UserDao;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.DateTime;
@@ -56,10 +58,11 @@ public class ZxjxxxService extends BaseWebCtl implements IZxjxxxService{
 	@Override
 	@WebMethod(operationName = "findZxjx", action = "http://service.web.jsjty.com/findZxjx")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findZxjx(final String szdid, final String szgkid, final String szgqid, final String jyr, final String jxlbmcid) {
+	public String findZxjx(int pages, int rows,final String szdid, final String szgkid, final String szgqid, final String jyr, final String jxlbmcid) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<ZxjxEntity> spec = new Specification<ZxjxEntity>() {
 
 			@Override
@@ -99,9 +102,43 @@ public class ZxjxxxService extends BaseWebCtl implements IZxjxxxService{
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		List<ZxjxEntity> zxjxlist = query.findAll(spec, ZxjxEntity.class);
-		JSONArray jsons=JSONArray.fromObject(zxjxlist);
-		return jsons.toString();
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<ZxjxEntity> zxjxlist = query.findAll(spec, toPageRequest(page), ZxjxEntity.class);
+		List<ZxjxVo> voList = new ArrayList<ZxjxVo>();
+		for (ZxjxEntity entity : zxjxlist) {
+			if (entity != null) {
+				ZxjxVo vo = new ZxjxVo();
+				BeanUtils.copyProperties(entity, vo);
+
+				
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				vo.setJxlbmc(entity.getJxlbmc() != null ? entity.getJxlbmc().getId() : "");
+				vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
+				vo.setSyq(entity.getSyq() != null ? entity.getSyq().getId() : "");
+				
+				vo.setSyqzw(entity.getSyq() != null ? entity.getSyq().getText() : "");
+				vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
+				vo.setJxlbmczw(entity.getJxlbmc() != null ? entity.getJxlbmc().getText() : "");
+				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
 	}
 	/**
 	 * 装卸机械信息详细

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IZysbybWebService.java

@@ -8,7 +8,7 @@ import javax.jws.WebService;
 public interface IZysbybWebService {
 	@WebMethod(operationName = "findZysbyb", action = "http://service.web.jsjty.com/findZysbyb")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findZysbyb(String gkjyr, String szdid, String szgkid, String jcgid, String nwmid, String dydlid, String zysjq, String zysjz);
+	public String findZysbyb(int pages, int rows, String gkjyr, String szdid, String szgkid, String jcgid, String nwmid, String dydlid, String zysjq, String zysjz);
 	
 	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/ZysbybWebService.java

@@ -5,44 +5,32 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import javax.jws.WebService;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.persistence.criteria.CriteriaBuilder.In;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import com.cxfws.sjtjfx.service.IZysbybWebService;
 import com.xt.jygl.common.BaseWebCtl;
-import com.xt.jygl.common.Constants;
-import com.xt.jygl.common.SearchCondition;
-import com.xt.jygl.common.Utils;
-import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbybbEntity;
-import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
-import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbVo;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbybbService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbybbVo;
-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.gkjygl.gkjyr.jyrbw.service.BwService;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
-import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
 
-import cache.CacheSearchCondition;
-import net.sf.json.JSONObject;
-
 @Service("zysbybWebService")
 @WebService(targetNamespace="http://service.web.jsjty.com/",portName="zysbybWebServicePort",serviceName="zysbybWebService")
 public class ZysbybWebService extends BaseWebCtl implements IZysbybWebService {
@@ -52,14 +40,19 @@ public class ZysbybWebService extends BaseWebCtl implements IZysbybWebService {
 	@Autowired
 	private QueryService query;
 	@Autowired
-	private DcsbService dcsbService;
+	private DcsbybbService dcsbybbService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private MtService mtService;
 
 	
 	@Override
-	public String findZysbyb(final String gkjyr, final String szdid, final String szgkid, final String jcgid, final String nwmid, final String dydlid, final String zysjq, final String zysjz) {
+	public String findZysbyb(int pages,int rows ,final String gkjyr, final String szdid, final String szgkid, final String jcgid, final String nwmid, final String dydlid, final String zysjq, final String zysjz) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages,rows);
 		// 查询条件
 		Specification<DcsbybbEntity> spec = new Specification<DcsbybbEntity>() {
 			@Override
@@ -137,6 +130,16 @@ public class ZysbybWebService extends BaseWebCtl implements IZysbybWebService {
 			page.setPage(SearchCondition.ybbpage);
 		}*/
 
+		if (page.getPage() < 1) {
+			/*Object ybbpagepage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ybbpage");
+			if (StringUtils.isEmpty(ybbpagepage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(ybbpagepage))) {
+				ybbpagepage = "1";
+			}*/
+			page.setPage(1);
+		}
+		page.setSort("updateDateTime");
+		page.setOrder("desc");
+		
 		List<DcsbybbEntity> list = query.findAll(spec,  DcsbybbEntity.class);
 		List<DcsbybbVo> voList = new ArrayList<DcsbybbVo>();
 		for (DcsbybbEntity entity : list) {
@@ -171,9 +174,30 @@ public class ZysbybWebService extends BaseWebCtl implements IZysbybWebService {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
-		DcsbEntity entity = dcsbService.findOne(id);
-		
-		return Object2JsonStr(entity);
+		DcsbybbEntity entity = dcsbybbService.findOne(id);
+		DcsbybbVo vo = new DcsbybbVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setMt(entity.getMt() != null ? mtService.findOne(entity.getMt()).getMtmc() : "");
+		vo.setBw(entity.getBw() != null ? bwService.findOne(entity.getBw()).getBwmc() : "");
+		vo.setHwzlzw(entity.getHwzl()!=null?entity.getHwzl().getText():"");
+		vo.setHwzldedlzw(entity.getHwzldedl()!=null?entity.getHwzldedl().getText():"");
+	/*	if (entity.getHwzl() != null) {
+			vo.setHwzlzw(securityMgr.codeService().findOne(entity.getHwzl().getId()).getText());
+		}*/
+		if (entity.getJcg() != null) {
+			vo.setJcg(securityMgr.codeService().findOne(entity.getJcg()).getText());
+		}
+		if (entity.getNwm() != null) {
+			vo.setNwm(securityMgr.codeService().findOne(entity.getNwm()).getText());
+		}
+		if(!StringUtils.isEmpty(entity.getBgsj())){
+			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM");
+			vo.setBgsj(dateTimeFormat.format(entity.getBgsj()));
+		}
+		return Object2JsonStr(vo);
 
 	}
 

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/IJsjdglWebService.java

@@ -10,7 +10,7 @@ public interface IJsjdglWebService {
 
 	@WebMethod(operationName = "findJsjdgl", action = "http://service.web.jsjty.com/findJsjdgl")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findJsjdgl(final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd);
+	public String findJsjdgl(int pages,int rows,final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd);
 	
 	
 	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/ITzjhglWebService.java

@@ -8,7 +8,7 @@ import javax.jws.WebService;
 public interface ITzjhglWebService {
 	@WebMethod(operationName = "findTzjhgl", action = "http://service.web.jsjty.com/findTzjhgl")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findTzjhgl(final String xmid, final String szdid, final String xmmc, final String xmfr, final String jhnd, final String ndjhtz1, final String ndjhtz2, final String szgqid, final String szgkid, final String xmlbid, final String sfyzjbzid);
+	public String findTzjhgl(int pages,int rows,final String xmid, final String szdid, final String xmmc, final String xmfr, final String jhnd, final String ndjhtz1, final String ndjhtz2, final String szgqid, final String szgkid, final String xmlbid, final String sfyzjbzid);
 
 	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/IXmxxglWebService.java

@@ -8,7 +8,7 @@ import javax.jws.WebService;
 public interface IXmxxglWebService {
 	@WebMethod(operationName = "findXmxx", action = "http://service.web.jsjty.com/findXmxx")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findXmxx(final String xmmc, final String szgkid, final String szgqid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid);
+	public String findXmxx(int page,int rows, final String xmmc, final String szgkid, final String szgqid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid);
 	
 	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/JsjdglWebService.java

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
 import javax.jws.WebService;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaBuilder.In;
@@ -15,9 +16,11 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
+import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +29,7 @@ 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.Constants;
-import com.xt.jygl.common.Utils;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjsgl.jsjdgl.entity.JsjdfjEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.entity.XmxxglfbEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.entity.XmyjhxxEntity;
@@ -49,9 +52,9 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
-import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.sec.code.entity.CodeEntity;
 import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
 
@@ -94,15 +97,24 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 	
 	@Autowired
 	private XmxxglfbService xmxxglfbService;
+	
+	@Resource
+	private WebServiceContext wscontext;
+
+	@Autowired
+	private GqService gqService;
 
 	/**
 	 * 获取进度列表
 	 */
 	@Override
-	public String findJsjdgl(final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd) {
+	public String findJsjdgl(int pages,int rows,final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
+		
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override
@@ -177,8 +189,9 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
-					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+//					@SuppressWarnings("unchecked")
+//					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+					List<String> gqlist = gqService.findGqListByUserId(SecUtils.getCurrUser().getId());
 					if (gqlist != null && gqlist.size() > 0) {
 						for (int i = 0; i < gqlist.size(); i++) {
 							in.value(gqlist.get(i));
@@ -192,8 +205,16 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
+		
+		if (page.getPage() < 1) {
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
 
-		List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
+		//List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
 
 		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
 		for (XmxxglEntity entity : list) {

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/TzjhglWebService.java

@@ -3,21 +3,24 @@ package com.cxfws.xmxxgl.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.jws.WebService;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import com.cxfws.xmxxgl.service.ITzjhglWebService;
 import com.xt.jygl.common.BaseWebCtl;
-import com.xt.jygl.common.Utils;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkjsgl.tzjhgl.vo.TzjhglVo;
@@ -26,6 +29,8 @@ import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.SimplePageRequest;
+import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
 
 /**
@@ -47,6 +52,10 @@ public class TzjhglWebService extends BaseWebCtl implements ITzjhglWebService {
 	@Autowired
 	private TzjhglService tzjhglService;
 	
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private GqService gqService;
 	/**
 	 * 获取投资计划详情
 	 */
@@ -74,10 +83,12 @@ public class TzjhglWebService extends BaseWebCtl implements ITzjhglWebService {
 	 * 投资计划列表
 	 */
 	@Override
-	public String findTzjhgl(final String xmid,final String szdid,final String xmmc,final String xmfr,final String jhnd,final String ndjhtz1,final String ndjhtz2,final String szgqid,final String szgkid,final String xmlbid,final String sfyzjbzid) {
+	public String findTzjhgl(int pages,int rows,final String xmid,final String szdid,final String xmmc,final String xmfr,final String jhnd,final String ndjhtz1,final String ndjhtz2,final String szgqid,final String szgkid,final String xmlbid,final String sfyzjbzid) {
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
+		
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
 		Specification<TzjhglEntity> spec = new Specification<TzjhglEntity>() {
 			// 查询条件
 			@Override
@@ -129,9 +140,10 @@ public class TzjhglWebService extends BaseWebCtl implements ITzjhglWebService {
 							+ getSsjyr().getId() + "%"));
 				} else {
 					In<String> in = cb.in(root.get("xmid").get("szgq").get("id").as(String.class));
-					@SuppressWarnings("unchecked")
+				/*	@SuppressWarnings("unchecked")
 					List<String> gqlist = (List<String>) Utils.getSession()
-							.getAttribute("gqList");
+							.getAttribute("gqList");*/
+					List<String> gqlist = gqService.findGqListByUserId(SecUtils.getCurrUser().getId());
 					if (gqlist != null && gqlist.size() > 0) {
 						for (int i = 0; i < gqlist.size(); i++) {
 							in.value(gqlist.get(i));
@@ -144,7 +156,19 @@ public class TzjhglWebService extends BaseWebCtl implements ITzjhglWebService {
 			}
 		};
 		
-		List<TzjhglEntity> list = query.findAll(spec, TzjhglEntity.class);
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<TzjhglEntity> list = query.findAll(spec, toPageRequest(page), TzjhglEntity.class);
+		
+//		List<TzjhglEntity> list = query.findAll(spec, TzjhglEntity.class);
 		List<TzjhglVo> voList = new ArrayList<TzjhglVo>();
 		for (TzjhglEntity entity : list) {
 			TzjhglVo vo = new TzjhglVo();

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/XmxxglWebService.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
 import javax.jws.WebService;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaBuilder.In;
@@ -12,9 +13,13 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -40,13 +45,16 @@ import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.StringUtils;
 
+import cache.CacheSearchCondition;
+
 @Service("xmxxglWebService")
-@WebService(targetNamespace="http://service.web.jsjty.com/",portName="xmxxglWebServicePort",serviceName="xmxxglWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xmxxglWebServicePort", serviceName = "xmxxglWebService")
 public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
-	
+
 	@Autowired
 	private SecurityMgr securityMgr;
 	@Autowired
@@ -65,14 +73,20 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 	private XmbwglbService xmbwglbService;
 	@Autowired
 	private GqService gqService;
+	
+	@Resource
+	private WebServiceContext webServiceContext;
+
 	/**
 	 * 获取项目基本信息
 	 */
 	@Override
-	public String findXmxx(final String xmmc,final String szgkid,final String szgqid, final String xmhzjbid,final String xmfr,final String szdid, final String sfyzjbzid) {
-		if (!this.checkUser()){
+	public String findXmxx(int pages, int rows, final String xmmc, final String szgkid, final String szgqid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) {
+		if (!this.checkUser()) {
 			return BaseWebCtl.NOLOGIN;
 		}
+		SimplePageRequest page = new SimplePageRequest(pages, rows);
+
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override
@@ -80,7 +94,7 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(xmmc)) {
 					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
-				} 
+				}
 				if (StringUtils.isNotEmpty(xmfr)) {
 					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
 				}
@@ -95,7 +109,7 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
-				} 
+				}
 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
 					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
 				}
@@ -115,7 +129,7 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
 						list.add(cb.exists(subquery).not());
 					}
-				} 
+				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
@@ -134,7 +148,19 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 			}
 		};
 
-		List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
+		if (page.getPage() < 1) {
+//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
+//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
+//				xmxxpage = "1";
+//			}
+			page.setPage(1);
+		}
+
+		page.setSort("id");
+		page.setOrder("desc");
+		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
+
+//		List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
 		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
 		for (XmxxglEntity entity : list) {
 			XmxxglVo vo = new XmxxglVo();
@@ -194,11 +220,11 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 
 	@Override
 	public String findOne(String id) {
-		if (!this.checkUser()){
+		if (!this.checkUser()) {
 			return BaseWebCtl.NOLOGIN;
 		}
-		Map<String,Object> map = new HashMap<String,Object>();
-	
+		Map<String, Object> map = new HashMap<String, Object>();
+
 		// 附件
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");
 		List<JsjdfjVo> jsjdfjVoList = new ArrayList<>();
@@ -262,13 +288,13 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 		List<XmbwglbEntity> xmbwglblist = xmbwglbService.findByXmid(entity.getId());
 		// 泊位信息
 		List<BwEntity> bwList = new ArrayList<BwEntity>();
-		if(xmbwglblist!=null && xmbwglblist.size()>0){
-			for (XmbwglbEntity xb : xmbwglblist ){
+		if (xmbwglblist != null && xmbwglblist.size() > 0) {
+			for (XmbwglbEntity xb : xmbwglblist) {
 				BwEntity bw = bwService.findOne(xb.getBwid());
 				bwList.add(bw);
 			}
-		}  
-		
+		}
+
 		List<BwVo> voList = new ArrayList<BwVo>();
 		for (BwEntity entitybw : bwList) {
 			BwVo vobw = new BwVo();
@@ -333,7 +359,7 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 		map.put("accessoryList", jsjdfjVoList);
 		map.put("xmxx", vo);
 		map.put("bwList", voList);
-	
+
 		return Object2JsonStr(map);
 	}