From 3bb60bbaa8bc207a497f16b7bc7122bcf95cb7e8 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@cronie>
Date: Fri, 16 Nov 2018 14:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Etrade=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MengYu-Trade/pom.xml                          |  6 ++
 MengYu-Trade/src/main/build/package.xml       |  6 ++
 .../java/com/cronie/MengYuApplication.java    | 11 +--
 .../resources/templates/mengyu/goods/add.html | 64 +++++++++++++
 .../templates/mengyu/goods/edit.html          | 65 ++++++++++++++
 .../templates/mengyu/goods/goods.html         | 82 +++++++++++++++++
 .../templates/mengyu/goodsTradeModel/add.html | 76 ++++++++++++++++
 .../mengyu/goodsTradeModel/edit.html          | 77 ++++++++++++++++
 .../goodsTradeModel/goodsTradeModel.html      | 90 +++++++++++++++++++
 .../mengyu/goodsTradeModelIns/add.html        | 52 +++++++++++
 .../mengyu/goodsTradeModelIns/edit.html       | 53 +++++++++++
 .../goodsTradeModelIns.html                   | 74 +++++++++++++++
 .../mengyu/goodsTradeModelInsNode/add.html    | 76 ++++++++++++++++
 .../mengyu/goodsTradeModelInsNode/edit.html   | 77 ++++++++++++++++
 .../goodsTradeModelInsNode.html               | 90 +++++++++++++++++++
 .../templates/mengyu/moneyPool/add.html       | 46 ++++++++++
 .../templates/mengyu/moneyPool/edit.html      | 47 ++++++++++
 .../templates/mengyu/moneyPool/moneyPool.html | 70 +++++++++++++++
 .../templates/mengyu/moneyPoolLog/add.html    | 52 +++++++++++
 .../templates/mengyu/moneyPoolLog/edit.html   | 53 +++++++++++
 .../mengyu/moneyPoolLog/moneyPoolLog.html     | 74 +++++++++++++++
 .../templates/mengyu/yearPlan/add.html        | 58 ++++++++++++
 .../templates/mengyu/yearPlan/edit.html       | 59 ++++++++++++
 .../templates/mengyu/yearPlan/yearPlan.html   | 78 ++++++++++++++++
 24 files changed, 1426 insertions(+), 10 deletions(-)
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html
 create mode 100644 MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html

diff --git a/MengYu-Trade/pom.xml b/MengYu-Trade/pom.xml
index 3e5972e8f..064ad5e66 100644
--- a/MengYu-Trade/pom.xml
+++ b/MengYu-Trade/pom.xml
@@ -32,8 +32,10 @@
   	
   </dependencies>
   
+  
    <build>
     
+    
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -103,6 +105,8 @@
                         <exclude>freemaker.properties</exclude>
                         <exclude>logback-spring.xml</exclude>
                         <exclude>*.jar</exclude>
+                        <exclude>ehcache/**</exclude>
+                        <exclude>i18n/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -137,6 +141,8 @@
                 </configuration>
             </plugin>
         </plugins>
+        
+    
     </build>
     
 </project>
diff --git a/MengYu-Trade/src/main/build/package.xml b/MengYu-Trade/src/main/build/package.xml
index 851ae74af..91e43909b 100644
--- a/MengYu-Trade/src/main/build/package.xml
+++ b/MengYu-Trade/src/main/build/package.xml
@@ -23,6 +23,12 @@
                 <include>*.jar</include>
             </includes>
         </fileSet>
+		
+		<fileSet>
+            <directory>${basedir.parent}/ruoyi-admin/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+		
     </fileSets>
     <dependencySets>
         <dependencySet>
diff --git a/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java b/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java
index 989fd671b..9cdfdabee 100644
--- a/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java
+++ b/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java
@@ -22,15 +22,6 @@ public class MengYuApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(MengYuApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  mengyu启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        System.out.println("(♥◠‿◠)ﾉﾞ  mengyu启动成功   ლ(´ڡ`ლ)ﾞ  \n" );
     }
 }
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html
new file mode 100644
index 000000000..2bbf61018
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goods-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">品种名称：</label>
+				<div class="col-sm-8">
+					<input id="name" name="name" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">品种类型 （股标，基金等）：</label>
+				<div class="col-sm-8">
+					<input id="codeType" name="codeType" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">行业类型（军工，证券等）：</label>
+				<div class="col-sm-8">
+					<input id="industryType" name="industryType" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">板块类型（上证，深证 创业板等）：</label>
+				<div class="col-sm-8">
+					<input id="plateType" name="plateType" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建人：</label>
+				<div class="col-sm-8">
+					<input id="creater" name="creater" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建时间：</label>
+				<div class="col-sm-8">
+					<input id="createTime" name="createTime" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goods"
+		$("#form-goods-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-goods-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html
new file mode 100644
index 000000000..397d93a84
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goods-edit" th:object="${goods}">
+            <input id="code" name="code" th:field="*{code}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">品种名称：</label>
+                <div class="col-sm-8">
+                    <input id="name" name="name" th:field="*{name}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">品种类型 （股标，基金等）：</label>
+                <div class="col-sm-8">
+                    <input id="codeType" name="codeType" th:field="*{codeType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">行业类型（军工，证券等）：</label>
+                <div class="col-sm-8">
+                    <input id="industryType" name="industryType" th:field="*{industryType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">板块类型（上证，深证 创业板等）：</label>
+                <div class="col-sm-8">
+                    <input id="plateType" name="plateType" th:field="*{plateType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建人：</label>
+                <div class="col-sm-8">
+                    <input id="creater" name="creater" th:field="*{creater}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goods"
+		$("#form-goods-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-goods-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html b/MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html
new file mode 100644
index 000000000..6409c6b7f
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:goods:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:goods:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:goods:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:goods:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:goods:remove')}]];
+        var prefix = ctx + "mengyu/goods";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "投资品种",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'code', 
+					title : '品种代码' 
+				},
+				{
+					field : 'name', 
+					title : '品种名称' 
+				},
+				{
+					field : 'codeType', 
+					title : '品种类型 （股标，基金等）' 
+				},
+				{
+					field : 'industryType', 
+					title : '行业类型（军工，证券等）' 
+				},
+				{
+					field : 'plateType', 
+					title : '板块类型（上证，深证 创业板等）' 
+				},
+				{
+					field : 'creater', 
+					title : '创建人' 
+				},
+				{
+					field : 'createTime', 
+					title : '创建时间' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.code + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.code + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html
new file mode 100644
index 000000000..078a18a95
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goodsTradeModel-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">品种代码：</label>
+				<div class="col-sm-8">
+					<input id="code" name="code" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">基础成交量：</label>
+				<div class="col-sm-8">
+					<input id="basicVolumes" name="basicVolumes" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">模型状态 （启用，停用）：</label>
+				<div class="col-sm-8">
+					<input id="modelStatus" name="modelStatus" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">建仓价：</label>
+				<div class="col-sm-8">
+					<input id="buildingPrice" name="buildingPrice" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">平仓价：</label>
+				<div class="col-sm-8">
+					<input id="exitPrice" name="exitPrice" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">止损价：</label>
+				<div class="col-sm-8">
+					<input id="stopPrice" name="stopPrice" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建人：</label>
+				<div class="col-sm-8">
+					<input id="creater" name="creater" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建时间：</label>
+				<div class="col-sm-8">
+					<input id="createTime" name="createTime" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goodsTradeModel"
+		$("#form-goodsTradeModel-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-goodsTradeModel-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html
new file mode 100644
index 000000000..b0bb63bd5
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goodsTradeModel-edit" th:object="${goodsTradeModel}">
+            <input id="modelId" name="modelId" th:field="*{modelId}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">品种代码：</label>
+                <div class="col-sm-8">
+                    <input id="code" name="code" th:field="*{code}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">基础成交量：</label>
+                <div class="col-sm-8">
+                    <input id="basicVolumes" name="basicVolumes" th:field="*{basicVolumes}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">模型状态 （启用，停用）：</label>
+                <div class="col-sm-8">
+                    <input id="modelStatus" name="modelStatus" th:field="*{modelStatus}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">建仓价：</label>
+                <div class="col-sm-8">
+                    <input id="buildingPrice" name="buildingPrice" th:field="*{buildingPrice}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">平仓价：</label>
+                <div class="col-sm-8">
+                    <input id="exitPrice" name="exitPrice" th:field="*{exitPrice}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">止损价：</label>
+                <div class="col-sm-8">
+                    <input id="stopPrice" name="stopPrice" th:field="*{stopPrice}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建人：</label>
+                <div class="col-sm-8">
+                    <input id="creater" name="creater" th:field="*{creater}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goodsTradeModel"
+		$("#form-goodsTradeModel-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-goodsTradeModel-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html
new file mode 100644
index 000000000..8d3f302c8
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html
@@ -0,0 +1,90 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:goodsTradeModel:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:goodsTradeModel:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:goodsTradeModel:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:goodsTradeModel:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:goodsTradeModel:remove')}]];
+        var prefix = ctx + "mengyu/goodsTradeModel";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "品种计划模型",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'modelId', 
+					title : '模型ID' 
+				},
+				{
+					field : 'code', 
+					title : '品种代码' 
+				},
+				{
+					field : 'basicVolumes', 
+					title : '基础成交量' 
+				},
+				{
+					field : 'modelStatus', 
+					title : '模型状态 （启用，停用）' 
+				},
+				{
+					field : 'buildingPrice', 
+					title : '建仓价' 
+				},
+				{
+					field : 'exitPrice', 
+					title : '平仓价' 
+				},
+				{
+					field : 'stopPrice', 
+					title : '止损价' 
+				},
+				{
+					field : 'creater', 
+					title : '创建人' 
+				},
+				{
+					field : 'createTime', 
+					title : '创建时间' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.modelId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.modelId + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html
new file mode 100644
index 000000000..6ffa2bf20
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goodsTradeModelIns-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">模型ID：</label>
+				<div class="col-sm-8">
+					<input id="modelId" name="modelId" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">计划状态：</label>
+				<div class="col-sm-8">
+					<input id="insStatus" name="insStatus" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建人：</label>
+				<div class="col-sm-8">
+					<input id="creater" name="creater" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建时间：</label>
+				<div class="col-sm-8">
+					<input id="createTime" name="createTime" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goodsTradeModelIns"
+		$("#form-goodsTradeModelIns-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-goodsTradeModelIns-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html
new file mode 100644
index 000000000..96a0f50b0
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goodsTradeModelIns-edit" th:object="${goodsTradeModelIns}">
+            <input id="insId" name="insId" th:field="*{insId}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">模型ID：</label>
+                <div class="col-sm-8">
+                    <input id="modelId" name="modelId" th:field="*{modelId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">计划状态：</label>
+                <div class="col-sm-8">
+                    <input id="insStatus" name="insStatus" th:field="*{insStatus}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建人：</label>
+                <div class="col-sm-8">
+                    <input id="creater" name="creater" th:field="*{creater}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goodsTradeModelIns"
+		$("#form-goodsTradeModelIns-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-goodsTradeModelIns-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html
new file mode 100644
index 000000000..3d6e09a09
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:goodsTradeModelIns:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:goodsTradeModelIns:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:goodsTradeModelIns:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:goodsTradeModelIns:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:goodsTradeModelIns:remove')}]];
+        var prefix = ctx + "mengyu/goodsTradeModelIns";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "计划模型实例",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'insId', 
+					title : '计划实例 ID' 
+				},
+				{
+					field : 'modelId', 
+					title : '模型ID' 
+				},
+				{
+					field : 'insStatus', 
+					title : '计划状态' 
+				},
+				{
+					field : 'creater', 
+					title : '创建人' 
+				},
+				{
+					field : 'createTime', 
+					title : '创建时间' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.insId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.insId + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html
new file mode 100644
index 000000000..fd930751d
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goodsTradeModelInsNode-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">实例号：</label>
+				<div class="col-sm-8">
+					<input id="insId" name="insId" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">交易价格：</label>
+				<div class="col-sm-8">
+					<input id="price" name="price" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">成交份额：</label>
+				<div class="col-sm-8">
+					<input id="volumes" name="volumes" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">交易时间：</label>
+				<div class="col-sm-8">
+					<input id="tradeTime" name="tradeTime" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建人：</label>
+				<div class="col-sm-8">
+					<input id="creater" name="creater" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建时间：</label>
+				<div class="col-sm-8">
+					<input id="createTime" name="createTime" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">交易类型（建仓，加仓，减仓，平仓，止损）：</label>
+				<div class="col-sm-8">
+					<input id="tradeType" name="tradeType" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">交易笔记：</label>
+				<div class="col-sm-8">
+					<input id="tradeNote" name="tradeNote" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goodsTradeModelInsNode"
+		$("#form-goodsTradeModelInsNode-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-goodsTradeModelInsNode-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html
new file mode 100644
index 000000000..edffa46ec
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-goodsTradeModelInsNode-edit" th:object="${goodsTradeModelInsNode}">
+            <input id="nodeId" name="nodeId" th:field="*{nodeId}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">实例号：</label>
+                <div class="col-sm-8">
+                    <input id="insId" name="insId" th:field="*{insId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">交易价格：</label>
+                <div class="col-sm-8">
+                    <input id="price" name="price" th:field="*{price}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">成交份额：</label>
+                <div class="col-sm-8">
+                    <input id="volumes" name="volumes" th:field="*{volumes}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">交易时间：</label>
+                <div class="col-sm-8">
+                    <input id="tradeTime" name="tradeTime" th:field="*{tradeTime}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建人：</label>
+                <div class="col-sm-8">
+                    <input id="creater" name="creater" th:field="*{creater}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">交易类型（建仓，加仓，减仓，平仓，止损）：</label>
+                <div class="col-sm-8">
+                    <input id="tradeType" name="tradeType" th:field="*{tradeType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">交易笔记：</label>
+                <div class="col-sm-8">
+                    <input id="tradeNote" name="tradeNote" th:field="*{tradeNote}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/goodsTradeModelInsNode"
+		$("#form-goodsTradeModelInsNode-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-goodsTradeModelInsNode-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html
new file mode 100644
index 000000000..46dc7807b
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html
@@ -0,0 +1,90 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:goodsTradeModelInsNode:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:goodsTradeModelInsNode:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:goodsTradeModelInsNode:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:goodsTradeModelInsNode:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:goodsTradeModelInsNode:remove')}]];
+        var prefix = ctx + "mengyu/goodsTradeModelInsNode";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "交易计划操作",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'nodeId', 
+					title : '操作流水号' 
+				},
+				{
+					field : 'insId', 
+					title : '实例号' 
+				},
+				{
+					field : 'price', 
+					title : '交易价格' 
+				},
+				{
+					field : 'volumes', 
+					title : '成交份额' 
+				},
+				{
+					field : 'tradeTime', 
+					title : '交易时间' 
+				},
+				{
+					field : 'creater', 
+					title : '创建人' 
+				},
+				{
+					field : 'createTime', 
+					title : '创建时间' 
+				},
+				{
+					field : 'tradeType', 
+					title : '交易类型（建仓，加仓，减仓，平仓，止损）' 
+				},
+				{
+					field : 'tradeNote', 
+					title : '交易笔记' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.nodeId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.nodeId + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html
new file mode 100644
index 000000000..3a26a71db
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-moneyPool-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建时间：</label>
+				<div class="col-sm-8">
+					<input id="createTime" name="createTime" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">资金池金额 单位（元）：</label>
+				<div class="col-sm-8">
+					<input id="moneyPool" name="moneyPool" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">资金池ID=用户ID：</label>
+				<div class="col-sm-8">
+					<input id="moneyPoolId" name="moneyPoolId" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/moneyPool"
+		$("#form-moneyPool-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-moneyPool-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html
new file mode 100644
index 000000000..5ee191f41
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-moneyPool-edit" th:object="${moneyPool}">
+            <input id="creater" name="creater" th:field="*{creater}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">资金池金额 单位（元）：</label>
+                <div class="col-sm-8">
+                    <input id="moneyPool" name="moneyPool" th:field="*{moneyPool}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">资金池ID=用户ID：</label>
+                <div class="col-sm-8">
+                    <input id="moneyPoolId" name="moneyPoolId" th:field="*{moneyPoolId}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/moneyPool"
+		$("#form-moneyPool-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-moneyPool-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html
new file mode 100644
index 000000000..eac6a6f11
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:moneyPool:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:moneyPool:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:moneyPool:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:moneyPool:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:moneyPool:remove')}]];
+        var prefix = ctx + "mengyu/moneyPool";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "资金池",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'creater', 
+					title : '创建人' 
+				},
+				{
+					field : 'createTime', 
+					title : '创建时间' 
+				},
+				{
+					field : 'moneyPool', 
+					title : '资金池金额 单位（元）' 
+				},
+				{
+					field : 'moneyPoolId', 
+					title : '资金池ID=用户ID' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.creater + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.creater + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html
new file mode 100644
index 000000000..57b6e28c9
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-moneyPoolLog-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">交易后的资金池金额：</label>
+				<div class="col-sm-8">
+					<input id="moneyPoolLog" name="moneyPoolLog" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">交易金额：</label>
+				<div class="col-sm-8">
+					<input id="trademMoney" name="trademMoney" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">资金池ID号：</label>
+				<div class="col-sm-8">
+					<input id="moneyPoolId" name="moneyPoolId" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">资金池流水号ID=交易ID号：</label>
+				<div class="col-sm-8">
+					<input id="nodeId" name="nodeId" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/moneyPoolLog"
+		$("#form-moneyPoolLog-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-moneyPoolLog-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html
new file mode 100644
index 000000000..3a80a3cf5
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-moneyPoolLog-edit" th:object="${moneyPoolLog}">
+            <input id="billType" name="billType" th:field="*{billType}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">交易后的资金池金额：</label>
+                <div class="col-sm-8">
+                    <input id="moneyPoolLog" name="moneyPoolLog" th:field="*{moneyPoolLog}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">交易金额：</label>
+                <div class="col-sm-8">
+                    <input id="trademMoney" name="trademMoney" th:field="*{trademMoney}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">资金池ID号：</label>
+                <div class="col-sm-8">
+                    <input id="moneyPoolId" name="moneyPoolId" th:field="*{moneyPoolId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">资金池流水号ID=交易ID号：</label>
+                <div class="col-sm-8">
+                    <input id="nodeId" name="nodeId" th:field="*{nodeId}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/moneyPoolLog"
+		$("#form-moneyPoolLog-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-moneyPoolLog-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html
new file mode 100644
index 000000000..787e90908
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:moneyPoolLog:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:moneyPoolLog:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:moneyPoolLog:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:moneyPoolLog:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:moneyPoolLog:remove')}]];
+        var prefix = ctx + "mengyu/moneyPoolLog";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "资金池交明细",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'billType', 
+					title : '交易类型  (支出/收入)' 
+				},
+				{
+					field : 'moneyPoolLog', 
+					title : '交易后的资金池金额' 
+				},
+				{
+					field : 'trademMoney', 
+					title : '交易金额' 
+				},
+				{
+					field : 'moneyPoolId', 
+					title : '资金池ID号' 
+				},
+				{
+					field : 'nodeId', 
+					title : '资金池流水号ID=交易ID号' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.billType + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.billType + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html
new file mode 100644
index 000000000..cfdb00805
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-yearPlan-add">
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">预期盈利：</label>
+				<div class="col-sm-8">
+					<input id="profit" name="profit" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">计划状态：</label>
+				<div class="col-sm-8">
+					<input id="planStatus" name="planStatus" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">任务状态：</label>
+				<div class="col-sm-8">
+					<input id="taskStatus" name="taskStatus" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建时间：</label>
+				<div class="col-sm-8">
+					<input id="createTime" name="createTime" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">	
+				<label class="col-sm-3 control-label">创建人：</label>
+				<div class="col-sm-8">
+					<input id="creater" name="creater" class="form-control" type="text">
+				</div>
+			</div>
+		</form>
+	</div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/yearPlan"
+		$("#form-yearPlan-add").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/add", $('#form-yearPlan-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html
new file mode 100644
index 000000000..e3c710415
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-yearPlan-edit" th:object="${yearPlan}">
+            <input id="year" name="year" th:field="*{year}"  type="hidden">
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">预期盈利：</label>
+                <div class="col-sm-8">
+                    <input id="profit" name="profit" th:field="*{profit}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">计划状态：</label>
+                <div class="col-sm-8">
+                    <input id="planStatus" name="planStatus" th:field="*{planStatus}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">任务状态：</label>
+                <div class="col-sm-8">
+                    <input id="taskStatus" name="taskStatus" th:field="*{taskStatus}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">	
+                <label class="col-sm-3 control-label">创建人：</label>
+                <div class="col-sm-8">
+                    <input id="creater" name="creater" th:field="*{creater}" class="form-control" type="text">
+                </div>
+            </div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "mengyu/yearPlan"
+		$("#form-yearPlan-edit").validate({
+			rules:{
+				xxxx:{
+					required:true,
+				},
+			}
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	            $.operate.save(prefix + "/edit", $('#form-yearPlan-edit').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>
diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html
new file mode 100644
index 000000000..995d648f4
--- /dev/null
+++ b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+			<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="mengyu:yearPlan:add">
+				<i class="fa fa-plus"></i> 添加
+			</a>
+			<a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="mengyu:yearPlan:edit">
+	            <i class="fa fa-edit"></i> 修改
+	        </a>
+			<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="mengyu:yearPlan:remove">
+				<i class="fa fa-remove"></i> 删除
+			</a>
+		</div>
+			
+		<div class="col-sm-12 select-table table-striped">
+			<table id="bootstrap-table" data-mobile-responsive="true"></table>
+		</div>
+    </div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('mengyu:yearPlan:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('mengyu:yearPlan:remove')}]];
+        var prefix = ctx + "mengyu/yearPlan";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                modalName: "年度计划",
+                columns: [{
+		            checkbox: true
+		        },
+				{
+					field : 'year', 
+					title : '年' 
+				},
+				{
+					field : 'profit', 
+					title : '预期盈利' 
+				},
+				{
+					field : 'planStatus', 
+					title : '计划状态' 
+				},
+				{
+					field : 'taskStatus', 
+					title : '任务状态' 
+				},
+				{
+					field : 'createTime', 
+					title : '创建时间' 
+				},
+				{
+					field : 'creater', 
+					title : '创建人' 
+				},
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.year + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.year + '\')"><i class="fa fa-remove"></i>删除</a>');
+						return actions.join('');
+		            }
+		        }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file