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

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/common/BaseVo.java

@@ -1,11 +1,11 @@
 package com.xt.js.gkaq.common;
 
 public class BaseVo{
-    /** 当前页码 */
-    private Integer page;
-    /** 每页行数 */
-    private Integer rows;
-    /** 当前操作 */
+	/** 当前页码 */
+	private Integer page;
+	/** 每页行数 */
+	private Integer rows;
+	/** 当前操作 */
 	private String opt;
 	public Integer getPage() {
 		return page;

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/common/ExportExcel.java

@@ -0,0 +1,107 @@
+package com.xt.js.gkaq.common;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.hssf.dev.HSSF;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+public class ExportExcel<T> {
+		
+    public void  exportExcel(String title, String[] headers,  
+            List<T> dataset,HttpServletRequest request,HttpServletResponse response)  
+    {  
+    	//第一步：新建excel文件
+    	HSSFWorkbook wb = new HSSFWorkbook();  
+        //第二步： 添加一个sheet,对应Excel文件中的sheet 
+        HSSFSheet sheet = wb.createSheet(title); 
+        //第三步：在sheet中添加表头第0行
+        HSSFRow row = sheet.createRow(0);
+        // 第四步，创建单元格，并设置值表头 设置表头居中  
+        HSSFCellStyle style = wb.createCellStyle();  
+        style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式  
+        // 产生表格标题行 
+        for (short i = 0; i < headers.length; i++)  
+        {  
+            HSSFCell cell = row.createCell(i); //第几个单元格
+            cell.setEncoding(HSSFCell.ENCODING_UTF_16);//设置单元格编码格式
+            cell.setCellValue(headers[i]); //值是多少
+            cell.setCellStyle(style);  //样式是什么
+        }   
+        
+        // 遍历集合数据，产生数据行  
+        Iterator<T> it = dataset.iterator(); 
+        int index = 0; 
+        while (it.hasNext())  
+        {  
+            index++;  
+            row = sheet.createRow(index);  
+            T t = (T) it.next();  
+            // 利用反射，根据javabean属性的先后顺序，动态调用getXxx()方法得到属性值  
+            Field[] fields = t.getClass().getDeclaredFields();  
+            for (short i = 0; i < fields.length; i++)  
+            {  
+                HSSFCell cell = row.createCell(i); 
+                cell.setEncoding(HSSFCell.ENCODING_UTF_16);//设置单元格编码格式
+                Field field = fields[i];  
+                String fieldName = field.getName();  
+                String getMethodName = "get"  
+                        + fieldName.substring(0, 1).toUpperCase()  
+                        + fieldName.substring(1);  
+                try  
+                {  
+                    Class tCls = t.getClass();  
+                    Method getMethod = tCls.getMethod(getMethodName, new Class[]{});  
+                    Object value = getMethod.invoke(t, new Object[]  
+                    {});
+                    HSSFRichTextString richString = null;
+                    if (value != null) {
+                    	richString = new HSSFRichTextString(value.toString());	
+                    } else {
+                    	richString = new HSSFRichTextString("");
+                    }
+                    HSSFFont font3 = wb.createFont();  
+                    //font3.setColor(HSSFColor.BLUE.index);  
+                    richString.applyFont(font3);  
+                    cell.setCellValue(richString.toString());
+                }  
+                catch (Exception e)  
+                {
+                	e.printStackTrace();
+                } 
+            }  
+        } 
+		try {
+			request.setCharacterEncoding("GBK");
+			response.setCharacterEncoding("GBK");
+			response.setContentType("application/vnd.ms-excel;charset=GBK");  
+			response.setHeader("Content-disposition", "attachment;filename="+new String(title.getBytes(), "ISO-8859-1")+".xls");
+		} catch (UnsupportedEncodingException e1) {
+			e1.printStackTrace();
+		} 
+        OutputStream ouputStream;
+		try {
+			ouputStream = response.getOutputStream();
+	        wb.write(ouputStream);  
+	        ouputStream.flush();  
+	        ouputStream.close();
+		} catch (IOException e) {
+		e.printStackTrace();
+		}
+
+       }
+    } 

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/BwCtl.java

@@ -26,7 +26,7 @@ public class BwCtl extends BaseCtl {
     private CodeService codeService;
     
     /**
-     * 数�表格
+     * Êý¾Ý±í¸ñ
      * @param vo
      * @return
      */

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/DictCtl.java

@@ -25,7 +25,7 @@ import com.yuanxd.tools.utils.WebJsonResult;
 import com.yuanxd.tools.utils.string.StringUtils;
 
 /**
- * 字典管理控制
+ * 锟街碉拷锟斤拷锟斤拷锟斤拷
  */
 @Controller
 @RequestMapping(value = "/dict", produces = "application/json; charset=utf-8")
@@ -34,7 +34,7 @@ public class DictCtl extends BaseCtl {
     private CodeService codeService;
 
     /**
-     * 进入首页
+     * 锟斤拷锟斤拷锟斤拷页
      * 
      * @param model
      * @return
@@ -45,7 +45,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 初始化页面加载树
+     * 锟斤拷始锟斤拷页锟斤拷锟斤拷锟斤拷锟�
      * 
      * @return
      */
@@ -58,7 +58,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 初始化页面加载数据
+     * 锟斤拷始锟斤拷页锟斤拷锟斤拷锟斤拷锟斤拷
      * 
      * @param vo
      * @return
@@ -67,7 +67,7 @@ public class DictCtl extends BaseCtl {
     @RequestMapping("list")
     @ResponseBody
     public PageInfo<CodeModelDto> getPageInfo(DictVo vo) throws UnsupportedEncodingException {
-        // 初始化参数
+        // 锟斤拷始锟斤拷锟斤拷锟斤拷
         if (null == vo.getPage() || vo.getPage() < 1) {
             vo.setPage(1);
         }
@@ -92,7 +92,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 获取记录
+     * 锟斤拷取锟斤拷录
      * 
      * @param id
      * @return
@@ -106,7 +106,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 删除记录
+     * 删锟斤拷锟铰�
      * 
      * @param ids
      * @return
@@ -121,6 +121,8 @@ public class DictCtl extends BaseCtl {
             String[] idArr = ids.split(",");
             for (String id : idArr) {
                 if (StringUtils.isNotEmpty(id)) {
+                    cnt += codeService.deleteByPid(id);
+                    cnt += codeService.deleteByID(id);
                     delByPid(id);
                 }
             }
@@ -129,7 +131,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 递归删除
+     * 锟捷癸拷删锟斤拷
      * 
      * @param id
      */
@@ -151,7 +153,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 保存记录
+     * 锟斤拷锟斤拷锟铰�
      * 
      * @param vo
      * @return
@@ -161,12 +163,12 @@ public class DictCtl extends BaseCtl {
     public WebJsonResult save(DictVo dictVo) {
 
         if (StringUtils.isEmpty(dictVo.getId())) {
-            // 新增
+            // 锟斤拷锟斤拷
             CodeModel codeModel = new CodeModel();
             BeanUtils.copyProperties(dictVo, codeModel);
             codeService.add(codeModel);
         } else {
-            // 更新
+            // 锟斤拷锟斤拷
             CodeModel codeModel = codeService.findById(dictVo.getId());
             BeanUtils.copyProperties(dictVo, codeModel);
             codeService.update(codeModel);
@@ -175,7 +177,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 获取字典列表
+     * 锟斤拷取锟街碉拷锟叫憋拷
      * 
      * @param pcode
      * @return
@@ -189,7 +191,7 @@ public class DictCtl extends BaseCtl {
     }
 
     /**
-     * 获取父类字典列表
+     * 锟斤拷取锟斤拷锟斤拷锟街碉拷锟叫憋拷
      * 
      * @return
      */

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrTjcxCtl.java

@@ -1,7 +1,11 @@
 package com.xt.js.gkaq.web.ctl;
 
+import java.math.BigDecimal;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -9,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.common.ExportExcel;
+import com.xt.js.gkaq.dwxx.model.JyrInfoExcelModel;
 import com.xt.js.gkaq.frame.service.CodeService;
 import com.xt.js.gkaq.web.model.CkModel;
 import com.xt.js.gkaq.web.model.TjcxModel;
@@ -26,7 +32,7 @@ public class JyrTjcxCtl extends BaseCtl {
 	private JyrTjcxService service;
     
     /**
-     * 鏁版嵁琛ㄦ牸
+     * 数据表格
      * @param vo
      * @return
      */
@@ -47,5 +53,57 @@ public class JyrTjcxCtl extends BaseCtl {
 		PageInfo<TjcxModel> pageResult = new PageInfo<>(list);
 		return pageResult;
     }
+    
+    @RequestMapping("printJyrTjInfo")
+    @ResponseBody
+    public void printJyrTjInfo (TjcxModel model, HttpServletResponse response,HttpServletRequest request) {
+    	List<TjcxModel> list = service.selectInfo(model);
+    	//数据加工处理
+    	for (int i = 0; i < list.size(); i++) {
+    		TjcxModel jyr = list.get(0);
+    		if (jyr.getSyhgmt() == null || "".equals(jyr.getSyhgmt())) {
+    			jyr.setSyhgmt("0");
+    		}
+			if (jyr.getWxhw() == null || "".equals(jyr.getWxhw())) {
+			    jyr.setWxhw("0");
+			}
+			if (jyr.getPh() == null || "".equals(jyr.getPh())) {
+				jyr.setPh("0");
+			}
+			if (jyr.getJzx() == null || "".equals(jyr.getJzx())) {
+				jyr.setJzx("0");
+			}
+			if (jyr.getWd() == null || "".equals(jyr.getWd())) {
+				jyr.setWd("0");
+			}
+			if (jyr.getWdyx() == null || "".equals(jyr.getWdyx())) {
+				jyr.setWdyx("0");
+			}
+			if (jyr.getQd() == null || "".equals(jyr.getQd())) {
+				jyr.setQd("0");
+			}
+			if (jyr.getQdyx() == null || "".equals(jyr.getQdyx())) {
+				jyr.setQdyx("0");
+			}
+			if (jyr.getSl() == null || "".equals(jyr.getSl())) {
+				jyr.setSl("0");
+			}
+			if (jyr.getWxsl() == null || "".equals(jyr.getWxsl())) {
+				jyr.setWxsl("0");
+			}
+			if (jyr.getRj() == null || "".equals(jyr.getRj())) {
+				jyr.setRj(new BigDecimal(0));
+			}
+    		
+    		list.remove(0);
+			list.add(jyr);
+		}
+    	
+    	
+    	ExportExcel<TjcxModel> excel = new ExportExcel<TjcxModel>();
+    	String[] heads = {"企业名称","石油货物码头数量","危险货物码头数量","普货码头数量","集装箱码头数量","万吨以上泊位数量","万吨以下泊位数量","千吨以上泊位数量",
+    						"千吨以下泊位数量","储罐数量","储罐重大危险源单元数量","储罐容积"};
+    	excel.exportExcel("经营人统计信息", heads , list, request, response);
+    }
   
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrUserCtl.java

@@ -0,0 +1,302 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import com.alibaba.fastjson.JSONArray;
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.BloBModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.model.JyrUserListModel;
+import com.xt.js.gkaq.web.model.JyrUserModel;
+import com.xt.js.gkaq.web.service.BloBService;
+import com.xt.js.gkaq.web.service.GqService;
+import com.xt.js.gkaq.web.service.JyrUserService;
+import com.xt.js.gkaq.web.service.RyzsbService;
+import com.xt.js.gkaq.web.vo.BloBVo;
+import com.xt.js.gkaq.web.vo.JyrUserVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+import com.yuanxd.tools.utils.WebJsonResult;
+import com.yuanxd.tools.utils.string.StringUtils;
+
+@Controller
+@RequestMapping(value = "/jyrUser", produces = "application/json; charset=utf-8")
+public class JyrUserCtl extends BaseCtl {
+    @Autowired
+    private JyrUserService jyrUserService;
+    
+    @Autowired
+    private JyrjcxxService jyrjcxxService;
+    @Autowired
+    private CodeService codeService;
+    @Autowired
+    private GqService gqService;
+    
+    @Autowired
+    private BloBService bloBService;
+    
+    @Autowired
+    private RyzsbService ryzsbService;
+
+    @RequestMapping("")
+    public String main(HttpServletRequest request) {
+    	//加载所在地
+    	List<ComboBoxDto> list = codeService.findByPcode("DM_SZD");
+    	//加载人员类型
+    	List<ComboBoxDto> rylxList = codeService.findByPcode("RYLX");
+    	request.setAttribute("code", list);
+    	request.setAttribute("rylx", rylxList);
+        return "dwxx/jyrUser/main";
+    }
+    /**
+     * 加载所在地
+     * @return
+     */
+    @RequestMapping("getszd")
+    @ResponseBody
+    public String getszd() {
+    	//加载所在地
+    	List<ComboBoxDto> list = codeService.findByPcode("DM_SZD");
+    	return JSONArray.toJSONString(list);
+    }
+    /**
+     * 加载人员类型
+     * @return
+     */
+    @RequestMapping("getRylx")
+    @ResponseBody
+    public String getRylx() {
+    	//加载人员类型
+    	List<ComboBoxDto> rylxList = codeService.findByPcode("RYLX");
+    	return JSONArray.toJSONString(rylxList);
+    }
+    /**
+     * 加载证件类型
+     * @return
+     */
+    @RequestMapping("getzjlx")
+    @ResponseBody
+    public String getzjlx() {
+    	//加载证件类型
+    	List<ComboBoxDto> zjList = codeService.findByPcode("ZJLX");
+    	return JSONArray.toJSONString(zjList);
+    }
+    /***
+     * 动态关联下拉框数据：港区
+     * @param request
+     * @param szd
+     * @return
+     */
+    @RequestMapping("getGq")
+    @ResponseBody
+    public String getGq(String szd) {
+    	GqModel model = new GqModel();
+    	model.setSzd(szd);
+    	//获取港区
+    	List<ComboBoxDto> gqlist = gqService.selectByInfo(model);
+    	return JSONArray.toJSONString(gqlist);
+    }
+    /***
+     * 动态关联下拉框数据：经营人信息
+     * @param request
+     * @param szd
+     * @return
+     */
+    @RequestMapping("getJyr")
+    @ResponseBody
+    public String getJyr(String szd) {
+    	//获取经营人
+    	List<com.xt.js.gkaq.dwxx.model.ComboBoxDto> jyrlist = jyrjcxxService.getSelect(szd);
+    	return JSONArray.toJSONString(jyrlist);
+    }
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<JyrUserListModel> list(JyrUserVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		JyrUserModel model = new JyrUserModel();
+		BeanUtils.copyProperties(vo, model);
+		List<JyrUserListModel> list = jyrUserService.selectInfo(model);
+		PageInfo<JyrUserListModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+   
+    /**
+     * 编辑详情
+     * @return
+     */
+    @RequestMapping("initEdit")
+    @ResponseBody
+    public String initEdit (String id) {
+    	JyrUserModel model = jyrUserService.findById(id);
+    	return JSONArray.toJSONString(model);
+    } 
+  
+    /**
+     * 添加或修改
+     * @param vo
+     * @return
+     * @throws ParseException 
+     */
+    @RequestMapping("save")
+    @ResponseBody
+    public WebJsonResult save (JyrUserVo vo){
+    	if (StringUtils.isEmpty(vo.getId())) {
+    		//添加
+    		JyrUserModel model = new JyrUserModel();
+    		BeanUtils.copyProperties(vo, model);
+    		
+    	
+    		jyrUserService.add(model);
+    	} else {
+    		//修改
+    		JyrUserModel model = jyrUserService.findById(vo.getId());
+    		BeanUtils.copyProperties(vo, model);
+    		jyrUserService.update(model);
+    	}
+    	return success();
+    }
+    /**
+     * 添加或修改证书
+     * @param vo
+     * @return
+     */
+    @RequestMapping("saveBlob")
+    @ResponseBody
+    public WebJsonResult saveBlob ( HttpServletRequest request,BloBVo vo) {
+    	String path = request.getSession().getServletContext().getRealPath("");
+    	
+    	// 创建一个通用的多部分解析器
+    	CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession()
+    	        .getServletContext());
+    	// 判断 request 是否有文件上传,即多部分请求
+    	if (multipartResolver.isMultipart(request)) {
+    		// 转换成多部分request
+    	    MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+    	    // 取得request中的所有文件名
+    	}
+    	String sys = "C:\\Users\\Administrator\\Desktop\\";
+    	InputStream inputStream;
+    	byte[] data = new byte[] {};
+		try {
+			inputStream = new FileInputStream(new File(sys+vo.getFile()));
+			data = inputStreamToByte(inputStream);
+		} catch (FileNotFoundException e1) {
+			e1.printStackTrace();
+		}catch (IOException e) {
+			e.printStackTrace();
+		}
+		//将文件保存到字节数组中
+    	if (StringUtils.isEmpty(vo.getId())) {
+    		//添加
+    		BloBModel model = new BloBModel();
+    		BeanUtils.copyProperties(vo, model);
+    		model.setValue(data);
+    		bloBService.add(model);
+    	} else {
+    		//修改
+    		BloBModel model = bloBService.findById(vo.getId());
+    		BeanUtils.copyProperties(vo, model);
+    		bloBService.update(model);
+    	}
+    	return success();
+    }
+    private byte [] inputStreamToByte(InputStream is) throws IOException {
+    	ByteArrayOutputStream bAOutputStream = new ByteArrayOutputStream();
+    	int ch;
+    	while((ch = is.read() ) != -1){
+    	bAOutputStream.write(ch);
+    	}
+    	byte data [] =bAOutputStream.toByteArray();
+    	bAOutputStream.close();
+    	return data;
+    }
+   /**
+     * 删除信息，可多条删除
+     * @param ids
+     * @return
+     */
+    @RequestMapping("delJyrUserInfo")
+    @ResponseBody
+    public WebJsonResult delJyrInfo (String ids) {
+    	String[] idArray = ids.split(",");
+    	if (idArray != null && idArray.length > 0 ) {
+    		for (String id : idArray) {
+    			JyrUserModel model = jyrUserService.findById(id);
+        		model.setState(BaseUUIDModel.STATE_DELETE);
+        		jyrUserService.update(model);
+    		}
+    	}
+    	return success();
+    }
+    /**
+     * 导出
+     * @param model
+     * @param request
+     * @param response
+     *//*
+    @RequestMapping("printJyrInfo")
+    @ResponseBody
+    public void printJyrInfo (JyrjcxxModel model,HttpServletRequest request,HttpServletResponse response) {
+		
+    	List<JyrInfoExcelModel> list = jyrjcxxService.selectExcelList(model);
+    	//数据加工处理
+    	for (int i = 0; i < list.size(); i++) {
+    		JyrInfoExcelModel jyr = list.get(0);
+    		if (jyr.getSfwhqy() != null && !"".equals(jyr.getSfwhqy())) {
+    			if ("Y".equals(jyr.getSfwhqy())) {
+    				jyr.setSfwhqy("是");
+    			} else if ("W".equals(jyr.getSfwhqy())) {
+    				jyr.setSfwhqy("是");
+    			} else if ("N".equals(jyr.getSfwhqy())) {
+    				jyr.setSfwhqy("否");
+    			}
+    			if ("Y".equals(jyr.getSfwhqy2())) {
+    				jyr.setSfwhqy2("是");
+    			} else if ("W".equals(jyr.getSfwhqy2())) {
+    				jyr.setSfwhqy2("否");
+    			} else if ("N".equals(jyr.getSfwhqy2())) {
+    				jyr.setSfwhqy2("否");
+    			}
+    			list.remove(0);
+    			list.add(jyr);
+    		}	
+		}
+    	ExportExcel<JyrInfoExcelModel> excel = new ExportExcel<JyrInfoExcelModel>();
+    	String[] heads = {"经营人名称","类别","是否危货企业","有无重大危险源","港口经营许可证","港口危险作业附证编号","经营范围","法定代表人","安全部门负责人","值班电话","所在地","所在港区"};
+    	excel.exportExcel("经营人管理信息", heads , list, request, response);
+    }
+   */
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrWxhwtjcxCtl.java

@@ -2,6 +2,9 @@ package com.xt.js.gkaq.web.ctl;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -9,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.common.ExportExcel;
 import com.xt.js.gkaq.frame.service.CodeService;
 import com.xt.js.gkaq.web.model.CkModel;
 import com.xt.js.gkaq.web.model.TjcxModel;
@@ -29,7 +33,7 @@ public class JyrWxhwtjcxCtl extends BaseCtl {
 	private JyrWxhwtjcxService service;
     
     /**
-     * 鏁版嵁琛ㄦ牸
+     * 数据表格
      * @param vo
      * @return
      */
@@ -51,4 +55,45 @@ public class JyrWxhwtjcxCtl extends BaseCtl {
 		return pageResult;
     }
   
+    /**
+     * 打印
+     * @param model
+     * @param request
+     * @param response
+     */
+    @RequestMapping("printJyrWxhuTjInfo")
+    @ResponseBody
+    public void printJyrWxhuTjInfo (WxhwtjcxModel model, HttpServletRequest request, HttpServletResponse response) {
+    	List<WxhwtjcxModel> list = service.selectByInfo(model);
+    	//数据加工处理
+    	for (int i = 0; i < list.size(); i++) {
+    		WxhwtjcxModel jyr = list.get(0);
+    		if (jyr.getWd() == null || "".equals(jyr.getWd())) {
+    			jyr.setWd("0");
+    		}
+    		if (jyr.getQd() == null || "".equals(jyr.getQd())) {
+    			jyr.setQd("0");
+    		}
+    		if (jyr.getSffz() != null && !"".equals(jyr.getSffz())) {
+    			jyr.setSffz("是");
+    		} else {
+    			jyr.setSffz("否");
+    		}
+    		if (jyr.getQylx() != null && !"".equals(jyr.getQylx())) {
+    			if ("1".equals(jyr.getQylx())) {
+    				jyr.setQylx("沿江");
+    			} else if ("2".equals(jyr.getQylx())) {
+    				jyr.setQylx("沿海");
+    			} else if ("3".equals(jyr.getQylx())) {
+    				jyr.setQylx("内河");
+    			}
+    		}
+    		list.remove(0);
+			list.add(jyr);
+    	}
+    	ExportExcel<WxhwtjcxModel> excel = new ExportExcel<WxhwtjcxModel>();
+    	String[] heads = {"所在地","企业名称","类别","码头名称","万吨级泊位数量","千吨级泊位数量","吞吐量(TEU)","吞吐量(吨)","所在港区",
+    						"建设规模","是否持有附证","主要作业货种","所在区域"};
+    	excel.exportExcel("经营人港口危险货物企业统计信息", heads , list, request, response);
+    }
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrjcxxCtl.java

@@ -1,26 +1,35 @@
 package com.xt.js.gkaq.web.ctl;
 
+import java.io.UnsupportedEncodingException;
+import java.sql.Blob;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import com.alibaba.fastjson.JSONArray;
+import com.sun.tools.corba.se.idl.constExpr.And;
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.ExportExcel;
+import com.xt.js.gkaq.dwxx.model.JyrInfoExcelModel;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.dwxx.model.*;
+import com.xt.js.gkaq.web.model.BloBModel;
 import com.xt.js.gkaq.web.model.GqModel;
 import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.vo.JyrjcxxVo;
@@ -42,24 +51,24 @@ public class JyrjcxxCtl extends BaseCtl {
     //    @RequiresPermissions("jyr:main")
     @RequestMapping("")
     public String main(HttpServletRequest request) {
-    	//鍔犺浇鎵€鍦ㄥ湴
+    	//加载所在地
     	List<ComboBoxDto> list = codeService.findByPcode("DM_SZD");
     	request.setAttribute("code", list);
         return "dwxx/jyr/main";
     }
     /**
-     * 鍔犺浇鎵€鍦ㄥ湴
+     * 加载所在地
      * @return
      */
     @RequestMapping("getszd")
     @ResponseBody
     public String getszd() {
-    	//鍔犺浇鎵€鍦ㄥ湴
+    	//加载所在地
     	List<ComboBoxDto> list = codeService.findByPcode("DM_SZD");
     	return JSONArray.toJSONString(list);
     }
     /***
-     * 鍔ㄦ€佸叧鑱斾笅鎷夋�鏁版嵁
+     * 动态关联下拉框数据
      * @param request
      * @param szd
      * @return
@@ -70,12 +79,12 @@ public class JyrjcxxCtl extends BaseCtl {
 //    	model.setSzd("");
     	GqModel model = new GqModel();
     	model.setSzd(szd);
-    	//鑾峰彇娓�尯
+    	//获取港区
     	List<ComboBoxDto> gqlist = gqService.selectByInfo(model);
     	return JSONArray.toJSONString(gqlist);
     }
     /**
-     * 鏁版嵁琛ㄦ牸
+     * 数据表格
      * @param vo
      * @return
      */
@@ -97,7 +106,7 @@ public class JyrjcxxCtl extends BaseCtl {
     }
     
     /**
-     * 缂栬緫璇︽儏
+     * 编辑详情
      * @return
      */
     @RequestMapping("initEdit")
@@ -110,7 +119,7 @@ public class JyrjcxxCtl extends BaseCtl {
     	return JSONArray.toJSONString(jyrjcxxModel);
     } 
     /**
-     * 鍔犺浇涓婄骇娓�彛缁忚惀浜轰俊鎭�
+     * 加载上级港口经营人信息
      * @param szd
      * @return
      */
@@ -122,7 +131,7 @@ public class JyrjcxxCtl extends BaseCtl {
     }
     
     /**
-     * 鍔犺浇鎵€灞炶�涓氬ぇ绫�
+     * 加载所属行业大类
      * @return
      */
     @RequestMapping("gethydl")
@@ -132,7 +141,7 @@ public class JyrjcxxCtl extends BaseCtl {
     	return JSONArray.toJSONString(list);
     }
     /**
-     * 鍔犺浇鎵€灞炶�涓氫腑绫�
+     * 加载所属行业中类
      * @return
      */
     @RequestMapping("gethyz")
@@ -142,7 +151,7 @@ public class JyrjcxxCtl extends BaseCtl {
     	return JSONArray.toJSONString(list);
     }
     /**
-     * 娣诲姞鎴栦慨鏀�
+     * 添加或修改
      * @param vo
      * @return
      * @throws ParseException 
@@ -151,7 +160,7 @@ public class JyrjcxxCtl extends BaseCtl {
     @ResponseBody
     public WebJsonResult save (JyrjcxxVo vo) throws ParseException {
     	if (StringUtils.isEmpty(vo.getId())) {
-    		//娣诲姞
+    		//添加
     		JyrjcxxModel model = new JyrjcxxModel();
     		BeanUtils.copyProperties(vo, model);
     		model.setRecordCode("0");
@@ -162,7 +171,7 @@ public class JyrjcxxCtl extends BaseCtl {
     		model.setBayxq(sdf.parse(vo.getBayxq()));
     		jyrjcxxService.add(model);
     	} else {
-    		//淇�敼
+    		//修改
     		JyrjcxxModel model = jyrjcxxService.findById(vo.getId());
     		BeanUtils.copyProperties(vo, model);
     		jyrjcxxService.update(model);
@@ -171,7 +180,7 @@ public class JyrjcxxCtl extends BaseCtl {
     }
     
     /**
-     * 鍒犻櫎淇℃伅锛屽彲澶氭潯鍒犻櫎
+     * 删除信息，可多条删除
      * @param ids
      * @return
      */
@@ -181,7 +190,7 @@ public class JyrjcxxCtl extends BaseCtl {
     	String[] idArray = ids.split(",");
     	if (idArray != null && idArray.length > 0 ) {
     		for (String id : idArray) {
-        		//淇�敼
+        		//修改
         		JyrjcxxModel model = jyrjcxxService.findById(id);
         		model.setState(BaseUUIDModel.STATE_DELETE);
         		jyrjcxxService.update(model);
@@ -189,4 +198,42 @@ public class JyrjcxxCtl extends BaseCtl {
     	}
     	return success();
     }
+    /**
+     * 导出
+     * @param model
+     * @param request
+     * @param response
+     */
+    @RequestMapping("printJyrInfo")
+    @ResponseBody
+    public void printJyrInfo (JyrjcxxModel model,HttpServletRequest request,HttpServletResponse response) {
+		
+    	List<JyrInfoExcelModel> list = jyrjcxxService.selectExcelList(model);
+    	//数据加工处理
+    	for (int i = 0; i < list.size(); i++) {
+    		JyrInfoExcelModel jyr = list.get(0);
+    		if (jyr.getSfwhqy() != null && !"".equals(jyr.getSfwhqy())) {
+    			if ("Y".equals(jyr.getSfwhqy())) {
+    				jyr.setSfwhqy("是");
+    			} else if ("W".equals(jyr.getSfwhqy())) {
+    				jyr.setSfwhqy("是");
+    			} else if ("N".equals(jyr.getSfwhqy())) {
+    				jyr.setSfwhqy("否");
+    			}
+    			if ("Y".equals(jyr.getSfwhqy2())) {
+    				jyr.setSfwhqy2("是");
+    			} else if ("W".equals(jyr.getSfwhqy2())) {
+    				jyr.setSfwhqy2("否");
+    			} else if ("N".equals(jyr.getSfwhqy2())) {
+    				jyr.setSfwhqy2("否");
+    			}
+    			list.remove(0);
+    			list.add(jyr);
+    		}	
+		}
+    	ExportExcel<JyrInfoExcelModel> excel = new ExportExcel<JyrInfoExcelModel>();
+    	String[] heads = {"经营人名称","类别","是否危货企业","有无重大危险源","港口经营许可证","港口危险作业附证编号","经营范围","法定代表人","安全部门负责人","值班电话","所在地","所在港区"};
+    	excel.exportExcel("经营人管理信息", heads , list, request, response);
+    }
+   
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/MenuCtl.java

@@ -47,6 +47,7 @@ public class MenuCtl extends BaseCtl {
         return "frame/menu";
     }
 
+
     /**
      * 初始化页面加载树
      * 
@@ -110,6 +111,7 @@ public class MenuCtl extends BaseCtl {
      * @param id
      * @return
      */
+
     @RequestMapping("getRecord")
     @ResponseBody
     public MenuModel getRecord(String id) {
@@ -142,7 +144,7 @@ public class MenuCtl extends BaseCtl {
     }
 
     /**
-     * 递归删除
+     * 锟捷癸拷删锟斤拷
      * 
      * @param id
      */
@@ -150,7 +152,7 @@ public class MenuCtl extends BaseCtl {
 
         MenuModel model = menuService.findById(id);
         if (model == null) {
-            // 删除按钮
+            // 删锟斤拷钮
             buttonService.deleteLogicByID(id);
             return;
         }
@@ -160,7 +162,7 @@ public class MenuCtl extends BaseCtl {
                 delByPid(data.getId());
             }
         } else {
-            // 删除末级菜单关联的按钮
+            // 删锟斤拷末锟斤拷锟剿碉拷锟斤拷锟斤拷锟侥帮拷钮
             buttonService.deleteByMenu(id);
         }
         menuService.deleteLogicByID(id);
@@ -177,12 +179,12 @@ public class MenuCtl extends BaseCtl {
     public WebJsonResult save(MenuVo menuVo) {
 
         if (StringUtils.isEmpty(menuVo.getId())) {
-            // 新增
+            // 锟斤拷锟斤拷
             MenuModel menuModel = new MenuModel();
             BeanUtils.copyProperties(menuVo, menuModel);
             menuService.add(menuModel);
         } else {
-            // 更新
+            // 锟斤拷锟斤拷
             MenuModel menuModel = menuService.findById(menuVo.getId());
             BeanUtils.copyProperties(menuVo, menuModel);
             menuService.update(menuModel);

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/OrgCtl.java

@@ -189,4 +189,5 @@ public class OrgCtl extends BaseCtl {
         return JSONArray.toJSONString(list);
     }
 
+
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/UserCtl.java

@@ -47,14 +47,14 @@ public class UserCtl extends BaseCtl {
     }
 
 	/**
-	 * 初始化页面加载数据
+	 * 锟斤拷始锟斤拷页锟斤拷锟斤拷锟斤拷锟斤拷
 	 * @throws UnsupportedEncodingException 
 	 */
     @RequestMapping("list")
     @ResponseBody
     @SysLog(description="用户列表查询")
 	public PageInfo<UserModel> getPageInfo(UserVo vo) throws UnsupportedEncodingException {
-		// 初始化参数
+		// 锟斤拷始锟斤拷锟斤拷锟斤拷
 		if (null == vo.getPage() || vo.getPage() < 1) {
 			vo.setPage(1);
 		}
@@ -91,7 +91,7 @@ public class UserCtl extends BaseCtl {
     }
 
     /**
-     * 保存
+     * 锟斤拷锟斤拷
      * @param vo
      * @return
      */
@@ -100,24 +100,24 @@ public class UserCtl extends BaseCtl {
     @Transactional
     @SysLog(description="保存用户数据")
     public WebJsonResult save(UserVo vo) {
-        // 新增
+        // 锟斤拷锟斤拷
         if(StringUtils.isEmpty(vo.getId())) {
             UserModel model = new UserModel();
             BeanUtils.copyProperties(vo, model);
-            // 登录密码:123456
+            // 锟斤拷录锟斤拷锟斤拷:123456
             String pwd = new Sha256Hash("123456").toHex();
             model.setLoginPassword(pwd);
             userService.add(model);
             UserInfoModel userInfoModel = new UserInfoModel();
             BeanUtils.copyProperties(vo, userInfoModel);
             userInfoModel.setId(model.getId());
-            // 是否经营人
+            // 锟角凤拷营锟斤拷
             if (GlobalData.CHK_YES.equals(vo.getIfAdmin())) {
                 userInfoModel.setIfOperator(GlobalData.CHK_NO);
             } else {
                 userInfoModel.setIfOperator(GlobalData.CHK_YES);
             }
-            // 所属船代
+            // 锟斤拷锟斤拷锟斤拷锟斤拷
             if (GlobalData.CHK_YES.equals(vo.getIfShip())) {
                 userInfoModel.setBelongsOrg(userInfoModel.getBelongsShip());
             }
@@ -127,7 +127,7 @@ public class UserCtl extends BaseCtl {
             userGroupModel.setGroupId(vo.getGroupid());
             userGroupService.add(userGroupModel);
         } else {
-            // 更新
+            // 锟斤拷锟斤拷
             UserModel model = userService.findById(vo.getId());
             BeanUtils.copyProperties(vo, model);
             userService.update(model);
@@ -167,8 +167,8 @@ public class UserCtl extends BaseCtl {
 			for(String id : idArr) {
 				if(StringUtils.isNotEmpty(id)) {
 					cnt += userService.deleteLogicByID(id);
-					userInfoService.deleteLogicByID(id);
-					userGroupService.deleteLogicByID(id);
+					/*userInfoService.deleteLogicByID(id);
+					userGroupService.deleteLogicByID(id);*/
 				}
 			}
 		}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/WxcgtjcxCtl.java

@@ -0,0 +1,100 @@
+package com.xt.js.gkaq.web.ctl;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.common.ExportExcel;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.model.WxcgtjcxModel;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.JyrTjcxService;
+import com.xt.js.gkaq.web.service.JyrWxhwtjcxService;
+import com.xt.js.gkaq.web.service.WxcgtjcxService;
+import com.xt.js.gkaq.web.vo.CkVo;
+import com.xt.js.gkaq.web.vo.TjcxVo;
+import com.xt.js.gkaq.web.vo.WxcgtjcxVo;
+import com.xt.js.gkaq.web.vo.WxhwtjcxVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+
+@Controller
+@RequestMapping(value = "/wxcg", produces = "application/json; charset=utf-8")
+public class WxcgtjcxCtl extends BaseCtl {
+	@Autowired
+	private WxcgtjcxService service;
+    
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<WxcgtjcxModel> list(WxcgtjcxVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		WxcgtjcxModel model = new WxcgtjcxModel();
+		BeanUtils.copyProperties(vo, model);
+		
+		List<WxcgtjcxModel> list = service.selectByInfo(model);
+		PageInfo<WxcgtjcxModel> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+  
+    /**
+     * 打印
+     * @param model
+     * @param request
+     * @param response
+     */
+    @RequestMapping("printJyrWxcgTjInfo")
+    @ResponseBody
+    public void printJyrWxcgTjInfo (WxcgtjcxModel model, HttpServletRequest request,HttpServletResponse response) {
+    	List<WxcgtjcxModel> list = service.selectByInfo(model);
+    	//数据加工处理
+    	for (int i = 0; i < list.size(); i++) {
+    		WxcgtjcxModel jyr = list.get(0);
+    		if (jyr.getSl() == null || "".equals(jyr.getSl())) {
+    			jyr.setSl("0");
+    		}
+    		if (jyr.getRj() == null || "".equals(jyr.getRj())) {
+    			jyr.setRj(new BigDecimal(0));
+    		}
+    		if (jyr.getWxsl() == null || "".equals(jyr.getWxsl())) {
+    			jyr.setWxsl("0");
+    		}
+    		if (jyr.getQylx() != null && !"".equals(jyr.getQylx())) {
+    			if ("1".equals(jyr.getQylx())) {
+    				jyr.setQylx("沿江");
+    			} else if ("2".equals(jyr.getQylx())) {
+    				jyr.setQylx("沿海");
+    			} else if ("3".equals(jyr.getQylx())) {
+    				jyr.setQylx("内河");
+    			}
+    		}
+    		list.remove(0);
+			list.add(jyr);
+    	}
+    	ExportExcel<WxcgtjcxModel> excel = new ExportExcel<WxcgtjcxModel>();
+    	String[] heads = {"所在地","企业名称","类别","储罐个数","容积(万立方)","型号个数(万立方*个)","主要作业货种","重大危险源储罐(个)","所在区域"};
+    	excel.exportExcel("经营人危险存储设施统计信息", heads , list, request, response);
+    }
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/WxhwCtl.java

@@ -26,7 +26,7 @@ public class WxhwCtl extends BaseCtl {
 	private WxhwService service;
 	
 	/**
-     * 数�表格
+     * Êý¾Ý±í¸ñ
      * @param vo
      * @return
      */

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/BloBModelMapper.java

@@ -0,0 +1,8 @@
+package com.xt.js.gkaq.web.mappers;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.BloBModel;
+
+public interface BloBModelMapper extends BaseMapper<BloBModel> {
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/JyrUserModelMapper.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.JyrUserListModel;
+import com.xt.js.gkaq.web.model.JyrUserModel;
+
+public interface JyrUserModelMapper extends BaseMapper<JyrUserModel> {
+	public List<JyrUserListModel> selectByInfo(JyrUserModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/RyzsbModelMapper.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.RyzsbModel;
+
+public interface RyzsbModelMapper extends BaseMapper<RyzsbModel> {
+	public List<RyzsbModel> selectByInfo(RyzsbModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/mappers/WxcgtjcxMapper.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.mappers;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.web.model.WxcgtjcxModel;
+
+public interface WxcgtjcxMapper extends BaseMapper<WxcgtjcxModel> {
+	public List<WxcgtjcxModel> selectByInfo(WxcgtjcxModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/BloBModel.java

@@ -0,0 +1,112 @@
+package com.xt.js.gkaq.web.model;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 大字段Model
+ * @author 李小虎
+ *
+ */
+public class BloBModel extends BaseUUIDModel {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7051784479056438014L;
+
+	private byte[] value;
+	
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String szd;//所在地
+	
+	
+	public byte[] getValue() {
+		return value;
+	}
+	public void setValue(byte[] value) {
+		this.value = value;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/BwInfoModel.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.model;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 娉婁綅Model
- * @author 鏉庡皬铏�
+ * 泊位Model
+ * @author 李小虎
  *
  */
 public class BwInfoModel extends BaseUUIDModel {
@@ -12,38 +12,38 @@ public class BwInfoModel extends BaseUUIDModel {
 	 * 
 	 */
 	private static final long serialVersionUID = 1856022900011957047L;
-	private String szd;//鎵€鍦ㄥ湴
-	private Long szgq;//鎵€鍦ㄦ腐鍖�
-	private Long qymc;//缁忚惀浜哄悕绉帮紙id锛�
-	private Long mtmc;//鐮佸ご鍚嶇О(id)
-	private String mtName;//鐮佸ご鍚嶇О
-	private String bwmc;//娉婁綅鍚嶇О
-	private Long bwsx;//娉婁綅灞炴€�
-	private Long bwszsx;//娉婁綅鎵€鍦ㄦ按绯�
-	private Long fwlx;//鏈嶅姟绫诲瀷
-	private Long tcnf;//鎶曚骇骞翠唤
-	private Long jgxs;//缁撴瀯鍨嬪紡
-	private Long sclx;//鐢熶骇绫诲瀷
-	private Long jgysnf;//绔ｅ伐楠屾敹骞翠唤
-	private String qysjsh;//鍓嶆部璁捐�姘存繁
-	private String qysjss;//鍓嶆部瀹為檯姘存繁
-	private String bwcd;//娉婁綅闀垮害
-	private String wxpbw;//鍗遍櫓鍝佹硦浣�
-	private String sjtgnl;//璁捐�閫氳繃鑳藉姏
-	private String sjkpnl;//璁捐�闈犳硦鑳藉姏(鍚ㄧ骇)
-	private String nhwtgml;//骞磋揣鐗╅€氳繃鑳藉姏
-	private String nwxhwttl;//骞村嵄闄╄揣鐗╁悶鍚愰噺
-	private Long zyhbwfl;//涓撲笟鍖栨硦浣嶅垎绫�
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String sffz;//鏄�惁鍙戣瘉
-	private String bwyt;//娉婁綅鐢ㄩ€�
-	private String zyrkfw;//浣滀笟璁ゅ彲鑼冨洿
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//经营人名称（id）
+	private Long mtmc;//码头名称(id)
+	private String mtName;//码头名称
+	private String bwmc;//泊位名称
+	private Long bwsx;//泊位属性
+	private Long bwszsx;//泊位所在水系
+	private Long fwlx;//服务类型
+	private Long tcnf;//投产年份
+	private Long jgxs;//结构型式
+	private Long sclx;//生产类型
+	private Long jgysnf;//竣工验收年份
+	private String qysjsh;//前沿设计水深
+	private String qysjss;//前沿实际水深
+	private String bwcd;//泊位长度
+	private String wxpbw;//危险品泊位
+	private String sjtgnl;//设计通过能力
+	private String sjkpnl;//设计靠泊能力(吨级)
+	private String nhwtgml;//年货物通过能力
+	private String nwxhwttl;//年危险货物吞吐量
+	private Long zyhbwfl;//专业化泊位分类
+	private String jd;//经度
+	private String wd;//纬度
+	private String sffz;//是否发证
+	private String bwyt;//泊位用途
+	private String zyrkfw;//作业认可范围
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordCode;//
 	private String byzd1;
 	private String byzd2;
@@ -51,9 +51,9 @@ public class BwInfoModel extends BaseUUIDModel {
 	private String byzd4;
 	private String byzd5;
 	private String jtjgisdyidh;
-	private String hckpnl;//妫€鏌ラ潬娉婅兘鍔�
-	private String zwbwyt;//娉婁綅鐢ㄩ€旀樉绀�
-	private String smid;//鍦板浘id
+	private String hckpnl;//检查靠泊能力
+	private String zwbwyt;//泊位用途显示
+	private String smid;//地图id
 	private String bwdm;//
 	private Long jgxs2;
 	public String getSzd() {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/BwModel.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.model;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 娉婁綅Model
- * @author 鏉庡皬铏�
+ * 泊位Model
+ * @author 李小虎
  *
  */
 public class BwModel extends BaseUUIDModel {
@@ -12,37 +12,37 @@ public class BwModel extends BaseUUIDModel {
 	 * 
 	 */
 	private static final long serialVersionUID = 1856022900011957047L;
-	private String szd;//鎵€鍦ㄥ湴
-	private Long szgq;//鎵€鍦ㄦ腐鍖�
-	private Long qymc;//缁忚惀浜哄悕绉帮紙id锛�
-	private Long mtmc;//鐮佸ご鍚嶇О(id)
-	private String bwmc;//娉婁綅鍚嶇О
-	private Long bwsx;//娉婁綅灞炴€�
-	private Long bwszsx;//娉婁綅鎵€鍦ㄦ按绯�
-	private Long fwlx;//鏈嶅姟绫诲瀷
-	private Long tcnf;//鎶曚骇骞翠唤
-	private Long jgxs;//缁撴瀯鍨嬪紡
-	private Long sclx;//鐢熶骇绫诲瀷
-	private Long jgysnf;//绔ｅ伐楠屾敹骞翠唤
-	private String qysjsh;//鍓嶆部璁捐�姘存繁
-	private String qysjss;//鍓嶆部瀹為檯姘存繁
-	private String bwcd;//娉婁綅闀垮害
-	private String wxpbw;//鍗遍櫓鍝佹硦浣�
-	private String sjtgnl;//璁捐�閫氳繃鑳藉姏
-	private String sjkpnl;//璁捐�闈犳硦鑳藉姏(鍚ㄧ骇)
-	private String nhwtgml;//骞磋揣鐗╅€氳繃鑳藉姏
-	private String nwxhwttl;//骞村嵄闄╄揣鐗╁悶鍚愰噺
-	private Long zyhbwfl;//涓撲笟鍖栨硦浣嶅垎绫�
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String sffz;//鏄�惁鍙戣瘉
-	private String bwyt;//娉婁綅鐢ㄩ€�
-	private String zyrkfw;//浣滀笟璁ゅ彲鑼冨洿
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//经营人名称（id）
+	private Long mtmc;//码头名称(id)
+	private String bwmc;//泊位名称
+	private Long bwsx;//泊位属性
+	private Long bwszsx;//泊位所在水系
+	private Long fwlx;//服务类型
+	private Long tcnf;//投产年份
+	private Long jgxs;//结构型式
+	private Long sclx;//生产类型
+	private Long jgysnf;//竣工验收年份
+	private String qysjsh;//前沿设计水深
+	private String qysjss;//前沿实际水深
+	private String bwcd;//泊位长度
+	private String wxpbw;//危险品泊位
+	private String sjtgnl;//设计通过能力
+	private String sjkpnl;//设计靠泊能力(吨级)
+	private String nhwtgml;//年货物通过能力
+	private String nwxhwttl;//年危险货物吞吐量
+	private Long zyhbwfl;//专业化泊位分类
+	private String jd;//经度
+	private String wd;//纬度
+	private String sffz;//是否发证
+	private String bwyt;//泊位用途
+	private String zyrkfw;//作业认可范围
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordCode;//
 	private String byzd1;
 	private String byzd2;
@@ -50,9 +50,9 @@ public class BwModel extends BaseUUIDModel {
 	private String byzd4;
 	private String byzd5;
 	private String jtjgisdyidh;
-	private String hckpnl;//妫€鏌ラ潬娉婅兘鍔�
-	private String zwbwyt;//娉婁綅鐢ㄩ€旀樉绀�
-	private String smid;//鍦板浘id
+	private String hckpnl;//检查靠泊能力
+	private String zwbwyt;//泊位用途显示
+	private String smid;//地图id
 	private String bwdm;//
 	private Long jgxs2;
 	public String getSzd() {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/CkModel.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.model;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 浠撳簱Model
- * @author 鏉庡皬铏�
+ * 仓库Model
+ * @author 李小虎
  *
  */
 public class CkModel extends BaseUUIDModel {
@@ -12,36 +12,36 @@ public class CkModel extends BaseUUIDModel {
 	 * 
 	 */
 	private static final long serialVersionUID = 2605248010407095407L;
-	private Long ssjyr;//鎵€灞炵粡钀ヤ汉
-	private String szd;//鎵€鍦ㄥ湴
-	private Long gq;//娓�尯
-	private Long mt;//鐮佸ご
-	private String qymc;//浼佷笟鍚嶇О
-	private String ckmc;//浠撳簱鍚嶇О
-	private String wxpck;//鍗遍櫓鍝佷粨搴�
-	private String ckyt;//浠撳簱鐢ㄩ€�
-	private Long ckgs;//浠撳簱涓�暟
-	private Long ythgcgrj;//娑蹭綋鍖栧伐鍌ㄧ綈瀹圭Н
-	private Long scyckmj;//鐢熶骇鐢ㄤ粨搴撻潰绉�
-	private Long wxpckmj;//鍗遍櫓鍝佷粨搴撻潰绉�
-	private Long scyckrj;//鐢熶骇鐢ㄤ粨搴撳�绉�
-	private Long ykrj;//娌瑰簱瀹圭Н
-	private Long cpyrj;//鎴愬搧娌瑰�绉�
-	private Long gisid;//浜ら€氬眬GIS瀵瑰簲id鍙�
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private Long ssjyr;//所属经营人
+	private String szd;//所在地
+	private Long gq;//港区
+	private Long mt;//码头
+	private String qymc;//企业名称
+	private String ckmc;//仓库名称
+	private String wxpck;//危险品仓库
+	private String ckyt;//仓库用途
+	private Long ckgs;//仓库个数
+	private Long ythgcgrj;//液体化工储罐容积
+	private Long scyckmj;//生产用仓库面积
+	private Long wxpckmj;//危险品仓库面积
+	private Long scyckrj;//生产用仓库容积
+	private Long ykrj;//油库容积
+	private Long cpyrj;//成品油容积
+	private Long gisid;//交通局GIS对应id号
+	private String jd;//经度
+	private String wd;//纬度
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;
 	private String byzd3;
 	private String byzd4;
 	private String byzd5;
-	private String zwckyt;//浠撳簱鐢ㄩ€旀樉绀�
+	private String zwckyt;//仓库用途显示
 	public Long getSsjyr() {
 		return ssjyr;
 	}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/DcModel.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.model;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 浠撳簱Model
- * @author 鏉庡皬铏�
+ * 仓库Model
+ * @author 李小虎
  *
  */
 public class DcModel extends BaseUUIDModel {
@@ -12,36 +12,36 @@ public class DcModel extends BaseUUIDModel {
 	 * 
 	 */
 	private static final long serialVersionUID = 5402972991830338558L;
-	private String szd;//鎵€鍦ㄥ湴
-	private Long szgq;//鎵€鍦ㄦ腐鍖�
-	private Long qymc;//浼佷笟鍚嶇О
-	private Long mtmc;//鐮佸ご鍚嶇О
-	private String dcmc;//鍫嗗満鍚嶇О
-	private String scydcyt;//鍫嗗満鐢ㄩ€�
-	private Long dczmj;//鍫嗗満鎬婚潰绉�
-	private Long dczrl;//鍫嗗満鎬诲�閲�
-	private Long jzxmj;//闆嗚�绠卞爢鍦洪潰绉�
-	private Long jzxdcdcnl;//闆嗚�绠卞爢鍦哄爢瀛橀潰绉�
-	private Long wxpxdcmj;//鍗遍櫓鍝佸爢鍦洪潰绉�
-	private Long wxpxdcdcnl;//鍗遍櫓鍝佸爢鍦哄爢瀛樿兘鍔�
-	private String wxpdc;//鏄�惁鏄�嵄闄╁搧鍫嗗満
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//企业名称
+	private Long mtmc;//码头名称
+	private String dcmc;//堆场名称
+	private String scydcyt;//堆场用途
+	private Long dczmj;//堆场总面积
+	private Long dczrl;//堆场总容量
+	private Long jzxmj;//集装箱堆场面积
+	private Long jzxdcdcnl;//集装箱堆场堆存面积
+	private Long wxpxdcmj;//危险品堆场面积
+	private Long wxpxdcdcnl;//危险品堆场堆存能力
+	private String wxpdc;//是否是危险品堆场
 	
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String jtjgisdyidh;//浜ら€氬眬GIS瀵瑰簲id鍙�
+	private String jd;//经度
+	private String wd;//纬度
+	private String jtjgisdyidh;//交通局GIS对应id号
 	
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;
 	private String byzd3;
 	private String byzd4;
 	private String byzd5;
-	private String zwdcyt;//鍫嗗満鐢ㄩ€旀樉绀�
+	private String zwdcyt;//堆场用途显示
 	public String getSzd() {
 		return szd;
 	}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/FjbModel.java

@@ -0,0 +1,112 @@
+package com.xt.js.gkaq.web.model;
+
+import java.sql.Blob;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 附件表Model
+ * @author 李小虎
+ *
+ */
+public class FjbModel extends BaseUUIDModel {
+	
+	private String wjm;
+	private String wjhzm;
+	private String bz;
+	private String wjcflj;
+	private String wjnr;
+	private String wjdx;
+	private String ssid;
+	private String sslx;
+	private String lx;
+	private String gq;
+	
+	
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String szd;//所在地
+	
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/GqModel.java

@@ -8,32 +8,32 @@ public class GqModel extends BaseUUIDModel {
 	 */
 	private static final long serialVersionUID = -4635108369387619903L;
 	private Long uuid;
-	private String szd;//鎵€鍦ㄥ湴
-	private Long ssgk;//鎵€灞炴腐鍙�
-	private String gqmc;//娓�彛鍚嶇О
-	private String gqszsylx;//娓�尯鎵€鍦ㄦ按鍩熺被鍨嬨€€瀛楀吀琛ㄣ€€娌挎捣 娌虫祦 婀栨硦 姘村簱
-	private String gqmj;//娓�尯闈㈢Н(涓囧钩鏂圭背)
-	private String lymj;//闄嗗煙闈㈢Н(涓囧钩鏂圭背)
-	private String syfw;//姘村煙鑼冨洿
-	private String symj;//姘村煙闈㈢Н(涓囧钩鏂圭背)
-	private String gqghmj;//娓�尯瑙勫垝闈㈢Н(涓囧钩鏂圭背)
-	private String ghlymj;//瑙勫垝闄嗗煙闈㈢Н(涓囧钩鏂圭背)
-	private String fgyscydghmj;//闈炲伐涓氱敓浜х敤鍦拌�鍒掗潰绉�(涓囧钩鏂圭背)
-	private String ghsymj;//瑙勫垝姘村煙闈㈢Н(涓囧钩鏂圭背)
-	private String gqzraxcd;//娓�尯鑷�劧宀哥嚎闀垮害(绫�)
-	private String gymtaxcd;//鍏�敤鐮佸ご宀哥嚎闀垮害(绫�)
-	private String gqgkaxcd;//娓�尯娓�彛宀哥嚎闀垮害(绫�)
-	private String gkssysyaxcd;//娓�彛璁炬柦宸蹭娇鐢ㄥ哺绾块暱搴�(绫�)
-	private String gqdmbdzdz;//娓�尯鍦伴潰鍧″害鏈€澶у€�
-	private String bz;//澶囨敞
-	private String adduser;//鍒涘缓浜�
-	private String updateuser;//淇�敼浜�
-	private Long recordstatus;//鍒犻櫎鐘舵€�
-	private String sftb;//鏄�惁鍚屾� Y鎴栬€匩
-	private String tbzt;//鍚屾�鐘舵€� 宸插悓姝�锛� 鏈�悓姝�
-	private Long tbdyid;//鍚屾�瀵瑰簲ID
-	private String qylb;//鍖哄煙绫诲埆锛岀渷绾ц繕鏄�競绾�
-	private Long ssqy;//鎵€灞炲尯鍩燂紝鍏宠仈缁勭粐鏋舵瀯琛ㄧ殑涓婚敭
+	private String szd;//所在地
+	private Long ssgk;//所属港口
+	private String gqmc;//港口名称
+	private String gqszsylx;//港区所在水域类型　字典表　沿海 河流 湖泊 水库
+	private String gqmj;//港区面积(万平方米)
+	private String lymj;//陆域面积(万平方米)
+	private String syfw;//水域范围
+	private String symj;//水域面积(万平方米)
+	private String gqghmj;//港区规划面积(万平方米)
+	private String ghlymj;//规划陆域面积(万平方米)
+	private String fgyscydghmj;//非工业生产用地规划面积(万平方米)
+	private String ghsymj;//规划水域面积(万平方米)
+	private String gqzraxcd;//港区自然岸线长度(米)
+	private String gymtaxcd;//公用码头岸线长度(米)
+	private String gqgkaxcd;//港区港口岸线长度(米)
+	private String gkssysyaxcd;//港口设施已使用岸线长度(米)
+	private String gqdmbdzdz;//港区地面坡度最大值
+	private String bz;//备注
+	private String adduser;//创建人
+	private String updateuser;//修改人
+	private Long recordstatus;//删除状态
+	private String sftb;//是否同步 Y或者N
+	private String tbzt;//同步状态 已同步Y， 未同步N
+	private Long tbdyid;//同步对应ID
+	private String qylb;//区域类别，省级还是市级
+	private Long ssqy;//所属区域，关联组织架构表的主键
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/JyrUserListModel.java

@@ -0,0 +1,135 @@
+package com.xt.js.gkaq.web.model;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 经营人人员基本信息扩展Model
+ * @author 李小虎
+ *
+ */
+public class JyrUserListModel{
+	
+	private String id;
+	private String xm;
+	private String zwhzc;
+	private Long fzzyid;
+	private String zsmc;
+	private String zsbh;
+	private Date yxq;
+	private Long zszl;
+	private Long ssgq;
+	private String gqmc;
+	private String bz;
+	private String ssjyr;
+	private String jyrmc;
+	private String szd;
+	private String szdmc;
+	private String rylx;
+	private String rylxmc;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getXm() {
+		return xm;
+	}
+	public void setXm(String xm) {
+		this.xm = xm;
+	}
+	public String getZwhzc() {
+		return zwhzc;
+	}
+	public void setZwhzc(String zwhzc) {
+		this.zwhzc = zwhzc;
+	}
+	public Long getFzzyid() {
+		return fzzyid;
+	}
+	public void setFzzyid(Long fzzyid) {
+		this.fzzyid = fzzyid;
+	}
+	public String getZsmc() {
+		return zsmc;
+	}
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+	public String getZsbh() {
+		return zsbh;
+	}
+	public void setZsbh(String zsbh) {
+		this.zsbh = zsbh;
+	}
+	public Date getYxq() {
+		return yxq;
+	}
+	public void setYxq(Date yxq) {
+		this.yxq = yxq;
+	}
+	public Long getZszl() {
+		return zszl;
+	}
+	public void setZszl(Long zszl) {
+		this.zszl = zszl;
+	}
+	public Long getSsgq() {
+		return ssgq;
+	}
+	public void setSsgq(Long ssgq) {
+		this.ssgq = ssgq;
+	}
+	public String getGqmc() {
+		return gqmc;
+	}
+	public void setGqmc(String gqmc) {
+		this.gqmc = gqmc;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
+	}
+	public String getJyrmc() {
+		return jyrmc;
+	}
+	public void setJyrmc(String jyrmc) {
+		this.jyrmc = jyrmc;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getSzdmc() {
+		return szdmc;
+	}
+	public void setSzdmc(String szdmc) {
+		this.szdmc = szdmc;
+	}
+	public String getRylx() {
+		return rylx;
+	}
+	public void setRylx(String rylx) {
+		this.rylx = rylx;
+	}
+	public String getRylxmc() {
+		return rylxmc;
+	}
+	public void setRylxmc(String rylxmc) {
+		this.rylxmc = rylxmc;
+	}
+	
+}
+
+

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/JyrUserModel.java

@@ -0,0 +1,235 @@
+package com.xt.js.gkaq.web.model;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 经营人人员基本信息Model
+ * @author 李小虎
+ *
+ */
+public class JyrUserModel extends BaseUUIDModel {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2406484306898976457L;
+	private String xm;
+	private String xb;
+	private String zwhzc;
+	private String lxdh;
+	private String sjhm;
+	private Date csrq;
+	private String sfkdl;
+	private String sftb;
+	private String tbzt;
+	private Long tbdyid;
+	private String qylb;
+	private Long ssqy;
+	private String recordcode;
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private Long fzzyid;
+	private String sfzh;
+	private String zsmc;
+	private String zsbh;
+	private String fzbm;
+	private Date yxq;
+	private Long zszl;
+	private Long ssgq;
+	private String bz;
+	private String ssjyr;
+	private String zjlx;
+	private String szd;
+	private String rylx;
+	public String getXm() {
+		return xm;
+	}
+	public void setXm(String xm) {
+		this.xm = xm;
+	}
+	public String getXb() {
+		return xb;
+	}
+	public void setXb(String xb) {
+		this.xb = xb;
+	}
+	public String getZwhzc() {
+		return zwhzc;
+	}
+	public void setZwhzc(String zwhzc) {
+		this.zwhzc = zwhzc;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getSjhm() {
+		return sjhm;
+	}
+	public void setSjhm(String sjhm) {
+		this.sjhm = sjhm;
+	}
+	public Date getCsrq() {
+		return csrq;
+	}
+	public void setCsrq(Date csrq) {
+		this.csrq = csrq;
+	}
+	public String getSfkdl() {
+		return sfkdl;
+	}
+	public void setSfkdl(String sfkdl) {
+		this.sfkdl = sfkdl;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public Long getFzzyid() {
+		return fzzyid;
+	}
+	public void setFzzyid(Long fzzyid) {
+		this.fzzyid = fzzyid;
+	}
+	public String getSfzh() {
+		return sfzh;
+	}
+	public void setSfzh(String sfzh) {
+		this.sfzh = sfzh;
+	}
+	public String getZsmc() {
+		return zsmc;
+	}
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+	public String getZsbh() {
+		return zsbh;
+	}
+	public void setZsbh(String zsbh) {
+		this.zsbh = zsbh;
+	}
+	public String getFzbm() {
+		return fzbm;
+	}
+	public void setFzbm(String fzbm) {
+		this.fzbm = fzbm;
+	}
+	public Date getYxq() {
+		return yxq;
+	}
+	public void setYxq(Date yxq) {
+		this.yxq = yxq;
+	}
+	public Long getZszl() {
+		return zszl;
+	}
+	public void setZszl(Long zszl) {
+		this.zszl = zszl;
+	}
+	public Long getSsgq() {
+		return ssgq;
+	}
+	public void setSsgq(Long ssgq) {
+		this.ssgq = ssgq;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
+	}
+	public String getZjlx() {
+		return zjlx;
+	}
+	public void setZjlx(String zjlx) {
+		this.zjlx = zjlx;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getRylx() {
+		return rylx;
+	}
+	public void setRylx(String rylx) {
+		this.rylx = rylx;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/RyzsbModel.java

@@ -0,0 +1,154 @@
+package com.xt.js.gkaq.web.model;
+
+import java.sql.Blob;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 人员证书表Model
+ * @author 李小虎
+ *
+ */
+public class RyzsbModel extends BaseUUIDModel {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7051784479056438014L;
+
+	private String ryid;//人员编号（身份证号）
+	private String zsmc;//证书名称
+	private String zszl;//证书种类
+	private String zsbh;//证书编号
+	private String yxq;//有效期
+	private String bz;//备注
+	private String zsnr;//证书内容(关联的大字段表的id)
+	
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String szd;//所在地
+	public String getRyid() {
+		return ryid;
+	}
+	public void setRyid(String ryid) {
+		this.ryid = ryid;
+	}
+	public String getZsmc() {
+		return zsmc;
+	}
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+	public String getZszl() {
+		return zszl;
+	}
+	public void setZszl(String zszl) {
+		this.zszl = zszl;
+	}
+	public String getZsbh() {
+		return zsbh;
+	}
+	public void setZsbh(String zsbh) {
+		this.zsbh = zsbh;
+	}
+	public String getYxq() {
+		return yxq;
+	}
+	public void setYxq(String yxq) {
+		this.yxq = yxq;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getZsnr() {
+		return zsnr;
+	}
+	public void setZsnr(String zsnr) {
+		this.zsnr = zsnr;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/TjcxModel.java

@@ -1,17 +1,15 @@
 package com.xt.js.gkaq.web.model;
 
+import java.math.BigDecimal;
+
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 缁熻�鏌ヨ�鐨凪odel
- * @author 鏉庡皬铏�
+ * 统计查询的Model
+ * @author 李小虎
  *
  */
 public class TjcxModel extends BaseUUIDModel {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 861338246604486083L;
 	private String gkjyr;
 	private String syhgmt;
 	private String wxhw;
@@ -23,7 +21,7 @@ public class TjcxModel extends BaseUUIDModel {
 	private String qdyx;
 	private String sl;
 	private String wxsl;
-	private String rj;
+	private BigDecimal rj;
 	
 	private String szd;
 	private String qylx;
@@ -120,13 +118,14 @@ public class TjcxModel extends BaseUUIDModel {
 	public void setWxsl(String wxsl) {
 		this.wxsl = wxsl;
 	}
-	public String getRj() {
+	public BigDecimal getRj() {
 		return rj;
 	}
-	public void setRj(String rj) {
+	public void setRj(BigDecimal rj) {
 		this.rj = rj;
 	}
 	
 	
 	
+	
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/WxcgtjcxModel.java

@@ -0,0 +1,83 @@
+package com.xt.js.gkaq.web.model;
+
+import java.math.BigDecimal;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+/**
+ * 危险储罐统计查询的Model
+ * @author 李小虎
+ *
+ */
+public class WxcgtjcxModel extends BaseUUIDModel {
+	private String bz;
+	private String gkjyr;
+	private String byzd1;
+	private String sl;
+	private BigDecimal rj;
+	private String xhgs;
+	private String wxsl;
+	private String hz;
+	private String qylx;
+	private String szd;
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public BigDecimal getRj() {
+		return rj;
+	}
+	public void setRj(BigDecimal rj) {
+		this.rj = rj;
+	}
+	public String getXhgs() {
+		return xhgs;
+	}
+	public void setXhgs(String xhgs) {
+		this.xhgs = xhgs;
+	}
+	public String getWxsl() {
+		return wxsl;
+	}
+	public void setWxsl(String wxsl) {
+		this.wxsl = wxsl;
+	}
+	public String getHz() {
+		return hz;
+	}
+	public void setHz(String hz) {
+		this.hz = hz;
+	}
+	public String getQylx() {
+		return qylx;
+	}
+	public void setQylx(String qylx) {
+		this.qylx = qylx;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/WxhwModel.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.model;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 鍗遍櫓鐗╁搧鍚嶇О
- * @author 鏉庡皬铏�    2016-10-31 
+ * 危险物品名称
+ * @author 李小虎    2016-10-31 
  *
  */
 public class WxhwModel extends BaseUUIDModel {
@@ -11,30 +11,30 @@ public class WxhwModel extends BaseUUIDModel {
 	 * 
 	 */
 	private static final long serialVersionUID = 3491478469803786235L;
-	private String bh;//缂栧彿
-	private String mchsm;//鍚嶇О鍜岃�鏄�
-	private String ywmc;//鑻辨枃鍚嶇О
-	private String lbhxb;//绫诲埆鍜岄」鍒�
-	private String cywxx;//娆¤�鍗遍櫓鎬�
-	private String bzlb;//鍖呰�绫诲埆
-	private String bz;//澶囨敞
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
-	private String sftb;//鏄�惁鍚屾�
+	private String bh;//编号
+	private String mchsm;//名称和说明
+	private String ywmc;//英文名称
+	private String lbhxb;//类别和项别
+	private String cywxx;//次要危险性
+	private String bzlb;//包装类别
+	private String bz;//备注
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String sftb;//是否同步
 	private String recordCode;
-	private String byzd1;//澶囩敤瀛楁�1
-	private String byzd2;//澶囩敤瀛楁�2
-	private String byzd3;//澶囩敤瀛楁�3
-	private String byzd4;//澶囩敤瀛楁�4
-	private String byzd5;//澶囩敤瀛楁�5
-	private String lhxz;//鐞嗗寲鎬ц川
-	private String aqffcs;//闃茶寖鎺�柦
-	private String szd;//鎵€鍦ㄥ湴
-	private String hzwxx;//鐏�伨鍗遍櫓鎬�
-	private String dxdj;//姣掓€х瓑绾�
-	private String wrlb;//姹℃煋绫诲埆
+	private String byzd1;//备用字段1
+	private String byzd2;//备用字段2
+	private String byzd3;//备用字段3
+	private String byzd4;//备用字段4
+	private String byzd5;//备用字段5
+	private String lhxz;//理化性质
+	private String aqffcs;//防范措施
+	private String szd;//所在地
+	private String hzwxx;//火灾危险性
+	private String dxdj;//毒性等级
+	private String wrlb;//污染类别
 	public String getBh() {
 		return bh;
 	}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/WxhwtjcxModel.java

@@ -2,16 +2,11 @@ package com.xt.js.gkaq.web.model;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
 /**
- * 鍗遍櫓璐х墿缁熻�鏌ヨ�鐨凪odel
- * @author 鏉庡皬铏�
+ * 危险货物统计查询的Model
+ * @author 李小虎
  *
  */
 public class WxhwtjcxModel extends BaseUUIDModel {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7349035378161675941L;
 	private String bz;
 	private String gkjyr;
 	private String byzd1;

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/BloBService.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.web.model.BloBModel;
+import com.xt.js.gkaq.web.model.RyzsbModel;
+
+public interface BloBService extends BaseUUIDModelService<BloBModel> {
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/JyrUserService.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.web.model.JyrUserListModel;
+import com.xt.js.gkaq.web.model.JyrUserModel;
+
+public interface JyrUserService extends BaseUUIDModelService<JyrUserModel> {
+	public List<JyrUserListModel> selectInfo (JyrUserModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/RyzsbService.java

@@ -0,0 +1,10 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.web.model.RyzsbModel;
+
+public interface RyzsbService extends BaseUUIDModelService<RyzsbModel> {
+	public List<RyzsbModel> selectInfo (RyzsbModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/WxcgtjcxService.java

@@ -0,0 +1,11 @@
+package com.xt.js.gkaq.web.service;
+
+import java.util.List;
+
+import com.xt.js.gkaq.common.BaseUUIDModelService;
+import com.xt.js.gkaq.web.model.WxcgtjcxModel;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+
+public interface WxcgtjcxService extends BaseUUIDModelService<WxcgtjcxModel> {
+	public List<WxcgtjcxModel> selectByInfo (WxcgtjcxModel model);
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/BloBServiceImpl.java

@@ -0,0 +1,26 @@
+package com.xt.js.gkaq.web.service.impl;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.BloBModelMapper;
+import com.xt.js.gkaq.web.model.BloBModel;
+import com.xt.js.gkaq.web.service.BloBService;
+
+@Service
+public class BloBServiceImpl extends BaseUUIDModelServiceImpl<BloBModel> implements BloBService {
+	@Autowired
+	BloBModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<BloBModel> getMapper() {
+		return mapper;
+	}
+
+
+	
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/JyrUserServiceImpl.java

@@ -0,0 +1,38 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseServiceImpl;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.web.mappers.BwModelMapper;
+import com.xt.js.gkaq.web.mappers.GqModelMapper;
+import com.xt.js.gkaq.web.mappers.JyrUserModelMapper;
+import com.xt.js.gkaq.web.model.BwInfoModel;
+import com.xt.js.gkaq.web.model.BwModel;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.model.JyrUserListModel;
+import com.xt.js.gkaq.web.model.JyrUserModel;
+import com.xt.js.gkaq.web.service.BwService;
+import com.xt.js.gkaq.web.service.GqService;
+import com.xt.js.gkaq.web.service.JyrUserService;
+
+@Service
+public class JyrUserServiceImpl extends BaseUUIDModelServiceImpl<JyrUserModel> implements JyrUserService {
+	@Autowired
+	JyrUserModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<JyrUserModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<JyrUserListModel> selectInfo(JyrUserModel model) {
+		return mapper.selectByInfo(model);
+	}
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/RyzsbServiceImpl.java

@@ -0,0 +1,31 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.RyzsbModelMapper;
+import com.xt.js.gkaq.web.model.RyzsbModel;
+import com.xt.js.gkaq.web.service.RyzsbService;
+
+@Service
+public class RyzsbServiceImpl extends BaseUUIDModelServiceImpl<RyzsbModel> implements RyzsbService {
+	@Autowired
+	RyzsbModelMapper mapper;
+	
+	@Override
+	protected BaseMapper<RyzsbModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<RyzsbModel> selectInfo(RyzsbModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	
+   
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/WxcgtjcxServiceImpl.java

@@ -0,0 +1,41 @@
+package com.xt.js.gkaq.web.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.web.mappers.CkModelMapper;
+import com.xt.js.gkaq.web.mappers.JyrTjcxMapper;
+import com.xt.js.gkaq.web.mappers.JyrWxhwtjcxMapper;
+import com.xt.js.gkaq.web.mappers.WxcgtjcxMapper;
+import com.xt.js.gkaq.web.model.CkModel;
+import com.xt.js.gkaq.web.model.TjcxModel;
+import com.xt.js.gkaq.web.model.WxcgtjcxModel;
+import com.xt.js.gkaq.web.model.WxhwtjcxModel;
+import com.xt.js.gkaq.web.service.CkService;
+import com.xt.js.gkaq.web.service.JyrTjcxService;
+import com.xt.js.gkaq.web.service.JyrWxhwtjcxService;
+import com.xt.js.gkaq.web.service.WxcgtjcxService;
+
+@Service
+public class WxcgtjcxServiceImpl extends BaseUUIDModelServiceImpl<WxcgtjcxModel> implements WxcgtjcxService {
+	@Autowired
+	WxcgtjcxMapper mapper;
+	
+	@Override
+	protected BaseMapper<WxcgtjcxModel> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<WxcgtjcxModel> selectByInfo(WxcgtjcxModel model) {
+		return mapper.selectByInfo(model);
+	}
+
+	
+	
+
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/service/impl/WxhwServiceImpl.java

@@ -15,7 +15,7 @@ import com.xt.js.gkaq.web.model.WxhwModel;
 import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.service.WxhwService;
 /**
- * 鍗遍櫓鐗╁搧淇℃伅service
+ * 危险物品信息service
  * @author LXh
  *
  */
@@ -31,7 +31,7 @@ public class WxhwServiceImpl extends BaseServiceImpl<WxhwModel> implements WxhwS
 		return mapper;
 	}
 	/**
-	 * 鑾峰彇鎵€鏈夋寚瀹氬嵄闄╃墿鍝佷俊鎭�
+	 * 获取所有指定危险物品信息
 	 */
 	@Override
 	public List<WxhwModel> selectAll(WxhwModel model) {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/shiro/GkaqAuthorizingRealm.java

@@ -62,8 +62,13 @@ public class GkaqAuthorizingRealm extends AuthorizingRealm {
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken)
             throws AuthenticationException {
         UsernamePasswordToken token = (UsernamePasswordToken) authcToken;
-        UserModel user = userService.findByLoginName(token.getUsername());
-        if (user != null) { return new SimpleAuthenticationInfo(user, user.getLoginPassword(), getName()); }
+        try {
+        	 UserModel user = userService.findByLoginName(token.getUsername());
+             if (user != null) { return new SimpleAuthenticationInfo(user, user.getLoginPassword(), getName()); }
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+       
         return null;
     }
 

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/BloBVo.java

@@ -0,0 +1,124 @@
+package com.xt.js.gkaq.web.vo;
+
+import java.io.File;
+
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 大字段Model
+ * @author 李小虎
+ *
+ */
+public class BloBVo extends BaseVo {
+	
+	private String id;
+	private byte[] value;
+	
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String recordcode;//
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private String szd;//所在地
+	
+	private String file;
+	
+	public String getFile() {
+		return file;
+	}
+	public void setFile(String file) {
+		this.file = file;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	
+	public byte[] getValue() {
+		return value;
+	}
+	public void setValue(byte[] value) {
+		this.value = value;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/BwVo.java

@@ -3,43 +3,43 @@ package com.xt.js.gkaq.web.vo;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 import com.xt.js.gkaq.common.BaseVo;
 /**
- * 娉婁綅Model
- * @author 鏉庡皬铏�
+ * 泊位Model
+ * @author 李小虎
  *
  */
 public class BwVo extends BaseVo {
 	private String id;
-	private String szd;//鎵€鍦ㄥ湴
-	private Long szgq;//鎵€鍦ㄦ腐鍖�
-	private Long qymc;//缁忚惀浜哄悕绉帮紙id锛�
-	private Long mtmc;//鐮佸ご鍚嶇О(id)
-	private String bwmc;//娉婁綅鍚嶇О
-	private Long bwsx;//娉婁綅灞炴€�
-	private Long bwszsx;//娉婁綅鎵€鍦ㄦ按绯�
-	private Long fwlx;//鏈嶅姟绫诲瀷
-	private Long tcnf;//鎶曚骇骞翠唤
-	private Long jgxs;//缁撴瀯鍨嬪紡
-	private Long sclx;//鐢熶骇绫诲瀷
-	private Long jgysnf;//绔ｅ伐楠屾敹骞翠唤
-	private String qysjsh;//鍓嶆部璁捐�姘存繁
-	private String qysjss;//鍓嶆部瀹為檯姘存繁
-	private String bwcd;//娉婁綅闀垮害
-	private String wxpbw;//鍗遍櫓鍝佹硦浣�
-	private String sjtgnl;//璁捐�閫氳繃鑳藉姏
-	private String sjkpnl;//璁捐�闈犳硦鑳藉姏(鍚ㄧ骇)
-	private String nhwtgml;//骞磋揣鐗╅€氳繃鑳藉姏
-	private String nwxhwttl;//骞村嵄闄╄揣鐗╁悶鍚愰噺
-	private Long zyhbwfl;//涓撲笟鍖栨硦浣嶅垎绫�
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String sffz;//鏄�惁鍙戣瘉
-	private String bwyt;//娉婁綅鐢ㄩ€�
-	private String zyrkfw;//浣滀笟璁ゅ彲鑼冨洿
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//经营人名称（id）
+	private Long mtmc;//码头名称(id)
+	private String bwmc;//泊位名称
+	private Long bwsx;//泊位属性
+	private Long bwszsx;//泊位所在水系
+	private Long fwlx;//服务类型
+	private Long tcnf;//投产年份
+	private Long jgxs;//结构型式
+	private Long sclx;//生产类型
+	private Long jgysnf;//竣工验收年份
+	private String qysjsh;//前沿设计水深
+	private String qysjss;//前沿实际水深
+	private String bwcd;//泊位长度
+	private String wxpbw;//危险品泊位
+	private String sjtgnl;//设计通过能力
+	private String sjkpnl;//设计靠泊能力(吨级)
+	private String nhwtgml;//年货物通过能力
+	private String nwxhwttl;//年危险货物吞吐量
+	private Long zyhbwfl;//专业化泊位分类
+	private String jd;//经度
+	private String wd;//纬度
+	private String sffz;//是否发证
+	private String bwyt;//泊位用途
+	private String zyrkfw;//作业认可范围
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordCode;//
 	private String byzd1;
 	private String byzd2;
@@ -47,9 +47,9 @@ public class BwVo extends BaseVo {
 	private String byzd4;
 	private String byzd5;
 	private String jtjgisdyidh;
-	private String hckpnl;//妫€鏌ラ潬娉婅兘鍔�
-	private String zwbwyt;//娉婁綅鐢ㄩ€旀樉绀�
-	private String smid;//鍦板浘id
+	private String hckpnl;//检查靠泊能力
+	private String zwbwyt;//泊位用途显示
+	private String smid;//地图id
 	private String bwdm;//
 	private Long jgxs2;
 	

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/CkVo.java

@@ -2,43 +2,43 @@ package com.xt.js.gkaq.web.vo;
 
 import com.xt.js.gkaq.common.BaseVo;
 /**
- * 浠撳簱Model
- * @author 鏉庡皬铏�
+ * 仓库Model
+ * @author 李小虎
  *
  */
 public class CkVo extends BaseVo {
 
 	private String id;
-	private Long ssjyr;//鎵€灞炵粡钀ヤ汉
-	private String szd;//鎵€鍦ㄥ湴
-	private Long gq;//娓�尯
-	private Long mt;//鐮佸ご
-	private String qymc;//浼佷笟鍚嶇О
-	private Long ckmc;//浠撳簱鍚嶇О
-	private Long wxpck;//鍗遍櫓鍝佷粨搴�
-	private Long ckyt;//浠撳簱鐢ㄩ€�
-	private Long ckgs;//浠撳簱涓�暟
-	private Long ythgcgrj;//娑蹭綋鍖栧伐鍌ㄧ綈瀹圭Н
-	private Long scyckmj;//鐢熶骇鐢ㄤ粨搴撻潰绉�
-	private Long wxpckmj;//鍗遍櫓鍝佷粨搴撻潰绉�
-	private String scyckrj;//鐢熶骇鐢ㄤ粨搴撳�绉�
-	private String ykrj;//娌瑰簱瀹圭Н
-	private String cpyrj;//鎴愬搧娌瑰�绉�
-	private String gisid;//浜ら€氬眬GIS瀵瑰簲id鍙�
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private Long ssjyr;//所属经营人
+	private String szd;//所在地
+	private Long gq;//港区
+	private Long mt;//码头
+	private String qymc;//企业名称
+	private Long ckmc;//仓库名称
+	private Long wxpck;//危险品仓库
+	private Long ckyt;//仓库用途
+	private Long ckgs;//仓库个数
+	private Long ythgcgrj;//液体化工储罐容积
+	private Long scyckmj;//生产用仓库面积
+	private Long wxpckmj;//危险品仓库面积
+	private String scyckrj;//生产用仓库容积
+	private String ykrj;//油库容积
+	private String cpyrj;//成品油容积
+	private String gisid;//交通局GIS对应id号
+	private String jd;//经度
+	private String wd;//纬度
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;
 	private String byzd3;
 	private String byzd4;
 	private String byzd5;
-	private String zwckyt;//浠撳簱鐢ㄩ€旀樉绀�
+	private String zwckyt;//仓库用途显示
 	
 	public String getId() {
 		return id;

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/DcVo.java

@@ -2,42 +2,42 @@ package com.xt.js.gkaq.web.vo;
 
 import com.xt.js.gkaq.common.BaseVo;
 /**
- * 浠撳簱Model
- * @author 鏉庡皬铏�
+ * 仓库Model
+ * @author 李小虎
  *
  */
 public class DcVo extends BaseVo {
 	private String id;
-	private String szd;//鎵€鍦ㄥ湴
-	private Long szgq;//鎵€鍦ㄦ腐鍖�
-	private Long qymc;//浼佷笟鍚嶇О
-	private String mtmc;//鐮佸ご鍚嶇О
-	private String dcmc;//鍫嗗満鍚嶇О
-	private String scydcyt;//鍫嗗満鐢ㄩ€�
-	private String dczmj;//鍫嗗満鎬婚潰绉�
-	private Long dczrl;//鍫嗗満鎬诲�閲�
-	private Long jzxmj;//闆嗚�绠卞爢鍦洪潰绉�
-	private Long jzxdcdcnl;//闆嗚�绠卞爢鍦哄爢瀛橀潰绉�
-	private Long wxpxdcmj;//鍗遍櫓鍝佸爢鍦洪潰绉�
-	private Long wxpxdcdcnl;//鍗遍櫓鍝佸爢鍦哄爢瀛樿兘鍔�
-	private String wxpdc;//鏄�惁鏄�嵄闄╁搧鍫嗗満
+	private String szd;//所在地
+	private Long szgq;//所在港区
+	private Long qymc;//企业名称
+	private String mtmc;//码头名称
+	private String dcmc;//堆场名称
+	private String scydcyt;//堆场用途
+	private String dczmj;//堆场总面积
+	private Long dczrl;//堆场总容量
+	private Long jzxmj;//集装箱堆场面积
+	private Long jzxdcdcnl;//集装箱堆场堆存面积
+	private Long wxpxdcmj;//危险品堆场面积
+	private Long wxpxdcdcnl;//危险品堆场堆存能力
+	private String wxpdc;//是否是危险品堆场
 	
-	private String jd;//缁忓害
-	private String wd;//绾�害
-	private String jtjgisdyidh;//浜ら€氬眬GIS瀵瑰簲id鍙�
+	private String jd;//经度
+	private String wd;//纬度
+	private String jtjgisdyidh;//交通局GIS对应id号
 	
-	private String sftb;//鏄�惁鍚屾�
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
+	private String sftb;//是否同步
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
 	private String recordcode;//
 	private String byzd1;
 	private String byzd2;
 	private String byzd3;
 	private String byzd4;
 	private String byzd5;
-	private String zwdcyt;//鍫嗗満鐢ㄩ€旀樉绀�
+	private String zwdcyt;//堆场用途显示
 	public String getId() {
 		return id;
 	}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/JyrUserVo.java

@@ -0,0 +1,240 @@
+package com.xt.js.gkaq.web.vo;
+
+import java.util.Date;
+
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 经营人人员基本信息Model
+ * @author 李小虎
+ *
+ */
+public class JyrUserVo extends BaseVo {
+	private String id;
+	private String xm;
+	private String xb;
+	private String zwhzc;
+	private String lxdh;
+	private String sjhm;
+	private Date csrq;
+	private String sfkdl;
+	private String sftb;
+	private String tbzt;
+	private Long tbdyid;
+	private String qylb;
+	private Long ssqy;
+	private String recordcode;
+	private String byzd1;
+	private String byzd2;
+	private String byzd3;
+	private String byzd4;
+	private String byzd5;
+	private Long fzzyid;
+	private String sfzh;
+	private String zsmc;
+	private String zsbh;
+	private String fzbm;
+	private Date yxq;
+	private Long zszl;
+	private Long ssgq;
+	private String bz;
+	private String ssjyr;
+	private String zjlx;
+	private String szd;
+	private String rylx;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getXm() {
+		return xm;
+	}
+	public void setXm(String xm) {
+		this.xm = xm;
+	}
+	public String getXb() {
+		return xb;
+	}
+	public void setXb(String xb) {
+		this.xb = xb;
+	}
+	public String getZwhzc() {
+		return zwhzc;
+	}
+	public void setZwhzc(String zwhzc) {
+		this.zwhzc = zwhzc;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public String getSjhm() {
+		return sjhm;
+	}
+	public void setSjhm(String sjhm) {
+		this.sjhm = sjhm;
+	}
+	public Date getCsrq() {
+		return csrq;
+	}
+	public void setCsrq(Date csrq) {
+		this.csrq = csrq;
+	}
+	public String getSfkdl() {
+		return sfkdl;
+	}
+	public void setSfkdl(String sfkdl) {
+		this.sfkdl = sfkdl;
+	}
+	public String getSftb() {
+		return sftb;
+	}
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+	public String getTbzt() {
+		return tbzt;
+	}
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+	public Long getTbdyid() {
+		return tbdyid;
+	}
+	public void setTbdyid(Long tbdyid) {
+		this.tbdyid = tbdyid;
+	}
+	public String getQylb() {
+		return qylb;
+	}
+	public void setQylb(String qylb) {
+		this.qylb = qylb;
+	}
+	public Long getSsqy() {
+		return ssqy;
+	}
+	public void setSsqy(Long ssqy) {
+		this.ssqy = ssqy;
+	}
+	public String getRecordcode() {
+		return recordcode;
+	}
+	public void setRecordcode(String recordcode) {
+		this.recordcode = recordcode;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getByzd2() {
+		return byzd2;
+	}
+	public void setByzd2(String byzd2) {
+		this.byzd2 = byzd2;
+	}
+	public String getByzd3() {
+		return byzd3;
+	}
+	public void setByzd3(String byzd3) {
+		this.byzd3 = byzd3;
+	}
+	public String getByzd4() {
+		return byzd4;
+	}
+	public void setByzd4(String byzd4) {
+		this.byzd4 = byzd4;
+	}
+	public String getByzd5() {
+		return byzd5;
+	}
+	public void setByzd5(String byzd5) {
+		this.byzd5 = byzd5;
+	}
+	public Long getFzzyid() {
+		return fzzyid;
+	}
+	public void setFzzyid(Long fzzyid) {
+		this.fzzyid = fzzyid;
+	}
+	public String getSfzh() {
+		return sfzh;
+	}
+	public void setSfzh(String sfzh) {
+		this.sfzh = sfzh;
+	}
+	public String getZsmc() {
+		return zsmc;
+	}
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+	public String getZsbh() {
+		return zsbh;
+	}
+	public void setZsbh(String zsbh) {
+		this.zsbh = zsbh;
+	}
+	public String getFzbm() {
+		return fzbm;
+	}
+	public void setFzbm(String fzbm) {
+		this.fzbm = fzbm;
+	}
+	public Date getYxq() {
+		return yxq;
+	}
+	public void setYxq(Date yxq) {
+		this.yxq = yxq;
+	}
+	public Long getZszl() {
+		return zszl;
+	}
+	public void setZszl(Long zszl) {
+		this.zszl = zszl;
+	}
+	public Long getSsgq() {
+		return ssgq;
+	}
+	public void setSsgq(Long ssgq) {
+		this.ssgq = ssgq;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getSsjyr() {
+		return ssjyr;
+	}
+	public void setSsjyr(String ssjyr) {
+		this.ssjyr = ssjyr;
+	}
+	public String getZjlx() {
+		return zjlx;
+	}
+	public void setZjlx(String zjlx) {
+		this.zjlx = zjlx;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	public String getRylx() {
+		return rylx;
+	}
+	public void setRylx(String rylx) {
+		this.rylx = rylx;
+	}
+	
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/TjcxVo.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.vo;
 
 import com.xt.js.gkaq.common.BaseVo;
 /**
- * 缁熻�鏌ヨ�鐨凪odel
- * @author 鏉庡皬铏�
+ * 统计查询的Model
+ * @author 李小虎
  *
  */
 public class TjcxVo extends BaseVo {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/WxcgtjcxVo.java

@@ -0,0 +1,81 @@
+package com.xt.js.gkaq.web.vo;
+
+import com.xt.js.gkaq.common.BaseVo;
+/**
+ * 危险储罐统计查询的Model
+ * @author 李小虎
+ *
+ */
+public class WxcgtjcxVo extends BaseVo {
+	private String bz;
+	private String gkjyr;
+	private String byzd1;
+	private String sl;
+	private String rj;
+	private String xhgs;
+	private String wxsl;
+	private String hz;
+	private String qylx;
+	private String szd;
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public String getGkjyr() {
+		return gkjyr;
+	}
+	public void setGkjyr(String gkjyr) {
+		this.gkjyr = gkjyr;
+	}
+	public String getByzd1() {
+		return byzd1;
+	}
+	public void setByzd1(String byzd1) {
+		this.byzd1 = byzd1;
+	}
+	public String getSl() {
+		return sl;
+	}
+	public void setSl(String sl) {
+		this.sl = sl;
+	}
+	public String getRj() {
+		return rj;
+	}
+	public void setRj(String rj) {
+		this.rj = rj;
+	}
+	public String getXhgs() {
+		return xhgs;
+	}
+	public void setXhgs(String xhgs) {
+		this.xhgs = xhgs;
+	}
+	public String getWxsl() {
+		return wxsl;
+	}
+	public void setWxsl(String wxsl) {
+		this.wxsl = wxsl;
+	}
+	public String getHz() {
+		return hz;
+	}
+	public void setHz(String hz) {
+		this.hz = hz;
+	}
+	public String getQylx() {
+		return qylx;
+	}
+	public void setQylx(String qylx) {
+		this.qylx = qylx;
+	}
+	public String getSzd() {
+		return szd;
+	}
+	public void setSzd(String szd) {
+		this.szd = szd;
+	}
+	
+}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/WxhwVo.java

@@ -6,30 +6,30 @@ import com.xt.js.gkaq.common.BaseVo;
 public class WxhwVo extends BaseVo {
 	
 	private String id;
-	private String bh;//缂栧彿
-	private String mchsm;//鍚嶇О鍜岃�鏄�
-	private String ywmc;//鑻辨枃鍚嶇О
-	private String lbhxb;//绫诲埆鍜岄」鍒�
-	private String cywxx;//娆¤�鍗遍櫓鎬�
-	private String bzlb;//鍖呰�绫诲埆
-	private String bz;//澶囨敞
-	private String tbzt;//鍚屾�鐘舵€�
-	private Long tbdyid;//鍚屾�瀵瑰簲id
-	private String qylb;//鍖哄煙绫诲埆
-	private Long ssqy;//鎵€灞炲尯鍩�
-	private String sftb;//鏄�惁鍚屾�
+	private String bh;//编号
+	private String mchsm;//名称和说明
+	private String ywmc;//英文名称
+	private String lbhxb;//类别和项别
+	private String cywxx;//次要危险性
+	private String bzlb;//包装类别
+	private String bz;//备注
+	private String tbzt;//同步状态
+	private Long tbdyid;//同步对应id
+	private String qylb;//区域类别
+	private Long ssqy;//所属区域
+	private String sftb;//是否同步
 	private String recordCode;
-	private String byzd1;//澶囩敤瀛楁�1
-	private String byzd2;//澶囩敤瀛楁�2
-	private String byzd3;//澶囩敤瀛楁�3
-	private String byzd4;//澶囩敤瀛楁�4
-	private String byzd5;//澶囩敤瀛楁�5
-	private String lhxz;//鐞嗗寲鎬ц川
-	private String aqffcs;//闃茶寖鎺�柦
-	private String szd;//鎵€鍦ㄥ湴
-	private String hzwxx;//鐏�伨鍗遍櫓鎬�
-	private String dxdj;//姣掓€х瓑绾�
-	private String wrlb;//姹℃煋绫诲埆
+	private String byzd1;//备用字段1
+	private String byzd2;//备用字段2
+	private String byzd3;//备用字段3
+	private String byzd4;//备用字段4
+	private String byzd5;//备用字段5
+	private String lhxz;//理化性质
+	private String aqffcs;//防范措施
+	private String szd;//所在地
+	private String hzwxx;//火灾危险性
+	private String dxdj;//毒性等级
+	private String wrlb;//污染类别
 	public String getBh() {
 		return bh;
 	}

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/vo/WxhwtjcxVo.java

@@ -2,8 +2,8 @@ package com.xt.js.gkaq.web.vo;
 
 import com.xt.js.gkaq.common.BaseVo;
 /**
- * 鍗遍櫓璐х墿缁熻�鏌ヨ�鐨凪odel
- * @author 鏉庡皬铏�
+ * 危险货物统计查询的Model
+ * @author 李小虎
  *
  */
 public class WxhwtjcxVo extends BaseVo {