Эх сурвалжийг харах

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

ld_zhoutl 9 жил өмнө
parent
commit
9d3badcb0e

+ 89 - 1
xtdsp/trunk/src/main/java/com/xt/dsp/controller/DatasourceCtl.java

@@ -1,12 +1,27 @@
 package com.xt.dsp.controller;
 
+import java.util.List;
+
+import org.h2.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.xt.dsp.model.DataSourceBean;
+import com.xt.dsp.service.DataSourceService;
+import com.xt.dsp.vo.DataSourceVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
 
 @Controller
 @RequestMapping("datasource")
 public class DatasourceCtl {
-
+	
+	@Autowired
+	private DataSourceService datasourceService;
+	
 	/**
 	 * 主画面
 	 * @return
@@ -16,4 +31,77 @@ public class DatasourceCtl {
 		//DataSourceBean bean = new DataSourceBean();
 		return "rwgl/datasource/datasource";
 	}
+	
+	/**
+     * 初始化页面加载数据
+     */
+	@RequestMapping("initDataSource")
+	@ResponseBody
+    public PageInfo<DataSourceBean> initDataSource(Model model,DataSourceVo vo) {
+    	// 初始化参数
+		if (vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		List<DataSourceBean> list = null;//datasourceService;
+		PageInfo<DataSourceBean> pageResult = new PageInfo<>(list);
+    	return pageResult;
+    }
+	
+	/**
+	 * 保存实体
+	 * @param vo
+	 * @return
+	 */
+	@RequestMapping("save")
+	@ResponseBody
+	public DataSourceBean saveDataSource(Model model,DataSourceVo vo) {
+		DataSourceBean saveBean = new DataSourceBean();
+		// 新增
+		if(StringUtils.isNullOrEmpty(vo.getId())) {
+//			BeanUtils.copyProperties(vo, saveBean);
+//			saveBean.setId(CommonUtil.getUUID());
+//			saveBean.setCreateTime(new Date());
+//			saveBean.setStartTime(DateUtil.format(vo.getStartTime(), DateUtil.DATE_SECOND_FMT));
+//			saveBean.setEndTime(DateUtil.format(vo.getEndTime(), DateUtil.DATE_SECOND_FMT));
+			//saveBean.setStatus("0");
+		} else {
+			// 修改
+//			saveBean = datasourceService.findOne(vo.getId());
+//			saveBean.setName(vo.getName());
+//			saveBean.setCode(vo.getCode());
+//			saveBean.setStartTime(DateUtil.format(vo.getStartTime(), DateUtil.DATE_SECOND_FMT));
+//			saveBean.setEndTime(DateUtil.format(vo.getEndTime(), DateUtil.DATE_SECOND_FMT));
+//			saveBean.setCircle(vo.getCircle());
+//			saveBean.setParam(vo.getParam());
+//			saveBean.setInterval(vo.getInterval());
+//			saveBean.setResult(vo.getResult());
+//			saveBean.setCronExpression(vo.getCronExpression());
+		}
+//		datasourceService.save(saveBean);
+		return saveBean;
+	}
+	
+	/**
+     * 初始化页面加载数据
+     */
+	@RequestMapping("initEditDataSource")
+	@ResponseBody
+    public DataSourceBean initEditDataSource(Model model, String id) {
+		DataSourceBean bean = null;//datasourceService.findOne(id);
+    	return bean;
+    }
+	
+	/**
+     * 删除数据
+     */
+	@RequestMapping("delDataSource")
+	@ResponseBody
+    public DataSourceBean delDataSource(Model model, String ids) {
+		DataSourceBean bean = null;//datasourceService.findOne(id);
+    	return bean;
+    }
 }

+ 2 - 240
xtdsp/trunk/src/main/webapp/WEB-INF/view/rwgl/datasource/datasource.jsp

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>往来单位定义</title>
+<title></title>
 <%@ include file="../../layouts/header.jsp"%>
 
 <link rel="stylesheet" href="<%=base%>/js/common/zTree_v3/css/zTreeStyle/zTreeStyle.css" type="text/css">
@@ -11,245 +11,7 @@
 </head>
 
 <body class="no-skin">
-    <!-- #section:basics/navbar.layout -->
-    <%@ include file="../../layouts/navbar.jsp"%>
-
-    <div class="main-container" id="main-container">
-        <script type="text/javascript">
-			try {
-				ace.settings.check('main-container', 'fixed')
-			} catch (e) {
-			}
-		</script>
-
-        <!-- #section:basics/sidebar -->
-        <%@ include file="../../layouts/sidebar.jsp"%>
-        <div class="main-content">
-            <div class="breadcrumbs" id="breadcrumbs">
-                <ul class="breadcrumb">
-                    <li><i class="ace-icon fa fa-home home-icon"></i> <a href="<%=home%>">首页</a></li>
-
-                    <li class="active">系统管理</li>
-                    <li class="active">数据源管理</li>
-                </ul>
-            </div>
-            <div class="col-xs-12"></div>
-            <div class="main-content-inner">
-                <div class="page-content">
-                    <div class="widget-box">
-                        <div class="widget-header">
-                            <h4 class="widget-title">数据源查询</h4>
-                            <div class="widget-toolbar">
-                                <a href="#" data-action="collapse"> <i class="ace-icon fa fa-chevron-up"></i>
-                                </a> <a href="#" data-action="close"> <i class="ace-icon fa fa-times"></i>
-                                </a>
-                            </div>
-                        </div>
-
-                        <div class="widget-body">
-                            <div class="widget-main">
-                                <form class="form-horizontal" onsubmit="return false">
-                                    <label class="col-sm-12 control-label"></label>
-                                    <div class="form-group">
-                                        <label for="srchWldwCode" class="col-sm-2 control-label">往来单位编码</label>
-                                        <div class="col-sm-2">
-                                            <input type="text" class="form-control limited" id="srchWldwCode" placeholder="">
-                                        </div>
-                                        <label for="srchWldwName" class="col-sm-2 control-label">往来单位名称</label>
-                                        <div class="col-sm-2">
-                                            <input type="text" class="form-control limited" id="srchWldwName" placeholder="">
-                                        </div>
-                                        <div class="col-sm-2">
-                                            <button class="btn btn-purple btn-round btn-sm" onclick="searchRecord()">
-                                                <i class="ace-icon fa fa-search"></i> 查询
-                                            </button>
-
-                                        </div>
-                                        <label class="col-sm-1 control-label"></label>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                    <!--列表部分-->
-                    <div>
-                        <div>
-                            <table id="grid-table"></table>
-                            <div id="grid-pager"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!--弹出新增界面-->
-        <div id="modal-table" class="modal fade" tabindex="-1">
-            <div class="modal-dialog" style="width: 800px; height: 500px;">
-                <div class="modal-content">
-                    <div class="modal-header no-padding">
-                        <div class="table-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                                <span class="white">&times;</span>
-                            </button>
-                            <label class="modal-title" id="myModalLabel">往来单位信息</label>
-                        </div>
-                    </div>
-                    <div class="modal-body no-padding">
-                        <form class="form-horizontal" id="wldwdyForm" method="post" onsubmit="return false;">
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">往来单位类型</label>
-                                <div class="col-sm-2">
-                                    <div id="ddlWldwTYpeError"></div>
-                                    <input type="hidden" class="form-control limited" id="wldwTypename" name="wldwdyForm.wldwTypename" placeholder=""> 
-                                    <select id="ddlWldwTYpe"
-                                        name="wldwdyForm.wldwType" class="multiselect {required:true}" multiple="multiple" required>
-                                        <option value="pj">配件</option>
-                                        <option value="wl">物流</option>
-                                        <option value="cj">厂家</option>
-                                        <option value="wd">网点</option>
-                                        <option value="ybwl">一般往来</option>
-                                        <option value="nbwl">内部往来</option>
-                                    </select>
-                                </div>
-                                <div class="col-sm-1">
-                                    <span id="ddlWldwTYpeImageTip" class="sp_yes" style="display: none"></span>
-                                </div>
-                                <div class="col-sm-1"></div>
-                                <label for="wldwCode" class="col-sm-2 control-label">往来单位编码</label>
-                                <div class="col-sm-3">
-                                    <div id="wldwCodeError"></div>
-                                    <input type="hidden" class="form-control limited" id="wldwId" name="wldwdyForm.wldwId" placeholder=""> <input type="text"
-                                        class="form-control limited {required:true}" id="wldwCode" name="wldwdyForm.wldwCode">
-                                </div>
-                                <div class="col-sm-1">
-                                    <span id="wldwCodeImageTip" class="sp_yes" style="display: none"></span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="wldwName" class="col-sm-2 control-label">往来单位名称</label>
-                                <div class="col-sm-3">
-                                    <div id="wldwNameError"></div>
-                                    <input type="text" class="form-control limited {required:true}" id="wldwName" name="wldwdyForm.wldwName" maxlength="100">
-                                </div>
-                                <div class="col-sm-1">
-                                    <span id="wldwNameImageTip" class="sp_yes" style="display: none"></span>
-                                </div>
-                                <label for="shortname" class="col-sm-2 control-label">简称</label>
-                                <div class="col-sm-3">
-                                    <div id="shortnameError"></div>
-                                    <input type="text" class="form-control limited {required:true}" id="shortname" name="wldwdyForm.shortname" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1">
-                                    <span id="shortnameImageTip" class="sp_yes" style="display: none"></span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="regAddr" class="col-sm-2 control-label">注册地址</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="regAddr" name="wldwdyForm.regAddr" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1"></div>
-                                <label for="owner" class="col-sm-2 control-label">法人</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="owner" name="wldwdyForm.owner" maxlength="100" placeholder="">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="sh" class="col-sm-2 control-label">税号</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="sh" name="wldwdyForm.sh" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1"></div>
-                                <label for="lxr" class="col-sm-2 control-label">联系人</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="lxr" name="wldwdyForm.lxr" maxlength="100" placeholder="">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="tel" class="col-sm-2 control-label">联系人电话</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="tel" name="wldwdyForm.tel" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1"></div>
-                                <label for="email" class="col-sm-2 control-label">联系人Email</label>
-                                <div class="col-sm-3">
-                                	<div id="emailError"></div>
-                                    <input type="text" class="form-control limited {email:true}" id="email" name="wldwdyForm.email" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1">
-                                    <span id="emailImageTip" class="sp_yes" style="display: none"></span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="dq" class="col-sm-2 control-label">地区</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="dq" name="wldwdyForm.dq" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1"></div>
-                                <label for="zip" class="col-sm-2 control-label">邮编</label>
-                                <div class="col-sm-3">
-                                    <input type="text" class="form-control limited" id="zip" name="wldwdyForm.zip" maxlength="100" placeholder="">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="fax" class="col-sm-2 control-label">传真</label>
-                                <div class="col-sm-3">
-                                	<div id="faxError"></div>
-                                    <input type="text" class="form-control limited {fax:true}" id="fax" name="wldwdyForm.fax" maxlength="100" placeholder="">
-                                </div>
-                                <div class="col-sm-1">
-                                    <span id="faxImageTip" class="sp_yes" style="display: none"></span>
-                                </div>
-                                <label class="col-sm-2 control-label">税率</label>
-                                <div class="col-sm-3">
-                                    <select class="form-control" id="sl" name="wldwdyForm.sl">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="addr" class="col-sm-2 control-label">联系地址</label>
-                                <div class="col-sm-9">
-                                    <input type="text" class="form-control limited" id="addr" name="wldwdyForm.addr" maxlength="200" placeholder="">
-                                </div>
-                            </div>
-                            <div class="hr hr-4 dotted hr-double"></div>
-                            <div class="col-sm-12">
-                            <div class="form-group">
-                                <button type="button" class="btn btn-info btn-round btn-sm" id="addCwwl">
-                                    <i class="ace-icon fa fa-plus"></i> 新增
-                                </button>
-                                <button type="button" class="btn btn-danger btn-round btn-sm" id="delCwwl">
-                                    <i class="ace-icon fa fa-trash-o"></i> 删除
-                                </button>
-                                <table id="grid-cwwl"></table>
-                            </div></div>
-                         <div class="modal-footer no-margin-top center modal-foot-border">
-                                <button id="btnSave" class="btn btn-success btn-round btn-sm">
-                                    <i class="ace-icon fa fa-save"></i> 保存
-                                </button>
-                                <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                    <i class="ace-icon fa fa-remove"></i> 关闭
-                                </button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- #section:basics/footer -->
-        <%@ include file="../../layouts/footer.jsp"%>
-    </div>
-
-    <script type="text/javascript">
-	$(function() {
-		$("#wldwdyForm").validate({
-			 submitHandler: function(form) {   
-			    	submitForm();   
-			 }
-		});
-	});
-	</script>
-    <!-- /.main-container -->
+    
 </body>
 </html>