fanxw il y a 5 ans
Parent
commit
e20292da53

+ 2 - 2
src/main/java/com/chinaitop/agile/DepotAgileYunnanApplication.java

@@ -11,9 +11,9 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
11 11
 @EnableDiscoveryClient
12 12
 @SpringBootApplication
13 13
 @MapperScan(basePackages = {"com.chinaitop.agile.mapper"})
14
-public class DepotAgileYunnanApplication {
14
+public class DepotAgileApplication {
15 15
 
16 16
 	public static void main(String[] args) {
17
-		SpringApplication.run(DepotAgileYunnanApplication.class, args);
17
+		SpringApplication.run(DepotAgileApplication.class, args);
18 18
 	}
19 19
 }

+ 1 - 1
src/main/java/com/chinaitop/agile/HelloWebXml.java

@@ -6,7 +6,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
6 6
 public class HelloWebXml extends SpringBootServletInitializer {
7 7
     @Override
8 8
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
9
-        return application.sources(DepotAgileYunnanApplication.class);
9
+        return application.sources(DepotAgileApplication.class);
10 10
     }
11 11
  
12 12
 }

+ 27 - 0
src/main/java/com/chinaitop/agile/controller/FcbgzController.java

@@ -2,10 +2,13 @@ package com.chinaitop.agile.controller;
2 2
 
3 3
 import java.util.ArrayList;
4 4
 import java.util.Date;
5
+import java.util.HashMap;
5 6
 import java.util.List;
7
+import java.util.Map;
6 8
 
7 9
 import javax.annotation.Resource;
8 10
 
11
+import org.apache.commons.lang.ObjectUtils;
9 12
 import org.springframework.http.MediaType;
10 13
 import org.springframework.web.bind.annotation.RequestMapping;
11 14
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -135,4 +138,28 @@ public class FcbgzController {
135 138
 
136 139
 		return result_list;
137 140
 	}
141
+
142
+	@RequestMapping(value="/findByIdFcbgzData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
143
+	@ApiOperation(value="查询一条分仓保管账记录", notes = "查询一条分仓保管账记录")
144
+	@ApiImplicitParams({
145
+		@ApiImplicitParam(name="id", value="数据ID", paramType="query")
146
+	})
147
+	public Map<String, Object> findByIdFcbgzData(String id) {
148
+		
149
+		Map<String, Object> result_map = new HashMap<String, Object>();
150
+
151
+		DataKcglFcbgzDefault fcbgz = null;
152
+		try {
153
+			if (!"".equals(ObjectUtils.toString(id, ""))) {
154
+				fcbgz = fcbgzService.findByIdFcbgzData(id);
155
+			} else {
156
+				fcbgz = new DataKcglFcbgzDefault();
157
+			}
158
+			result_map.put("fcbgz", fcbgz);
159
+		} catch (Exception e1) {
160
+			e1.printStackTrace();
161
+		}
162
+
163
+		return result_map;
164
+	}
138 165
 }

+ 8 - 0
src/main/java/com/chinaitop/agile/service/DataKcglFcbgzDefaultService.java

@@ -24,4 +24,12 @@ public interface DataKcglFcbgzDefaultService {
24 24
 	 * @throws Exception
25 25
 	 */
26 26
 	List<DataKcglFcbgzDefault> findByList(DataKcglFcbgzDefaultExample example) throws Exception;
27
+
28
+	/**
29
+	 * 按主键查询一条分仓保管账数据
30
+	 * 
31
+	 * @param id
32
+	 * @return
33
+	 */
34
+	DataKcglFcbgzDefault findByIdFcbgzData(String id);
27 35
 }

+ 5 - 0
src/main/java/com/chinaitop/agile/service/impl/DataKcglFcbgzDefaultServiceImpl.java

@@ -49,4 +49,9 @@ public class DataKcglFcbgzDefaultServiceImpl implements DataKcglFcbgzDefaultServ
49 49
 		return mapper.selectByExample(example);
50 50
 	}
51 51
 
52
+	@Override
53
+	public DataKcglFcbgzDefault findByIdFcbgzData(String id) {
54
+		return mapper.selectByPrimaryKey(id);
55
+	}
56
+
52 57
 }

+ 1 - 1
src/main/java/com/chinaitop/agile/utils/GeneratorSqlmap.java

@@ -16,7 +16,7 @@ public class GeneratorSqlmap {
16 16
 		List<String> warnings = new ArrayList<String>();
17 17
 		boolean overwrite = true;
18 18
 		//指定 逆向工程配置文件(写自己电脑的路径)
19
-		File configFile = new File("D:\\git_local\\depot-agile\\src\\main\\resources\\generatorConfig.xml");
19
+		File configFile = new File("D:\\git_10.10.1.25\\depot-agile-yunnan\\src\\main\\resources\\generatorConfig.xml");
20 20
 		ConfigurationParser cp = new ConfigurationParser(warnings);
21 21
 		Configuration config = cp.parseConfiguration(configFile);
22 22
 		DefaultShellCallback callback = new DefaultShellCallback(overwrite);

+ 242 - 0
src/main/java/com/chinaitop/agile/utils/MyCommentGenerator.java

@@ -0,0 +1,242 @@
1
+package com.chinaitop.agile.utils;
2
+import java.text.SimpleDateFormat;
3
+import java.util.Date;
4
+import java.util.Properties;
5
+
6
+import static org.mybatis.generator.internal.util.StringUtility.isTrue;
7
+import org.mybatis.generator.api.CommentGenerator;
8
+import org.mybatis.generator.api.IntrospectedColumn;
9
+import org.mybatis.generator.api.IntrospectedTable;
10
+import org.mybatis.generator.api.dom.java.CompilationUnit;
11
+import org.mybatis.generator.api.dom.java.Field;
12
+import org.mybatis.generator.api.dom.java.InnerClass;
13
+import org.mybatis.generator.api.dom.java.InnerEnum;
14
+import org.mybatis.generator.api.dom.java.JavaElement;
15
+import org.mybatis.generator.api.dom.java.Method;
16
+import org.mybatis.generator.api.dom.java.Parameter;
17
+import org.mybatis.generator.api.dom.xml.XmlElement;
18
+import org.mybatis.generator.config.MergeConstants;
19
+import org.mybatis.generator.config.PropertyRegistry;
20
+
21
+public class MyCommentGenerator implements CommentGenerator {
22
+
23
+	private Properties properties;
24
+	private Properties systemPro;
25
+	private boolean suppressDate;
26
+	private boolean suppressAllComments;
27
+	private String currentDateStr;
28
+
29
+	public MyCommentGenerator() {
30
+	    super();
31
+	    properties = new Properties();
32
+	    systemPro = System.getProperties();
33
+	    suppressDate = false;
34
+	    suppressAllComments = false;
35
+	    currentDateStr = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
36
+	}
37
+
38
+	
39
+	@Override
40
+	public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) {
41
+		if (suppressAllComments) {
42
+	        return;
43
+	    }
44
+	    StringBuilder sb = new StringBuilder();
45
+	    innerClass.addJavaDocLine("/**");
46
+	    sb.append(" * ");
47
+	    sb.append(introspectedTable.getFullyQualifiedTable());
48
+	    sb.append(" ");
49
+	    sb.append(getDateString());
50
+	    innerClass.addJavaDocLine(sb.toString());
51
+	    innerClass.addJavaDocLine(" */");
52
+
53
+	}
54
+
55
+	@Override
56
+	public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean arg2) {
57
+		if (suppressAllComments) {
58
+	        return;
59
+	    }
60
+
61
+	    StringBuilder sb = new StringBuilder();
62
+
63
+	    innerClass.addJavaDocLine("/**");
64
+	    sb.append(" * ");
65
+	    sb.append(introspectedTable.getFullyQualifiedTable());
66
+	    innerClass.addJavaDocLine(sb.toString());
67
+
68
+	    sb.setLength(0);
69
+	    sb.append(" * @author ");
70
+	    sb.append(systemPro.getProperty("user.name"));
71
+	    sb.append(" ");
72
+	    sb.append(currentDateStr);
73
+
74
+	    //      addJavadocTag(innerClass, markAsDoNotDelete);
75
+
76
+	    innerClass.addJavaDocLine(" */");
77
+
78
+	}
79
+
80
+	@Override
81
+	public void addComment(XmlElement arg0) {
82
+		return;
83
+	}
84
+
85
+	@Override
86
+	public void addConfigurationProperties(Properties properties) {
87
+		this.properties.putAll(properties);
88
+
89
+	    suppressDate = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE));
90
+
91
+	    suppressAllComments = isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_ALL_COMMENTS));
92
+
93
+	}
94
+	
95
+	/**
96
+	 * This method adds the custom javadoc tag for. You may do nothing if you do
97
+	 * not wish to include the Javadoc tag - however, if you do not include the
98
+	 * Javadoc tag then the Java merge capability of the eclipse plugin will
99
+	 * break.
100
+	 * 
101
+	 * @param javaElement
102
+	 *            the java element
103
+	 */
104
+	protected void addJavadocTag(JavaElement javaElement, boolean markAsDoNotDelete) {
105
+	    javaElement.addJavaDocLine(" *");
106
+	    StringBuilder sb = new StringBuilder();
107
+	    sb.append(" * ");
108
+	    sb.append(MergeConstants.NEW_ELEMENT_TAG);
109
+	    if (markAsDoNotDelete) {
110
+	        sb.append(" do_not_delete_during_merge");
111
+	    }
112
+	    String s = getDateString();
113
+	    if (s != null) {
114
+	        sb.append(' ');
115
+	        sb.append(s);
116
+	    }
117
+	    javaElement.addJavaDocLine(sb.toString());
118
+	}
119
+	
120
+	protected String getDateString() {
121
+	    String result = null;
122
+	    if (!suppressDate) {
123
+	        result = currentDateStr;
124
+	    }
125
+	    return result;
126
+	}
127
+
128
+
129
+	@Override
130
+	public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable) {
131
+		if (suppressAllComments) {
132
+	        return;
133
+	    }
134
+
135
+	    StringBuilder sb = new StringBuilder();
136
+
137
+	    innerEnum.addJavaDocLine("/**");
138
+	    //      addJavadocTag(innerEnum, false);
139
+	    sb.append(" * ");
140
+	    sb.append(introspectedTable.getFullyQualifiedTable());
141
+	    innerEnum.addJavaDocLine(sb.toString());
142
+	    innerEnum.addJavaDocLine(" */");
143
+
144
+	}
145
+
146
+	@Override
147
+	public void addFieldComment(Field field, IntrospectedTable introspectedTable) {
148
+		if (suppressAllComments) {
149
+	        return;
150
+	    }
151
+
152
+	    StringBuilder sb = new StringBuilder();
153
+
154
+	    field.addJavaDocLine("/**");
155
+	    sb.append(" * ");
156
+	    sb.append(introspectedTable.getFullyQualifiedTable());
157
+	    field.addJavaDocLine(sb.toString());
158
+	    field.addJavaDocLine(" */");
159
+
160
+	}
161
+
162
+	@Override
163
+	public void addFieldComment(Field arg0, IntrospectedTable arg1, IntrospectedColumn arg2) {
164
+		// TODO Auto-generated method stub
165
+
166
+	}
167
+
168
+	@Override
169
+	public void addGeneralMethodComment(Method arg0, IntrospectedTable arg1) {
170
+		if (suppressAllComments) {
171
+	        return;
172
+	    }
173
+	    //      method.addJavaDocLine("/**");
174
+	    //      addJavadocTag(method, false);
175
+	    //      method.addJavaDocLine(" */");
176
+
177
+	}
178
+
179
+	@Override
180
+	public void addGetterComment(Method method, IntrospectedTable arg1, IntrospectedColumn introspectedColumn) {
181
+		if (suppressAllComments) {
182
+	        return;
183
+	    }
184
+
185
+	    method.addJavaDocLine("/**");
186
+
187
+	    StringBuilder sb = new StringBuilder();
188
+	    sb.append(" * ");
189
+	    sb.append(introspectedColumn.getRemarks());
190
+	    method.addJavaDocLine(sb.toString());
191
+
192
+	    sb.setLength(0);
193
+	    sb.append(" * @return ");
194
+	    sb.append(introspectedColumn.getActualColumnName());
195
+	    sb.append(" ");
196
+	    sb.append(introspectedColumn.getRemarks());
197
+	    method.addJavaDocLine(sb.toString());
198
+
199
+	    //      addJavadocTag(method, false);
200
+
201
+	    method.addJavaDocLine(" */");
202
+
203
+	}
204
+
205
+	@Override
206
+	public void addJavaFileComment(CompilationUnit arg0) {
207
+		return;
208
+	}
209
+
210
+	@Override
211
+	public void addRootComment(XmlElement arg0) {
212
+		return;
213
+	}
214
+
215
+	@Override
216
+	public void addSetterComment(Method method, IntrospectedTable arg1, IntrospectedColumn introspectedColumn) {
217
+		if (suppressAllComments) {
218
+	        return;
219
+	    }
220
+
221
+
222
+	    method.addJavaDocLine("/**");
223
+	    StringBuilder sb = new StringBuilder();
224
+	    sb.append(" * ");
225
+	    sb.append(introspectedColumn.getRemarks());
226
+	    method.addJavaDocLine(sb.toString());
227
+
228
+	    Parameter parm = method.getParameters().get(0);
229
+	    sb.setLength(0);
230
+	    sb.append(" * @param ");
231
+	    sb.append(parm.getName());
232
+	    sb.append(" ");
233
+	    sb.append(introspectedColumn.getRemarks());
234
+	    method.addJavaDocLine(sb.toString());
235
+
236
+	    //      addJavadocTag(method, false);
237
+
238
+	    method.addJavaDocLine(" */");
239
+
240
+	}
241
+
242
+}

+ 58 - 0
src/main/resources/generatorConfig.xml

@@ -0,0 +1,58 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE generatorConfiguration
3
+  PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
4
+  "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
5
+
6
+<generatorConfiguration>
7
+	<context id="testTables" targetRuntime="MyBatis3">
8
+		<!-- 生成注释时,必须加type="MyCommentGenerator" -->
9
+		<commentGenerator type="com.chinaitop.agile.utils.MyCommentGenerator">
10
+			<!-- 是否去除自动生成的注释 true:是 : false:否 -->
11
+			<property name="suppressAllComments" value="false" />
12
+		</commentGenerator>
13
+		
14
+		<!--数据库连接的信息:驱动类、连接地址、用户名、密码 -->
15
+		<jdbcConnection 
16
+			driverClass="com.mysql.jdbc.Driver"
17
+			connectionURL="jdbc:mysql://localhost:3306/depot_yunnan" 
18
+			userId="root"
19
+			password="123456">
20
+		</jdbcConnection>
21
+		
22
+		<!-- 默认false,把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer,为 true时把JDBC DECIMAL 和 
23
+			NUMERIC 类型解析为java.math.BigDecimal -->
24
+		<javaTypeResolver>
25
+			<property name="forceBigDecimals" value="false" />
26
+		</javaTypeResolver>
27
+
28
+		<!-- targetProject:生成PO类的位置 -->
29
+		<javaModelGenerator targetPackage="com.chinaitop.agile.model"
30
+			targetProject=".\src\main\java">
31
+			<!-- enableSubPackages:是否让schema作为包的后缀 -->
32
+			<property name="enableSubPackages" value="false" />
33
+			<!-- 从数据库返回的值被清理前后的空格 -->
34
+			<property name="trimStrings" value="true" />
35
+		</javaModelGenerator>
36
+		
37
+        <!-- targetProject:mapper映射文件生成的位置 -->
38
+		<sqlMapGenerator targetPackage="com.chinaitop.agile.mapper" 
39
+			targetProject=".\src\main\java">
40
+			<!-- enableSubPackages:是否让schema作为包的后缀 -->
41
+			<property name="enableSubPackages" value="false" />
42
+		</sqlMapGenerator>
43
+		
44
+		<!-- targetPackage:mapper接口生成的位置 -->
45
+		<javaClientGenerator type="XMLMAPPER"
46
+			targetPackage="com.chinaitop.agile.mapper" 
47
+			targetProject=".\src\main\java">
48
+			<!-- enableSubPackages:是否让schema作为包的后缀 -->
49
+			<property name="enableSubPackages" value="false" />
50
+		</javaClientGenerator>
51
+		
52
+		<!-- 指定要反向生成的数据库表 -->
53
+		<table schema="" tableName="system_log"></table>
54
+<!-- 		<table schema="" tableName="basic_process_sub"></table> -->
55
+<!-- 		<table schema="" tableName="basic_process_contrail"></table> -->
56
+
57
+	</context>
58
+</generatorConfiguration>