Commit c7cb4fbecbe23d0b3dec60d9efb6bb22159eb308
1 parent
921a1251
新增功能处理;
接口文档维护; 删除冗余插件;
Showing
16 changed files
with
1572 additions
and
275 deletions
Linux服务器监听运维功能.md
@@ -317,15 +317,6 @@ | @@ -317,15 +317,6 @@ | ||
317 | | POST | http://ip:port/background/findAllAvailableInterface | | 317 | | POST | http://ip:port/background/findAllAvailableInterface | |
318 | | Content-Type | application/json;charset=UTF-8 | | 318 | | Content-Type | application/json;charset=UTF-8 | |
319 | 319 | ||
320 | -| 请求参数 | | | | | | ||
321 | -| -------- | -------- | ------- | ---- | ------------------ | | ||
322 | -| 参数项 | 名称 | 类型 | 必选 | 描述 | | ||
323 | -| configId | 服务主键 | Integer | 是 | 主键(formdata形式) | | ||
324 | -``` | ||
325 | -请求示例 | ||
326 | -"configId": 1 | ||
327 | -``` | ||
328 | - | ||
329 | | 返回结果 | | | | | 320 | | 返回结果 | | | | |
330 | | ------------ | -------------------- | ------ | --------------------------------- | | 321 | | ------------ | -------------------- | ------ | --------------------------------- | |
331 | | 参数项 | 名称 | 类型 | 描述 | | 322 | | 参数项 | 名称 | 类型 | 描述 | |
@@ -375,8 +366,8 @@ | @@ -375,8 +366,8 @@ | ||
375 | ``` | 366 | ``` |
376 | 请求示例 | 367 | 请求示例 |
377 | "configId": 1 | 368 | "configId": 1 |
378 | -"interfaceMouldId": "start", | ||
379 | -"params": "{"TPXX":"#file#"}", | 369 | +"interfaceMouldId": 1, |
370 | +"params": {"TPXX":"#file#"}, | ||
380 | "multipartFile": xxx | 371 | "multipartFile": xxx |
381 | ``` | 372 | ``` |
382 | 373 |
src/main/java/com/objecteye/config/RestTemplateConfig.java
@@ -22,9 +22,9 @@ public class RestTemplateConfig { | @@ -22,9 +22,9 @@ public class RestTemplateConfig { | ||
22 | public ClientHttpRequestFactory simpleClientHttpRequestFactory() { | 22 | public ClientHttpRequestFactory simpleClientHttpRequestFactory() { |
23 | SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); | 23 | SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); |
24 | //单位为ms | 24 | //单位为ms |
25 | - factory.setReadTimeout(5000); | 25 | + factory.setReadTimeout(6 * 5000); |
26 | //单位为ms | 26 | //单位为ms |
27 | - factory.setConnectTimeout(5000); | 27 | + factory.setConnectTimeout(6 * 5000); |
28 | return factory; | 28 | return factory; |
29 | } | 29 | } |
30 | } | 30 | } |
src/main/java/com/objecteye/controller/BackGroundController.java
@@ -52,8 +52,8 @@ public class BackGroundController extends BasicController { | @@ -52,8 +52,8 @@ public class BackGroundController extends BasicController { | ||
52 | 52 | ||
53 | @ApiOperation("sdk控制器") | 53 | @ApiOperation("sdk控制器") |
54 | @RequestMapping(value = "sdkController", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) | 54 | @RequestMapping(value = "sdkController", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) |
55 | - public CommonResult sdkController(@RequestBody Map<String, Object> requestMap) { | ||
56 | - return jsonObjectResultHandle(iBackGroundService.sdkController(requestMap)); | 55 | + public CommonResult sdkController(@RequestParam Integer configId) { |
56 | + return jsonObjectResultHandle(iBackGroundService.sdkController(configId)); | ||
57 | } | 57 | } |
58 | 58 | ||
59 | @ApiOperation("配置启动服务") | 59 | @ApiOperation("配置启动服务") |
@@ -96,12 +96,18 @@ public class BackGroundController extends BasicController { | @@ -96,12 +96,18 @@ public class BackGroundController extends BasicController { | ||
96 | 96 | ||
97 | @ApiOperation("获取配置服务支持的所有接口信息") | 97 | @ApiOperation("获取配置服务支持的所有接口信息") |
98 | @RequestMapping(value = "findAllAvailableInterface", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) | 98 | @RequestMapping(value = "findAllAvailableInterface", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) |
99 | - public CommonResult findAllAvailableInterface(@RequestParam Integer configId) { | ||
100 | - List<SyServiceInterfaceMould> syServiceInterfaceMoulds = iBackGroundService.findAllAvailableInterface(configId); | 99 | + public CommonResult findAllAvailableInterface() { |
100 | + List<SyServiceInterfaceMould> syServiceInterfaceMoulds = iBackGroundService.findAllAvailableInterface(); | ||
101 | if (syServiceInterfaceMoulds.size() > 0) { | 101 | if (syServiceInterfaceMoulds.size() > 0) { |
102 | return CommonResult.success(syServiceInterfaceMoulds); | 102 | return CommonResult.success(syServiceInterfaceMoulds); |
103 | } else { | 103 | } else { |
104 | return CommonResult.success(201, "未找到数据", null); | 104 | return CommonResult.success(201, "未找到数据", null); |
105 | } | 105 | } |
106 | } | 106 | } |
107 | + | ||
108 | + @ApiOperation("获取引擎返回结果对应信息表") | ||
109 | + @RequestMapping(value = "findVehicleResultContent", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) | ||
110 | + public CommonResult findVehicleResultContent() { | ||
111 | + return CommonResult.success(iBackGroundService.findVehicleResultContent()); | ||
112 | + } | ||
107 | } | 113 | } |
src/main/java/com/objecteye/entity/SyServiceInterfaceMould.java
@@ -10,8 +10,6 @@ public class SyServiceInterfaceMould implements Serializable { | @@ -10,8 +10,6 @@ public class SyServiceInterfaceMould implements Serializable { | ||
10 | 10 | ||
11 | private Integer id; | 11 | private Integer id; |
12 | 12 | ||
13 | - private Integer mouldId; | ||
14 | - | ||
15 | private String methodType; | 13 | private String methodType; |
16 | 14 | ||
17 | private String contentType; | 15 | private String contentType; |
@@ -30,14 +28,6 @@ public class SyServiceInterfaceMould implements Serializable { | @@ -30,14 +28,6 @@ public class SyServiceInterfaceMould implements Serializable { | ||
30 | this.id = id; | 28 | this.id = id; |
31 | } | 29 | } |
32 | 30 | ||
33 | - public Integer getMouldId() { | ||
34 | - return mouldId; | ||
35 | - } | ||
36 | - | ||
37 | - public void setMouldId(Integer mouldId) { | ||
38 | - this.mouldId = mouldId; | ||
39 | - } | ||
40 | - | ||
41 | public String getMethodType() { | 31 | public String getMethodType() { |
42 | return methodType; | 32 | return methodType; |
43 | } | 33 | } |
@@ -94,11 +84,6 @@ public class SyServiceInterfaceMould implements Serializable { | @@ -94,11 +84,6 @@ public class SyServiceInterfaceMould implements Serializable { | ||
94 | return this; | 84 | return this; |
95 | } | 85 | } |
96 | 86 | ||
97 | - public Builder mouldId(Integer mouldId) { | ||
98 | - obj.setMouldId(mouldId); | ||
99 | - return this; | ||
100 | - } | ||
101 | - | ||
102 | public Builder methodType(String methodType) { | 87 | public Builder methodType(String methodType) { |
103 | obj.setMethodType(methodType); | 88 | obj.setMethodType(methodType); |
104 | return this; | 89 | return this; |
@@ -131,7 +116,6 @@ public class SyServiceInterfaceMould implements Serializable { | @@ -131,7 +116,6 @@ public class SyServiceInterfaceMould implements Serializable { | ||
131 | 116 | ||
132 | public enum Column { | 117 | public enum Column { |
133 | id("id", "id", "INTEGER", false), | 118 | id("id", "id", "INTEGER", false), |
134 | - mouldId("mould_id", "mouldId", "INTEGER", false), | ||
135 | methodType("method_type", "methodType", "VARCHAR", false), | 119 | methodType("method_type", "methodType", "VARCHAR", false), |
136 | contentType("content_type", "contentType", "VARCHAR", false), | 120 | contentType("content_type", "contentType", "VARCHAR", false), |
137 | uri("uri", "uri", "VARCHAR", false), | 121 | uri("uri", "uri", "VARCHAR", false), |
src/main/java/com/objecteye/entity/SyServiceInterfaceMouldExample.java
@@ -271,96 +271,6 @@ public class SyServiceInterfaceMouldExample { | @@ -271,96 +271,6 @@ public class SyServiceInterfaceMouldExample { | ||
271 | return (Criteria) this; | 271 | return (Criteria) this; |
272 | } | 272 | } |
273 | 273 | ||
274 | - public Criteria andMouldIdIsNull() { | ||
275 | - addCriterion("mould_id is null"); | ||
276 | - return (Criteria) this; | ||
277 | - } | ||
278 | - | ||
279 | - public Criteria andMouldIdIsNotNull() { | ||
280 | - addCriterion("mould_id is not null"); | ||
281 | - return (Criteria) this; | ||
282 | - } | ||
283 | - | ||
284 | - public Criteria andMouldIdEqualTo(Integer value) { | ||
285 | - addCriterion("mould_id =", value, "mouldId"); | ||
286 | - return (Criteria) this; | ||
287 | - } | ||
288 | - | ||
289 | - public Criteria andMouldIdEqualToColumn(SyServiceInterfaceMould.Column column) { | ||
290 | - addCriterion(new StringBuilder("mould_id = ").append(column.getEscapedColumnName()).toString()); | ||
291 | - return (Criteria) this; | ||
292 | - } | ||
293 | - | ||
294 | - public Criteria andMouldIdNotEqualTo(Integer value) { | ||
295 | - addCriterion("mould_id <>", value, "mouldId"); | ||
296 | - return (Criteria) this; | ||
297 | - } | ||
298 | - | ||
299 | - public Criteria andMouldIdNotEqualToColumn(SyServiceInterfaceMould.Column column) { | ||
300 | - addCriterion(new StringBuilder("mould_id <> ").append(column.getEscapedColumnName()).toString()); | ||
301 | - return (Criteria) this; | ||
302 | - } | ||
303 | - | ||
304 | - public Criteria andMouldIdGreaterThan(Integer value) { | ||
305 | - addCriterion("mould_id >", value, "mouldId"); | ||
306 | - return (Criteria) this; | ||
307 | - } | ||
308 | - | ||
309 | - public Criteria andMouldIdGreaterThanColumn(SyServiceInterfaceMould.Column column) { | ||
310 | - addCriterion(new StringBuilder("mould_id > ").append(column.getEscapedColumnName()).toString()); | ||
311 | - return (Criteria) this; | ||
312 | - } | ||
313 | - | ||
314 | - public Criteria andMouldIdGreaterThanOrEqualTo(Integer value) { | ||
315 | - addCriterion("mould_id >=", value, "mouldId"); | ||
316 | - return (Criteria) this; | ||
317 | - } | ||
318 | - | ||
319 | - public Criteria andMouldIdGreaterThanOrEqualToColumn(SyServiceInterfaceMould.Column column) { | ||
320 | - addCriterion(new StringBuilder("mould_id >= ").append(column.getEscapedColumnName()).toString()); | ||
321 | - return (Criteria) this; | ||
322 | - } | ||
323 | - | ||
324 | - public Criteria andMouldIdLessThan(Integer value) { | ||
325 | - addCriterion("mould_id <", value, "mouldId"); | ||
326 | - return (Criteria) this; | ||
327 | - } | ||
328 | - | ||
329 | - public Criteria andMouldIdLessThanColumn(SyServiceInterfaceMould.Column column) { | ||
330 | - addCriterion(new StringBuilder("mould_id < ").append(column.getEscapedColumnName()).toString()); | ||
331 | - return (Criteria) this; | ||
332 | - } | ||
333 | - | ||
334 | - public Criteria andMouldIdLessThanOrEqualTo(Integer value) { | ||
335 | - addCriterion("mould_id <=", value, "mouldId"); | ||
336 | - return (Criteria) this; | ||
337 | - } | ||
338 | - | ||
339 | - public Criteria andMouldIdLessThanOrEqualToColumn(SyServiceInterfaceMould.Column column) { | ||
340 | - addCriterion(new StringBuilder("mould_id <= ").append(column.getEscapedColumnName()).toString()); | ||
341 | - return (Criteria) this; | ||
342 | - } | ||
343 | - | ||
344 | - public Criteria andMouldIdIn(List<Integer> values) { | ||
345 | - addCriterion("mould_id in", values, "mouldId"); | ||
346 | - return (Criteria) this; | ||
347 | - } | ||
348 | - | ||
349 | - public Criteria andMouldIdNotIn(List<Integer> values) { | ||
350 | - addCriterion("mould_id not in", values, "mouldId"); | ||
351 | - return (Criteria) this; | ||
352 | - } | ||
353 | - | ||
354 | - public Criteria andMouldIdBetween(Integer value1, Integer value2) { | ||
355 | - addCriterion("mould_id between", value1, value2, "mouldId"); | ||
356 | - return (Criteria) this; | ||
357 | - } | ||
358 | - | ||
359 | - public Criteria andMouldIdNotBetween(Integer value1, Integer value2) { | ||
360 | - addCriterion("mould_id not between", value1, value2, "mouldId"); | ||
361 | - return (Criteria) this; | ||
362 | - } | ||
363 | - | ||
364 | public Criteria andMethodTypeIsNull() { | 274 | public Criteria andMethodTypeIsNull() { |
365 | addCriterion("method_type is null"); | 275 | addCriterion("method_type is null"); |
366 | return (Criteria) this; | 276 | return (Criteria) this; |
src/main/java/com/objecteye/entity/SyVehicleResultContent.java
0 → 100644
1 | +package com.objecteye.entity; | ||
2 | + | ||
3 | +import java.io.Serializable; | ||
4 | +import java.util.ArrayList; | ||
5 | +import java.util.Arrays; | ||
6 | + | ||
7 | +public class SyVehicleResultContent implements Serializable { | ||
8 | + | ||
9 | + private static final long serialVersionUID = 4743402171237822727L; | ||
10 | + | ||
11 | + private Integer id; | ||
12 | + | ||
13 | + private String code; | ||
14 | + | ||
15 | + private String itemName; | ||
16 | + | ||
17 | + private String itemType; | ||
18 | + | ||
19 | + private String description; | ||
20 | + | ||
21 | + private String contentTable; | ||
22 | + | ||
23 | + public Integer getId() { | ||
24 | + return id; | ||
25 | + } | ||
26 | + | ||
27 | + public void setId(Integer id) { | ||
28 | + this.id = id; | ||
29 | + } | ||
30 | + | ||
31 | + public String getCode() { | ||
32 | + return code; | ||
33 | + } | ||
34 | + | ||
35 | + public void setCode(String code) { | ||
36 | + this.code = code; | ||
37 | + } | ||
38 | + | ||
39 | + public String getItemName() { | ||
40 | + return itemName; | ||
41 | + } | ||
42 | + | ||
43 | + public void setItemName(String itemName) { | ||
44 | + this.itemName = itemName; | ||
45 | + } | ||
46 | + | ||
47 | + public String getItemType() { | ||
48 | + return itemType; | ||
49 | + } | ||
50 | + | ||
51 | + public void setItemType(String itemType) { | ||
52 | + this.itemType = itemType; | ||
53 | + } | ||
54 | + | ||
55 | + public String getDescription() { | ||
56 | + return description; | ||
57 | + } | ||
58 | + | ||
59 | + public void setDescription(String description) { | ||
60 | + this.description = description; | ||
61 | + } | ||
62 | + | ||
63 | + public String getContentTable() { | ||
64 | + return contentTable; | ||
65 | + } | ||
66 | + | ||
67 | + public void setContentTable(String contentTable) { | ||
68 | + this.contentTable = contentTable; | ||
69 | + } | ||
70 | + | ||
71 | + public static SyVehicleResultContent.Builder builder() { | ||
72 | + return new SyVehicleResultContent.Builder(); | ||
73 | + } | ||
74 | + | ||
75 | + public static class Builder { | ||
76 | + private SyVehicleResultContent obj; | ||
77 | + | ||
78 | + public Builder() { | ||
79 | + this.obj = new SyVehicleResultContent(); | ||
80 | + } | ||
81 | + | ||
82 | + public Builder id(Integer id) { | ||
83 | + obj.setId(id); | ||
84 | + return this; | ||
85 | + } | ||
86 | + | ||
87 | + public Builder code(String code) { | ||
88 | + obj.setCode(code); | ||
89 | + return this; | ||
90 | + } | ||
91 | + | ||
92 | + public Builder itemName(String itemName) { | ||
93 | + obj.setItemName(itemName); | ||
94 | + return this; | ||
95 | + } | ||
96 | + | ||
97 | + public Builder itemType(String itemType) { | ||
98 | + obj.setItemType(itemType); | ||
99 | + return this; | ||
100 | + } | ||
101 | + | ||
102 | + public Builder description(String description) { | ||
103 | + obj.setDescription(description); | ||
104 | + return this; | ||
105 | + } | ||
106 | + | ||
107 | + public Builder contentTable(String contentTable) { | ||
108 | + obj.setContentTable(contentTable); | ||
109 | + return this; | ||
110 | + } | ||
111 | + | ||
112 | + public SyVehicleResultContent build() { | ||
113 | + return this.obj; | ||
114 | + } | ||
115 | + } | ||
116 | + | ||
117 | + public enum Column { | ||
118 | + id("id", "id", "INTEGER", false), | ||
119 | + code("code", "code", "VARCHAR", false), | ||
120 | + itemName("item_name", "itemName", "VARCHAR", false), | ||
121 | + itemType("item_type", "itemType", "VARCHAR", false), | ||
122 | + description("description", "description", "VARCHAR", false), | ||
123 | + contentTable("content_table", "contentTable", "VARCHAR", false); | ||
124 | + | ||
125 | + private static final String BEGINNING_DELIMITER = "\""; | ||
126 | + | ||
127 | + private static final String ENDING_DELIMITER = "\""; | ||
128 | + | ||
129 | + private final String column; | ||
130 | + | ||
131 | + private final boolean isColumnNameDelimited; | ||
132 | + | ||
133 | + private final String javaProperty; | ||
134 | + | ||
135 | + private final String jdbcType; | ||
136 | + | ||
137 | + public String value() { | ||
138 | + return this.column; | ||
139 | + } | ||
140 | + | ||
141 | + public String getValue() { | ||
142 | + return this.column; | ||
143 | + } | ||
144 | + | ||
145 | + public String getJavaProperty() { | ||
146 | + return this.javaProperty; | ||
147 | + } | ||
148 | + | ||
149 | + public String getJdbcType() { | ||
150 | + return this.jdbcType; | ||
151 | + } | ||
152 | + | ||
153 | + Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) { | ||
154 | + this.column = column; | ||
155 | + this.javaProperty = javaProperty; | ||
156 | + this.jdbcType = jdbcType; | ||
157 | + this.isColumnNameDelimited = isColumnNameDelimited; | ||
158 | + } | ||
159 | + | ||
160 | + public String desc() { | ||
161 | + return this.getEscapedColumnName() + " DESC"; | ||
162 | + } | ||
163 | + | ||
164 | + public String asc() { | ||
165 | + return this.getEscapedColumnName() + " ASC"; | ||
166 | + } | ||
167 | + | ||
168 | + public static Column[] excludes(Column... excludes) { | ||
169 | + ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values())); | ||
170 | + if (excludes != null && excludes.length > 0) { | ||
171 | + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); | ||
172 | + } | ||
173 | + return columns.toArray(new Column[]{}); | ||
174 | + } | ||
175 | + | ||
176 | + public static Column[] all() { | ||
177 | + return Column.values(); | ||
178 | + } | ||
179 | + | ||
180 | + public String getEscapedColumnName() { | ||
181 | + if (this.isColumnNameDelimited) { | ||
182 | + return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString(); | ||
183 | + } else { | ||
184 | + return this.column; | ||
185 | + } | ||
186 | + } | ||
187 | + | ||
188 | + public String getAliasedEscapedColumnName() { | ||
189 | + return this.getEscapedColumnName(); | ||
190 | + } | ||
191 | + } | ||
192 | +} | ||
0 | \ No newline at end of file | 193 | \ No newline at end of file |
src/main/java/com/objecteye/entity/SyVehicleResultContentExample.java
0 → 100644
1 | +package com.objecteye.entity; | ||
2 | + | ||
3 | +import java.util.ArrayList; | ||
4 | +import java.util.List; | ||
5 | + | ||
6 | +public class SyVehicleResultContentExample { | ||
7 | + protected String orderByClause; | ||
8 | + | ||
9 | + protected boolean distinct; | ||
10 | + | ||
11 | + protected List<Criteria> oredCriteria; | ||
12 | + | ||
13 | + protected Integer offset; | ||
14 | + | ||
15 | + protected Integer rows; | ||
16 | + | ||
17 | + public SyVehicleResultContentExample() { | ||
18 | + oredCriteria = new ArrayList<Criteria>(); | ||
19 | + } | ||
20 | + | ||
21 | + public void setOrderByClause(String orderByClause) { | ||
22 | + this.orderByClause = orderByClause; | ||
23 | + } | ||
24 | + | ||
25 | + public String getOrderByClause() { | ||
26 | + return orderByClause; | ||
27 | + } | ||
28 | + | ||
29 | + public void setDistinct(boolean distinct) { | ||
30 | + this.distinct = distinct; | ||
31 | + } | ||
32 | + | ||
33 | + public boolean isDistinct() { | ||
34 | + return distinct; | ||
35 | + } | ||
36 | + | ||
37 | + public List<Criteria> getOredCriteria() { | ||
38 | + return oredCriteria; | ||
39 | + } | ||
40 | + | ||
41 | + public void or(Criteria criteria) { | ||
42 | + oredCriteria.add(criteria); | ||
43 | + } | ||
44 | + | ||
45 | + public Criteria or() { | ||
46 | + Criteria criteria = createCriteriaInternal(); | ||
47 | + oredCriteria.add(criteria); | ||
48 | + return criteria; | ||
49 | + } | ||
50 | + | ||
51 | + public SyVehicleResultContentExample orderBy(String orderByClause) { | ||
52 | + this.setOrderByClause(orderByClause); | ||
53 | + return this; | ||
54 | + } | ||
55 | + | ||
56 | + public SyVehicleResultContentExample orderBy(String... orderByClauses) { | ||
57 | + StringBuffer sb = new StringBuffer(); | ||
58 | + for (int i = 0; i < orderByClauses.length; i++) { | ||
59 | + sb.append(orderByClauses[i]); | ||
60 | + if (i < orderByClauses.length - 1) { | ||
61 | + sb.append(" , "); | ||
62 | + } | ||
63 | + } | ||
64 | + this.setOrderByClause(sb.toString()); | ||
65 | + return this; | ||
66 | + } | ||
67 | + | ||
68 | + public Criteria createCriteria() { | ||
69 | + Criteria criteria = createCriteriaInternal(); | ||
70 | + if (oredCriteria.size() == 0) { | ||
71 | + oredCriteria.add(criteria); | ||
72 | + } | ||
73 | + return criteria; | ||
74 | + } | ||
75 | + | ||
76 | + protected Criteria createCriteriaInternal() { | ||
77 | + Criteria criteria = new Criteria(this); | ||
78 | + return criteria; | ||
79 | + } | ||
80 | + | ||
81 | + public void clear() { | ||
82 | + oredCriteria.clear(); | ||
83 | + orderByClause = null; | ||
84 | + distinct = false; | ||
85 | + rows = null; | ||
86 | + offset = null; | ||
87 | + } | ||
88 | + | ||
89 | + public void setOffset(Integer offset) { | ||
90 | + this.offset = offset; | ||
91 | + } | ||
92 | + | ||
93 | + public Integer getOffset() { | ||
94 | + return this.offset; | ||
95 | + } | ||
96 | + | ||
97 | + public void setRows(Integer rows) { | ||
98 | + this.rows = rows; | ||
99 | + } | ||
100 | + | ||
101 | + public Integer getRows() { | ||
102 | + return this.rows; | ||
103 | + } | ||
104 | + | ||
105 | + public SyVehicleResultContentExample limit(Integer rows) { | ||
106 | + this.rows = rows; | ||
107 | + return this; | ||
108 | + } | ||
109 | + | ||
110 | + public SyVehicleResultContentExample limit(Integer offset, Integer rows) { | ||
111 | + this.offset = offset; | ||
112 | + this.rows = rows; | ||
113 | + return this; | ||
114 | + } | ||
115 | + | ||
116 | + public SyVehicleResultContentExample page(Integer page, Integer pageSize) { | ||
117 | + this.offset = (page - 1) * pageSize; | ||
118 | + this.rows = pageSize; | ||
119 | + return this; | ||
120 | + } | ||
121 | + | ||
122 | + public static Criteria newAndCreateCriteria() { | ||
123 | + SyVehicleResultContentExample example = new SyVehicleResultContentExample(); | ||
124 | + return example.createCriteria(); | ||
125 | + } | ||
126 | + | ||
127 | + public SyVehicleResultContentExample when(boolean condition, IExampleWhen then) { | ||
128 | + if (condition) { | ||
129 | + then.example(this); | ||
130 | + } | ||
131 | + return this; | ||
132 | + } | ||
133 | + | ||
134 | + public SyVehicleResultContentExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) { | ||
135 | + if (condition) { | ||
136 | + then.example(this); | ||
137 | + } else { | ||
138 | + otherwise.example(this); | ||
139 | + } | ||
140 | + return this; | ||
141 | + } | ||
142 | + | ||
143 | + protected abstract static class GeneratedCriteria { | ||
144 | + protected List<Criterion> criteria; | ||
145 | + | ||
146 | + protected GeneratedCriteria() { | ||
147 | + super(); | ||
148 | + criteria = new ArrayList<Criterion>(); | ||
149 | + } | ||
150 | + | ||
151 | + public boolean isValid() { | ||
152 | + return criteria.size() > 0; | ||
153 | + } | ||
154 | + | ||
155 | + public List<Criterion> getAllCriteria() { | ||
156 | + return criteria; | ||
157 | + } | ||
158 | + | ||
159 | + public List<Criterion> getCriteria() { | ||
160 | + return criteria; | ||
161 | + } | ||
162 | + | ||
163 | + protected void addCriterion(String condition) { | ||
164 | + if (condition == null) { | ||
165 | + throw new RuntimeException("Value for condition cannot be null"); | ||
166 | + } | ||
167 | + criteria.add(new Criterion(condition)); | ||
168 | + } | ||
169 | + | ||
170 | + protected void addCriterion(String condition, Object value, String property) { | ||
171 | + if (value == null) { | ||
172 | + throw new RuntimeException("Value for " + property + " cannot be null"); | ||
173 | + } | ||
174 | + criteria.add(new Criterion(condition, value)); | ||
175 | + } | ||
176 | + | ||
177 | + protected void addCriterion(String condition, Object value1, Object value2, String property) { | ||
178 | + if (value1 == null || value2 == null) { | ||
179 | + throw new RuntimeException("Between values for " + property + " cannot be null"); | ||
180 | + } | ||
181 | + criteria.add(new Criterion(condition, value1, value2)); | ||
182 | + } | ||
183 | + | ||
184 | + public Criteria andIdIsNull() { | ||
185 | + addCriterion("id is null"); | ||
186 | + return (Criteria) this; | ||
187 | + } | ||
188 | + | ||
189 | + public Criteria andIdIsNotNull() { | ||
190 | + addCriterion("id is not null"); | ||
191 | + return (Criteria) this; | ||
192 | + } | ||
193 | + | ||
194 | + public Criteria andIdEqualTo(Integer value) { | ||
195 | + addCriterion("id =", value, "id"); | ||
196 | + return (Criteria) this; | ||
197 | + } | ||
198 | + | ||
199 | + public Criteria andIdEqualToColumn(SyVehicleResultContent.Column column) { | ||
200 | + addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString()); | ||
201 | + return (Criteria) this; | ||
202 | + } | ||
203 | + | ||
204 | + public Criteria andIdNotEqualTo(Integer value) { | ||
205 | + addCriterion("id <>", value, "id"); | ||
206 | + return (Criteria) this; | ||
207 | + } | ||
208 | + | ||
209 | + public Criteria andIdNotEqualToColumn(SyVehicleResultContent.Column column) { | ||
210 | + addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString()); | ||
211 | + return (Criteria) this; | ||
212 | + } | ||
213 | + | ||
214 | + public Criteria andIdGreaterThan(Integer value) { | ||
215 | + addCriterion("id >", value, "id"); | ||
216 | + return (Criteria) this; | ||
217 | + } | ||
218 | + | ||
219 | + public Criteria andIdGreaterThanColumn(SyVehicleResultContent.Column column) { | ||
220 | + addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString()); | ||
221 | + return (Criteria) this; | ||
222 | + } | ||
223 | + | ||
224 | + public Criteria andIdGreaterThanOrEqualTo(Integer value) { | ||
225 | + addCriterion("id >=", value, "id"); | ||
226 | + return (Criteria) this; | ||
227 | + } | ||
228 | + | ||
229 | + public Criteria andIdGreaterThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
230 | + addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString()); | ||
231 | + return (Criteria) this; | ||
232 | + } | ||
233 | + | ||
234 | + public Criteria andIdLessThan(Integer value) { | ||
235 | + addCriterion("id <", value, "id"); | ||
236 | + return (Criteria) this; | ||
237 | + } | ||
238 | + | ||
239 | + public Criteria andIdLessThanColumn(SyVehicleResultContent.Column column) { | ||
240 | + addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString()); | ||
241 | + return (Criteria) this; | ||
242 | + } | ||
243 | + | ||
244 | + public Criteria andIdLessThanOrEqualTo(Integer value) { | ||
245 | + addCriterion("id <=", value, "id"); | ||
246 | + return (Criteria) this; | ||
247 | + } | ||
248 | + | ||
249 | + public Criteria andIdLessThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
250 | + addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString()); | ||
251 | + return (Criteria) this; | ||
252 | + } | ||
253 | + | ||
254 | + public Criteria andIdIn(List<Integer> values) { | ||
255 | + addCriterion("id in", values, "id"); | ||
256 | + return (Criteria) this; | ||
257 | + } | ||
258 | + | ||
259 | + public Criteria andIdNotIn(List<Integer> values) { | ||
260 | + addCriterion("id not in", values, "id"); | ||
261 | + return (Criteria) this; | ||
262 | + } | ||
263 | + | ||
264 | + public Criteria andIdBetween(Integer value1, Integer value2) { | ||
265 | + addCriterion("id between", value1, value2, "id"); | ||
266 | + return (Criteria) this; | ||
267 | + } | ||
268 | + | ||
269 | + public Criteria andIdNotBetween(Integer value1, Integer value2) { | ||
270 | + addCriterion("id not between", value1, value2, "id"); | ||
271 | + return (Criteria) this; | ||
272 | + } | ||
273 | + | ||
274 | + public Criteria andCodeIsNull() { | ||
275 | + addCriterion("code is null"); | ||
276 | + return (Criteria) this; | ||
277 | + } | ||
278 | + | ||
279 | + public Criteria andCodeIsNotNull() { | ||
280 | + addCriterion("code is not null"); | ||
281 | + return (Criteria) this; | ||
282 | + } | ||
283 | + | ||
284 | + public Criteria andCodeEqualTo(String value) { | ||
285 | + addCriterion("code =", value, "code"); | ||
286 | + return (Criteria) this; | ||
287 | + } | ||
288 | + | ||
289 | + public Criteria andCodeEqualToColumn(SyVehicleResultContent.Column column) { | ||
290 | + addCriterion(new StringBuilder("code = ").append(column.getEscapedColumnName()).toString()); | ||
291 | + return (Criteria) this; | ||
292 | + } | ||
293 | + | ||
294 | + public Criteria andCodeNotEqualTo(String value) { | ||
295 | + addCriterion("code <>", value, "code"); | ||
296 | + return (Criteria) this; | ||
297 | + } | ||
298 | + | ||
299 | + public Criteria andCodeNotEqualToColumn(SyVehicleResultContent.Column column) { | ||
300 | + addCriterion(new StringBuilder("code <> ").append(column.getEscapedColumnName()).toString()); | ||
301 | + return (Criteria) this; | ||
302 | + } | ||
303 | + | ||
304 | + public Criteria andCodeGreaterThan(String value) { | ||
305 | + addCriterion("code >", value, "code"); | ||
306 | + return (Criteria) this; | ||
307 | + } | ||
308 | + | ||
309 | + public Criteria andCodeGreaterThanColumn(SyVehicleResultContent.Column column) { | ||
310 | + addCriterion(new StringBuilder("code > ").append(column.getEscapedColumnName()).toString()); | ||
311 | + return (Criteria) this; | ||
312 | + } | ||
313 | + | ||
314 | + public Criteria andCodeGreaterThanOrEqualTo(String value) { | ||
315 | + addCriterion("code >=", value, "code"); | ||
316 | + return (Criteria) this; | ||
317 | + } | ||
318 | + | ||
319 | + public Criteria andCodeGreaterThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
320 | + addCriterion(new StringBuilder("code >= ").append(column.getEscapedColumnName()).toString()); | ||
321 | + return (Criteria) this; | ||
322 | + } | ||
323 | + | ||
324 | + public Criteria andCodeLessThan(String value) { | ||
325 | + addCriterion("code <", value, "code"); | ||
326 | + return (Criteria) this; | ||
327 | + } | ||
328 | + | ||
329 | + public Criteria andCodeLessThanColumn(SyVehicleResultContent.Column column) { | ||
330 | + addCriterion(new StringBuilder("code < ").append(column.getEscapedColumnName()).toString()); | ||
331 | + return (Criteria) this; | ||
332 | + } | ||
333 | + | ||
334 | + public Criteria andCodeLessThanOrEqualTo(String value) { | ||
335 | + addCriterion("code <=", value, "code"); | ||
336 | + return (Criteria) this; | ||
337 | + } | ||
338 | + | ||
339 | + public Criteria andCodeLessThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
340 | + addCriterion(new StringBuilder("code <= ").append(column.getEscapedColumnName()).toString()); | ||
341 | + return (Criteria) this; | ||
342 | + } | ||
343 | + | ||
344 | + public Criteria andCodeLike(String value) { | ||
345 | + addCriterion("code like", value, "code"); | ||
346 | + return (Criteria) this; | ||
347 | + } | ||
348 | + | ||
349 | + public Criteria andCodeNotLike(String value) { | ||
350 | + addCriterion("code not like", value, "code"); | ||
351 | + return (Criteria) this; | ||
352 | + } | ||
353 | + | ||
354 | + public Criteria andCodeIn(List<String> values) { | ||
355 | + addCriterion("code in", values, "code"); | ||
356 | + return (Criteria) this; | ||
357 | + } | ||
358 | + | ||
359 | + public Criteria andCodeNotIn(List<String> values) { | ||
360 | + addCriterion("code not in", values, "code"); | ||
361 | + return (Criteria) this; | ||
362 | + } | ||
363 | + | ||
364 | + public Criteria andCodeBetween(String value1, String value2) { | ||
365 | + addCriterion("code between", value1, value2, "code"); | ||
366 | + return (Criteria) this; | ||
367 | + } | ||
368 | + | ||
369 | + public Criteria andCodeNotBetween(String value1, String value2) { | ||
370 | + addCriterion("code not between", value1, value2, "code"); | ||
371 | + return (Criteria) this; | ||
372 | + } | ||
373 | + | ||
374 | + public Criteria andItemNameIsNull() { | ||
375 | + addCriterion("item_name is null"); | ||
376 | + return (Criteria) this; | ||
377 | + } | ||
378 | + | ||
379 | + public Criteria andItemNameIsNotNull() { | ||
380 | + addCriterion("item_name is not null"); | ||
381 | + return (Criteria) this; | ||
382 | + } | ||
383 | + | ||
384 | + public Criteria andItemNameEqualTo(String value) { | ||
385 | + addCriterion("item_name =", value, "itemName"); | ||
386 | + return (Criteria) this; | ||
387 | + } | ||
388 | + | ||
389 | + public Criteria andItemNameEqualToColumn(SyVehicleResultContent.Column column) { | ||
390 | + addCriterion(new StringBuilder("item_name = ").append(column.getEscapedColumnName()).toString()); | ||
391 | + return (Criteria) this; | ||
392 | + } | ||
393 | + | ||
394 | + public Criteria andItemNameNotEqualTo(String value) { | ||
395 | + addCriterion("item_name <>", value, "itemName"); | ||
396 | + return (Criteria) this; | ||
397 | + } | ||
398 | + | ||
399 | + public Criteria andItemNameNotEqualToColumn(SyVehicleResultContent.Column column) { | ||
400 | + addCriterion(new StringBuilder("item_name <> ").append(column.getEscapedColumnName()).toString()); | ||
401 | + return (Criteria) this; | ||
402 | + } | ||
403 | + | ||
404 | + public Criteria andItemNameGreaterThan(String value) { | ||
405 | + addCriterion("item_name >", value, "itemName"); | ||
406 | + return (Criteria) this; | ||
407 | + } | ||
408 | + | ||
409 | + public Criteria andItemNameGreaterThanColumn(SyVehicleResultContent.Column column) { | ||
410 | + addCriterion(new StringBuilder("item_name > ").append(column.getEscapedColumnName()).toString()); | ||
411 | + return (Criteria) this; | ||
412 | + } | ||
413 | + | ||
414 | + public Criteria andItemNameGreaterThanOrEqualTo(String value) { | ||
415 | + addCriterion("item_name >=", value, "itemName"); | ||
416 | + return (Criteria) this; | ||
417 | + } | ||
418 | + | ||
419 | + public Criteria andItemNameGreaterThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
420 | + addCriterion(new StringBuilder("item_name >= ").append(column.getEscapedColumnName()).toString()); | ||
421 | + return (Criteria) this; | ||
422 | + } | ||
423 | + | ||
424 | + public Criteria andItemNameLessThan(String value) { | ||
425 | + addCriterion("item_name <", value, "itemName"); | ||
426 | + return (Criteria) this; | ||
427 | + } | ||
428 | + | ||
429 | + public Criteria andItemNameLessThanColumn(SyVehicleResultContent.Column column) { | ||
430 | + addCriterion(new StringBuilder("item_name < ").append(column.getEscapedColumnName()).toString()); | ||
431 | + return (Criteria) this; | ||
432 | + } | ||
433 | + | ||
434 | + public Criteria andItemNameLessThanOrEqualTo(String value) { | ||
435 | + addCriterion("item_name <=", value, "itemName"); | ||
436 | + return (Criteria) this; | ||
437 | + } | ||
438 | + | ||
439 | + public Criteria andItemNameLessThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
440 | + addCriterion(new StringBuilder("item_name <= ").append(column.getEscapedColumnName()).toString()); | ||
441 | + return (Criteria) this; | ||
442 | + } | ||
443 | + | ||
444 | + public Criteria andItemNameLike(String value) { | ||
445 | + addCriterion("item_name like", value, "itemName"); | ||
446 | + return (Criteria) this; | ||
447 | + } | ||
448 | + | ||
449 | + public Criteria andItemNameNotLike(String value) { | ||
450 | + addCriterion("item_name not like", value, "itemName"); | ||
451 | + return (Criteria) this; | ||
452 | + } | ||
453 | + | ||
454 | + public Criteria andItemNameIn(List<String> values) { | ||
455 | + addCriterion("item_name in", values, "itemName"); | ||
456 | + return (Criteria) this; | ||
457 | + } | ||
458 | + | ||
459 | + public Criteria andItemNameNotIn(List<String> values) { | ||
460 | + addCriterion("item_name not in", values, "itemName"); | ||
461 | + return (Criteria) this; | ||
462 | + } | ||
463 | + | ||
464 | + public Criteria andItemNameBetween(String value1, String value2) { | ||
465 | + addCriterion("item_name between", value1, value2, "itemName"); | ||
466 | + return (Criteria) this; | ||
467 | + } | ||
468 | + | ||
469 | + public Criteria andItemNameNotBetween(String value1, String value2) { | ||
470 | + addCriterion("item_name not between", value1, value2, "itemName"); | ||
471 | + return (Criteria) this; | ||
472 | + } | ||
473 | + | ||
474 | + public Criteria andItemTypeIsNull() { | ||
475 | + addCriterion("item_type is null"); | ||
476 | + return (Criteria) this; | ||
477 | + } | ||
478 | + | ||
479 | + public Criteria andItemTypeIsNotNull() { | ||
480 | + addCriterion("item_type is not null"); | ||
481 | + return (Criteria) this; | ||
482 | + } | ||
483 | + | ||
484 | + public Criteria andItemTypeEqualTo(String value) { | ||
485 | + addCriterion("item_type =", value, "itemType"); | ||
486 | + return (Criteria) this; | ||
487 | + } | ||
488 | + | ||
489 | + public Criteria andItemTypeEqualToColumn(SyVehicleResultContent.Column column) { | ||
490 | + addCriterion(new StringBuilder("item_type = ").append(column.getEscapedColumnName()).toString()); | ||
491 | + return (Criteria) this; | ||
492 | + } | ||
493 | + | ||
494 | + public Criteria andItemTypeNotEqualTo(String value) { | ||
495 | + addCriterion("item_type <>", value, "itemType"); | ||
496 | + return (Criteria) this; | ||
497 | + } | ||
498 | + | ||
499 | + public Criteria andItemTypeNotEqualToColumn(SyVehicleResultContent.Column column) { | ||
500 | + addCriterion(new StringBuilder("item_type <> ").append(column.getEscapedColumnName()).toString()); | ||
501 | + return (Criteria) this; | ||
502 | + } | ||
503 | + | ||
504 | + public Criteria andItemTypeGreaterThan(String value) { | ||
505 | + addCriterion("item_type >", value, "itemType"); | ||
506 | + return (Criteria) this; | ||
507 | + } | ||
508 | + | ||
509 | + public Criteria andItemTypeGreaterThanColumn(SyVehicleResultContent.Column column) { | ||
510 | + addCriterion(new StringBuilder("item_type > ").append(column.getEscapedColumnName()).toString()); | ||
511 | + return (Criteria) this; | ||
512 | + } | ||
513 | + | ||
514 | + public Criteria andItemTypeGreaterThanOrEqualTo(String value) { | ||
515 | + addCriterion("item_type >=", value, "itemType"); | ||
516 | + return (Criteria) this; | ||
517 | + } | ||
518 | + | ||
519 | + public Criteria andItemTypeGreaterThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
520 | + addCriterion(new StringBuilder("item_type >= ").append(column.getEscapedColumnName()).toString()); | ||
521 | + return (Criteria) this; | ||
522 | + } | ||
523 | + | ||
524 | + public Criteria andItemTypeLessThan(String value) { | ||
525 | + addCriterion("item_type <", value, "itemType"); | ||
526 | + return (Criteria) this; | ||
527 | + } | ||
528 | + | ||
529 | + public Criteria andItemTypeLessThanColumn(SyVehicleResultContent.Column column) { | ||
530 | + addCriterion(new StringBuilder("item_type < ").append(column.getEscapedColumnName()).toString()); | ||
531 | + return (Criteria) this; | ||
532 | + } | ||
533 | + | ||
534 | + public Criteria andItemTypeLessThanOrEqualTo(String value) { | ||
535 | + addCriterion("item_type <=", value, "itemType"); | ||
536 | + return (Criteria) this; | ||
537 | + } | ||
538 | + | ||
539 | + public Criteria andItemTypeLessThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
540 | + addCriterion(new StringBuilder("item_type <= ").append(column.getEscapedColumnName()).toString()); | ||
541 | + return (Criteria) this; | ||
542 | + } | ||
543 | + | ||
544 | + public Criteria andItemTypeLike(String value) { | ||
545 | + addCriterion("item_type like", value, "itemType"); | ||
546 | + return (Criteria) this; | ||
547 | + } | ||
548 | + | ||
549 | + public Criteria andItemTypeNotLike(String value) { | ||
550 | + addCriterion("item_type not like", value, "itemType"); | ||
551 | + return (Criteria) this; | ||
552 | + } | ||
553 | + | ||
554 | + public Criteria andItemTypeIn(List<String> values) { | ||
555 | + addCriterion("item_type in", values, "itemType"); | ||
556 | + return (Criteria) this; | ||
557 | + } | ||
558 | + | ||
559 | + public Criteria andItemTypeNotIn(List<String> values) { | ||
560 | + addCriterion("item_type not in", values, "itemType"); | ||
561 | + return (Criteria) this; | ||
562 | + } | ||
563 | + | ||
564 | + public Criteria andItemTypeBetween(String value1, String value2) { | ||
565 | + addCriterion("item_type between", value1, value2, "itemType"); | ||
566 | + return (Criteria) this; | ||
567 | + } | ||
568 | + | ||
569 | + public Criteria andItemTypeNotBetween(String value1, String value2) { | ||
570 | + addCriterion("item_type not between", value1, value2, "itemType"); | ||
571 | + return (Criteria) this; | ||
572 | + } | ||
573 | + | ||
574 | + public Criteria andDescriptionIsNull() { | ||
575 | + addCriterion("description is null"); | ||
576 | + return (Criteria) this; | ||
577 | + } | ||
578 | + | ||
579 | + public Criteria andDescriptionIsNotNull() { | ||
580 | + addCriterion("description is not null"); | ||
581 | + return (Criteria) this; | ||
582 | + } | ||
583 | + | ||
584 | + public Criteria andDescriptionEqualTo(String value) { | ||
585 | + addCriterion("description =", value, "description"); | ||
586 | + return (Criteria) this; | ||
587 | + } | ||
588 | + | ||
589 | + public Criteria andDescriptionEqualToColumn(SyVehicleResultContent.Column column) { | ||
590 | + addCriterion(new StringBuilder("description = ").append(column.getEscapedColumnName()).toString()); | ||
591 | + return (Criteria) this; | ||
592 | + } | ||
593 | + | ||
594 | + public Criteria andDescriptionNotEqualTo(String value) { | ||
595 | + addCriterion("description <>", value, "description"); | ||
596 | + return (Criteria) this; | ||
597 | + } | ||
598 | + | ||
599 | + public Criteria andDescriptionNotEqualToColumn(SyVehicleResultContent.Column column) { | ||
600 | + addCriterion(new StringBuilder("description <> ").append(column.getEscapedColumnName()).toString()); | ||
601 | + return (Criteria) this; | ||
602 | + } | ||
603 | + | ||
604 | + public Criteria andDescriptionGreaterThan(String value) { | ||
605 | + addCriterion("description >", value, "description"); | ||
606 | + return (Criteria) this; | ||
607 | + } | ||
608 | + | ||
609 | + public Criteria andDescriptionGreaterThanColumn(SyVehicleResultContent.Column column) { | ||
610 | + addCriterion(new StringBuilder("description > ").append(column.getEscapedColumnName()).toString()); | ||
611 | + return (Criteria) this; | ||
612 | + } | ||
613 | + | ||
614 | + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { | ||
615 | + addCriterion("description >=", value, "description"); | ||
616 | + return (Criteria) this; | ||
617 | + } | ||
618 | + | ||
619 | + public Criteria andDescriptionGreaterThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
620 | + addCriterion(new StringBuilder("description >= ").append(column.getEscapedColumnName()).toString()); | ||
621 | + return (Criteria) this; | ||
622 | + } | ||
623 | + | ||
624 | + public Criteria andDescriptionLessThan(String value) { | ||
625 | + addCriterion("description <", value, "description"); | ||
626 | + return (Criteria) this; | ||
627 | + } | ||
628 | + | ||
629 | + public Criteria andDescriptionLessThanColumn(SyVehicleResultContent.Column column) { | ||
630 | + addCriterion(new StringBuilder("description < ").append(column.getEscapedColumnName()).toString()); | ||
631 | + return (Criteria) this; | ||
632 | + } | ||
633 | + | ||
634 | + public Criteria andDescriptionLessThanOrEqualTo(String value) { | ||
635 | + addCriterion("description <=", value, "description"); | ||
636 | + return (Criteria) this; | ||
637 | + } | ||
638 | + | ||
639 | + public Criteria andDescriptionLessThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
640 | + addCriterion(new StringBuilder("description <= ").append(column.getEscapedColumnName()).toString()); | ||
641 | + return (Criteria) this; | ||
642 | + } | ||
643 | + | ||
644 | + public Criteria andDescriptionLike(String value) { | ||
645 | + addCriterion("description like", value, "description"); | ||
646 | + return (Criteria) this; | ||
647 | + } | ||
648 | + | ||
649 | + public Criteria andDescriptionNotLike(String value) { | ||
650 | + addCriterion("description not like", value, "description"); | ||
651 | + return (Criteria) this; | ||
652 | + } | ||
653 | + | ||
654 | + public Criteria andDescriptionIn(List<String> values) { | ||
655 | + addCriterion("description in", values, "description"); | ||
656 | + return (Criteria) this; | ||
657 | + } | ||
658 | + | ||
659 | + public Criteria andDescriptionNotIn(List<String> values) { | ||
660 | + addCriterion("description not in", values, "description"); | ||
661 | + return (Criteria) this; | ||
662 | + } | ||
663 | + | ||
664 | + public Criteria andDescriptionBetween(String value1, String value2) { | ||
665 | + addCriterion("description between", value1, value2, "description"); | ||
666 | + return (Criteria) this; | ||
667 | + } | ||
668 | + | ||
669 | + public Criteria andDescriptionNotBetween(String value1, String value2) { | ||
670 | + addCriterion("description not between", value1, value2, "description"); | ||
671 | + return (Criteria) this; | ||
672 | + } | ||
673 | + | ||
674 | + public Criteria andContentTableIsNull() { | ||
675 | + addCriterion("content_table is null"); | ||
676 | + return (Criteria) this; | ||
677 | + } | ||
678 | + | ||
679 | + public Criteria andContentTableIsNotNull() { | ||
680 | + addCriterion("content_table is not null"); | ||
681 | + return (Criteria) this; | ||
682 | + } | ||
683 | + | ||
684 | + public Criteria andContentTableEqualTo(String value) { | ||
685 | + addCriterion("content_table =", value, "contentTable"); | ||
686 | + return (Criteria) this; | ||
687 | + } | ||
688 | + | ||
689 | + public Criteria andContentTableEqualToColumn(SyVehicleResultContent.Column column) { | ||
690 | + addCriterion(new StringBuilder("content_table = ").append(column.getEscapedColumnName()).toString()); | ||
691 | + return (Criteria) this; | ||
692 | + } | ||
693 | + | ||
694 | + public Criteria andContentTableNotEqualTo(String value) { | ||
695 | + addCriterion("content_table <>", value, "contentTable"); | ||
696 | + return (Criteria) this; | ||
697 | + } | ||
698 | + | ||
699 | + public Criteria andContentTableNotEqualToColumn(SyVehicleResultContent.Column column) { | ||
700 | + addCriterion(new StringBuilder("content_table <> ").append(column.getEscapedColumnName()).toString()); | ||
701 | + return (Criteria) this; | ||
702 | + } | ||
703 | + | ||
704 | + public Criteria andContentTableGreaterThan(String value) { | ||
705 | + addCriterion("content_table >", value, "contentTable"); | ||
706 | + return (Criteria) this; | ||
707 | + } | ||
708 | + | ||
709 | + public Criteria andContentTableGreaterThanColumn(SyVehicleResultContent.Column column) { | ||
710 | + addCriterion(new StringBuilder("content_table > ").append(column.getEscapedColumnName()).toString()); | ||
711 | + return (Criteria) this; | ||
712 | + } | ||
713 | + | ||
714 | + public Criteria andContentTableGreaterThanOrEqualTo(String value) { | ||
715 | + addCriterion("content_table >=", value, "contentTable"); | ||
716 | + return (Criteria) this; | ||
717 | + } | ||
718 | + | ||
719 | + public Criteria andContentTableGreaterThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
720 | + addCriterion(new StringBuilder("content_table >= ").append(column.getEscapedColumnName()).toString()); | ||
721 | + return (Criteria) this; | ||
722 | + } | ||
723 | + | ||
724 | + public Criteria andContentTableLessThan(String value) { | ||
725 | + addCriterion("content_table <", value, "contentTable"); | ||
726 | + return (Criteria) this; | ||
727 | + } | ||
728 | + | ||
729 | + public Criteria andContentTableLessThanColumn(SyVehicleResultContent.Column column) { | ||
730 | + addCriterion(new StringBuilder("content_table < ").append(column.getEscapedColumnName()).toString()); | ||
731 | + return (Criteria) this; | ||
732 | + } | ||
733 | + | ||
734 | + public Criteria andContentTableLessThanOrEqualTo(String value) { | ||
735 | + addCriterion("content_table <=", value, "contentTable"); | ||
736 | + return (Criteria) this; | ||
737 | + } | ||
738 | + | ||
739 | + public Criteria andContentTableLessThanOrEqualToColumn(SyVehicleResultContent.Column column) { | ||
740 | + addCriterion(new StringBuilder("content_table <= ").append(column.getEscapedColumnName()).toString()); | ||
741 | + return (Criteria) this; | ||
742 | + } | ||
743 | + | ||
744 | + public Criteria andContentTableLike(String value) { | ||
745 | + addCriterion("content_table like", value, "contentTable"); | ||
746 | + return (Criteria) this; | ||
747 | + } | ||
748 | + | ||
749 | + public Criteria andContentTableNotLike(String value) { | ||
750 | + addCriterion("content_table not like", value, "contentTable"); | ||
751 | + return (Criteria) this; | ||
752 | + } | ||
753 | + | ||
754 | + public Criteria andContentTableIn(List<String> values) { | ||
755 | + addCriterion("content_table in", values, "contentTable"); | ||
756 | + return (Criteria) this; | ||
757 | + } | ||
758 | + | ||
759 | + public Criteria andContentTableNotIn(List<String> values) { | ||
760 | + addCriterion("content_table not in", values, "contentTable"); | ||
761 | + return (Criteria) this; | ||
762 | + } | ||
763 | + | ||
764 | + public Criteria andContentTableBetween(String value1, String value2) { | ||
765 | + addCriterion("content_table between", value1, value2, "contentTable"); | ||
766 | + return (Criteria) this; | ||
767 | + } | ||
768 | + | ||
769 | + public Criteria andContentTableNotBetween(String value1, String value2) { | ||
770 | + addCriterion("content_table not between", value1, value2, "contentTable"); | ||
771 | + return (Criteria) this; | ||
772 | + } | ||
773 | + } | ||
774 | + | ||
775 | + public static class Criteria extends GeneratedCriteria { | ||
776 | + private SyVehicleResultContentExample example; | ||
777 | + | ||
778 | + protected Criteria(SyVehicleResultContentExample example) { | ||
779 | + super(); | ||
780 | + this.example = example; | ||
781 | + } | ||
782 | + | ||
783 | + public SyVehicleResultContentExample example() { | ||
784 | + return this.example; | ||
785 | + } | ||
786 | + | ||
787 | + @Deprecated | ||
788 | + public Criteria andIf(boolean ifAdd, ICriteriaAdd add) { | ||
789 | + if (ifAdd) { | ||
790 | + add.add(this); | ||
791 | + } | ||
792 | + return this; | ||
793 | + } | ||
794 | + | ||
795 | + public Criteria when(boolean condition, ICriteriaWhen then) { | ||
796 | + if (condition) { | ||
797 | + then.criteria(this); | ||
798 | + } | ||
799 | + return this; | ||
800 | + } | ||
801 | + | ||
802 | + public Criteria when(boolean condition, ICriteriaWhen then, ICriteriaWhen otherwise) { | ||
803 | + if (condition) { | ||
804 | + then.criteria(this); | ||
805 | + } else { | ||
806 | + otherwise.criteria(this); | ||
807 | + } | ||
808 | + return this; | ||
809 | + } | ||
810 | + | ||
811 | + @Deprecated | ||
812 | + public interface ICriteriaAdd { | ||
813 | + Criteria add(Criteria add); | ||
814 | + } | ||
815 | + } | ||
816 | + | ||
817 | + public static class Criterion { | ||
818 | + private String condition; | ||
819 | + | ||
820 | + private Object value; | ||
821 | + | ||
822 | + private Object secondValue; | ||
823 | + | ||
824 | + private boolean noValue; | ||
825 | + | ||
826 | + private boolean singleValue; | ||
827 | + | ||
828 | + private boolean betweenValue; | ||
829 | + | ||
830 | + private boolean listValue; | ||
831 | + | ||
832 | + private String typeHandler; | ||
833 | + | ||
834 | + public String getCondition() { | ||
835 | + return condition; | ||
836 | + } | ||
837 | + | ||
838 | + public Object getValue() { | ||
839 | + return value; | ||
840 | + } | ||
841 | + | ||
842 | + public Object getSecondValue() { | ||
843 | + return secondValue; | ||
844 | + } | ||
845 | + | ||
846 | + public boolean isNoValue() { | ||
847 | + return noValue; | ||
848 | + } | ||
849 | + | ||
850 | + public boolean isSingleValue() { | ||
851 | + return singleValue; | ||
852 | + } | ||
853 | + | ||
854 | + public boolean isBetweenValue() { | ||
855 | + return betweenValue; | ||
856 | + } | ||
857 | + | ||
858 | + public boolean isListValue() { | ||
859 | + return listValue; | ||
860 | + } | ||
861 | + | ||
862 | + public String getTypeHandler() { | ||
863 | + return typeHandler; | ||
864 | + } | ||
865 | + | ||
866 | + protected Criterion(String condition) { | ||
867 | + super(); | ||
868 | + this.condition = condition; | ||
869 | + this.typeHandler = null; | ||
870 | + this.noValue = true; | ||
871 | + } | ||
872 | + | ||
873 | + protected Criterion(String condition, Object value, String typeHandler) { | ||
874 | + super(); | ||
875 | + this.condition = condition; | ||
876 | + this.value = value; | ||
877 | + this.typeHandler = typeHandler; | ||
878 | + if (value instanceof List<?>) { | ||
879 | + this.listValue = true; | ||
880 | + } else { | ||
881 | + this.singleValue = true; | ||
882 | + } | ||
883 | + } | ||
884 | + | ||
885 | + protected Criterion(String condition, Object value) { | ||
886 | + this(condition, value, null); | ||
887 | + } | ||
888 | + | ||
889 | + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { | ||
890 | + super(); | ||
891 | + this.condition = condition; | ||
892 | + this.value = value; | ||
893 | + this.secondValue = secondValue; | ||
894 | + this.typeHandler = typeHandler; | ||
895 | + this.betweenValue = true; | ||
896 | + } | ||
897 | + | ||
898 | + protected Criterion(String condition, Object value, Object secondValue) { | ||
899 | + this(condition, value, secondValue, null); | ||
900 | + } | ||
901 | + } | ||
902 | + | ||
903 | + public interface ICriteriaWhen { | ||
904 | + void criteria(Criteria criteria); | ||
905 | + } | ||
906 | + | ||
907 | + public interface IExampleWhen { | ||
908 | + void example(com.objecteye.entity.SyVehicleResultContentExample example); | ||
909 | + } | ||
910 | +} | ||
0 | \ No newline at end of file | 911 | \ No newline at end of file |
src/main/java/com/objecteye/mapper/SyVehicleResultContentMapper.java
0 → 100644
1 | +package com.objecteye.mapper; | ||
2 | + | ||
3 | +import com.objecteye.entity.SyVehicleResultContent; | ||
4 | +import com.objecteye.entity.SyVehicleResultContentExample; | ||
5 | +import org.apache.ibatis.annotations.Param; | ||
6 | + | ||
7 | +import java.util.List; | ||
8 | + | ||
9 | +public interface SyVehicleResultContentMapper { | ||
10 | + long countByExample(SyVehicleResultContentExample example); | ||
11 | + | ||
12 | + int deleteByExample(SyVehicleResultContentExample example); | ||
13 | + | ||
14 | + int deleteByPrimaryKey(Integer id); | ||
15 | + | ||
16 | + int insert(SyVehicleResultContent record); | ||
17 | + | ||
18 | + int insertSelective(SyVehicleResultContent record); | ||
19 | + | ||
20 | + SyVehicleResultContent selectOneByExample(SyVehicleResultContentExample example); | ||
21 | + | ||
22 | + List<SyVehicleResultContent> selectByExample(SyVehicleResultContentExample example); | ||
23 | + | ||
24 | + SyVehicleResultContent selectByPrimaryKey(Integer id); | ||
25 | + | ||
26 | + int updateByExampleSelective(@Param("record") SyVehicleResultContent record, @Param("example") SyVehicleResultContentExample example); | ||
27 | + | ||
28 | + int updateByExample(@Param("record") SyVehicleResultContent record, @Param("example") SyVehicleResultContentExample example); | ||
29 | + | ||
30 | + int updateByPrimaryKeySelective(SyVehicleResultContent record); | ||
31 | + | ||
32 | + int updateByPrimaryKey(SyVehicleResultContent record); | ||
33 | +} | ||
0 | \ No newline at end of file | 34 | \ No newline at end of file |
src/main/java/com/objecteye/service/IBackGroundService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; | @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; | ||
4 | import com.objecteye.common.PageResult; | 4 | import com.objecteye.common.PageResult; |
5 | import com.objecteye.entity.SyBasicResourceHistory; | 5 | import com.objecteye.entity.SyBasicResourceHistory; |
6 | import com.objecteye.entity.SyServiceInterfaceMould; | 6 | import com.objecteye.entity.SyServiceInterfaceMould; |
7 | +import com.objecteye.entity.SyVehicleResultContent; | ||
7 | import org.springframework.web.multipart.MultipartFile; | 8 | import org.springframework.web.multipart.MultipartFile; |
8 | 9 | ||
9 | import java.util.List; | 10 | import java.util.List; |
@@ -55,10 +56,9 @@ public interface IBackGroundService { | @@ -55,10 +56,9 @@ public interface IBackGroundService { | ||
55 | /** | 56 | /** |
56 | * sdk启动器 | 57 | * sdk启动器 |
57 | * | 58 | * |
58 | - * @param requestMap 请求参数 | ||
59 | - * @return 结果集 | 59 | + * @param configId@return 结果集 |
60 | */ | 60 | */ |
61 | - JSONObject sdkController(Map<String, Object> requestMap); | 61 | + JSONObject sdkController(Integer configId); |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * 配置启动服务 | 64 | * 配置启动服务 |
@@ -121,8 +121,14 @@ public interface IBackGroundService { | @@ -121,8 +121,14 @@ public interface IBackGroundService { | ||
121 | /** | 121 | /** |
122 | * 获取配置服务支持的所有接口信息(固定对应的itemName为 serviceInterface, interfaceMould) | 122 | * 获取配置服务支持的所有接口信息(固定对应的itemName为 serviceInterface, interfaceMould) |
123 | * | 123 | * |
124 | - * @param configId 服务主键 | ||
125 | * @return 支持的所有接口信息 | 124 | * @return 支持的所有接口信息 |
126 | */ | 125 | */ |
127 | - List<SyServiceInterfaceMould> findAllAvailableInterface(Integer configId); | 126 | + List<SyServiceInterfaceMould> findAllAvailableInterface(); |
127 | + | ||
128 | + /** | ||
129 | + * 获取引擎返回结果对应信息表 | ||
130 | + * | ||
131 | + * @return 结果集 | ||
132 | + */ | ||
133 | + Map<String, List<SyVehicleResultContent>> findVehicleResultContent(); | ||
128 | } | 134 | } |
src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java
@@ -8,10 +8,7 @@ import com.objecteye.common.GeneralContent; | @@ -8,10 +8,7 @@ import com.objecteye.common.GeneralContent; | ||
8 | import com.objecteye.common.PageResult; | 8 | import com.objecteye.common.PageResult; |
9 | import com.objecteye.entity.*; | 9 | import com.objecteye.entity.*; |
10 | import com.objecteye.exception.CustomXException; | 10 | import com.objecteye.exception.CustomXException; |
11 | -import com.objecteye.mapper.SyBasicResourceHistoryMapper; | ||
12 | -import com.objecteye.mapper.SyServiceConfigItemMapper; | ||
13 | -import com.objecteye.mapper.SyServiceConfigMapper; | ||
14 | -import com.objecteye.mapper.SyServiceInterfaceMouldMapper; | 11 | +import com.objecteye.mapper.*; |
15 | import com.objecteye.service.IBackGroundService; | 12 | import com.objecteye.service.IBackGroundService; |
16 | import com.objecteye.service.IOccupationOfBasicResourcesService; | 13 | import com.objecteye.service.IOccupationOfBasicResourcesService; |
17 | import com.objecteye.utils.LinuxUtils; | 14 | import com.objecteye.utils.LinuxUtils; |
@@ -29,7 +26,11 @@ import org.apache.http.impl.client.CloseableHttpClient; | @@ -29,7 +26,11 @@ import org.apache.http.impl.client.CloseableHttpClient; | ||
29 | import org.apache.http.impl.client.HttpClients; | 26 | import org.apache.http.impl.client.HttpClients; |
30 | import org.apache.http.util.EntityUtils; | 27 | import org.apache.http.util.EntityUtils; |
31 | import org.springframework.beans.factory.annotation.Autowired; | 28 | import org.springframework.beans.factory.annotation.Autowired; |
29 | +import org.springframework.beans.factory.annotation.Value; | ||
32 | import org.springframework.data.redis.core.RedisTemplate; | 30 | import org.springframework.data.redis.core.RedisTemplate; |
31 | +import org.springframework.http.HttpEntity; | ||
32 | +import org.springframework.http.HttpHeaders; | ||
33 | +import org.springframework.http.MediaType; | ||
33 | import org.springframework.http.ResponseEntity; | 34 | import org.springframework.http.ResponseEntity; |
34 | import org.springframework.scheduling.annotation.Async; | 35 | import org.springframework.scheduling.annotation.Async; |
35 | import org.springframework.scheduling.annotation.Scheduled; | 36 | import org.springframework.scheduling.annotation.Scheduled; |
@@ -40,6 +41,8 @@ import org.springframework.web.multipart.MultipartFile; | @@ -40,6 +41,8 @@ import org.springframework.web.multipart.MultipartFile; | ||
40 | 41 | ||
41 | import java.io.File; | 42 | import java.io.File; |
42 | import java.io.IOException; | 43 | import java.io.IOException; |
44 | +import java.nio.file.Files; | ||
45 | +import java.nio.file.Paths; | ||
43 | import java.util.*; | 46 | import java.util.*; |
44 | import java.util.stream.Collectors; | 47 | import java.util.stream.Collectors; |
45 | 48 | ||
@@ -59,8 +62,16 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -59,8 +62,16 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
59 | @Autowired | 62 | @Autowired |
60 | private SyServiceInterfaceMouldMapper syServiceInterfaceMouldMapper; | 63 | private SyServiceInterfaceMouldMapper syServiceInterfaceMouldMapper; |
61 | @Autowired | 64 | @Autowired |
65 | + private SyVehicleResultContentMapper syVehicleResultContentMapper; | ||
66 | + @Autowired | ||
62 | private RestTemplate restTemplate; | 67 | private RestTemplate restTemplate; |
63 | 68 | ||
69 | + @Value("${testBase64Path}") | ||
70 | + private String TEST_BASE64_PATH; | ||
71 | + @Value("${testPicUrl}") | ||
72 | + private String TEST_PIC_URL; | ||
73 | + | ||
74 | + | ||
64 | /** | 75 | /** |
65 | * 定时写入的定制信息 | 76 | * 定时写入的定制信息 |
66 | */ | 77 | */ |
@@ -241,17 +252,14 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -241,17 +252,14 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
241 | /** | 252 | /** |
242 | * sdk启动器 | 253 | * sdk启动器 |
243 | * | 254 | * |
244 | - * @param requestMap 请求参数 | ||
245 | - * @return 结果集 | 255 | + * @param configId@return 结果集 |
246 | */ | 256 | */ |
247 | - @Override | ||
248 | - public JSONObject sdkController(Map<String, Object> requestMap) { | ||
249 | - String configId = (String) requestMap.get("configId"); | 257 | + public JSONObject sdkController(Integer configId) { |
250 | String uri = "/vehicle/loadConfig"; | 258 | String uri = "/vehicle/loadConfig"; |
251 | String configItemName = "http,port"; | 259 | String configItemName = "http,port"; |
252 | List<SyServiceConfigItem> syServiceConfigItems = | 260 | List<SyServiceConfigItem> syServiceConfigItems = |
253 | syServiceConfigItemMapper.selectByExample(SyServiceConfigItemExample.newAndCreateCriteria() | 261 | syServiceConfigItemMapper.selectByExample(SyServiceConfigItemExample.newAndCreateCriteria() |
254 | - .andConfigIdEqualTo(Integer.valueOf(configId)).andItemNameIn(Arrays.asList(configItemName.split(","))) | 262 | + .andConfigIdEqualTo(configId).andItemNameIn(Arrays.asList(configItemName.split(","))) |
255 | .example()); | 263 | .example()); |
256 | String http = null; | 264 | String http = null; |
257 | String port = null; | 265 | String port = null; |
@@ -268,13 +276,24 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -268,13 +276,24 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
268 | return resultObj; | 276 | return resultObj; |
269 | } | 277 | } |
270 | 278 | ||
279 | + List<SyServiceConfigItem> configItems = syServiceConfigItemMapper.selectByExample(SyServiceConfigItemExample.newAndCreateCriteria().andConfigIdEqualTo(configId) | ||
280 | + .andItemNameIn(new ArrayList<>(GeneralContent.DOCKER_CONFIG_PARAMS_MAP.keySet())).example()); | ||
281 | + Map<String, Object> requestParams = configItems.stream().collect(Collectors.toMap(SyServiceConfigItem::getItemName, configItem -> { | ||
282 | + if ("true".equals(configItem.getItemValue())) { | ||
283 | + return 1; | ||
284 | + } else if (null == configItem.getItemValue() || "false".equals(configItem.getItemValue())) { | ||
285 | + return 0; | ||
286 | + } else { | ||
287 | + return Integer.parseInt(configItem.getItemValue()); | ||
288 | + } | ||
289 | + })); | ||
271 | List<String> errorList = new ArrayList<>(); | 290 | List<String> errorList = new ArrayList<>(); |
272 | - Map<String, String> restRequestMap = new HashMap<>(); | 291 | + Map<String, Object> restRequestMap = new HashMap<>(); |
273 | for (String param : GeneralContent.DOCKER_CONFIG_PARAMS_MAP.keySet()) { | 292 | for (String param : GeneralContent.DOCKER_CONFIG_PARAMS_MAP.keySet()) { |
274 | - if (!requestMap.containsKey(param)) { | 293 | + if (!requestParams.containsKey(param)) { |
275 | errorList.add(param + "参数不能为空"); | 294 | errorList.add(param + "参数不能为空"); |
276 | } else { | 295 | } else { |
277 | - restRequestMap.put(param, (String) requestMap.get(param)); | 296 | + restRequestMap.put(param, requestParams.get(param)); |
278 | } | 297 | } |
279 | } | 298 | } |
280 | if (errorList.size() > 0) { | 299 | if (errorList.size() > 0) { |
@@ -282,7 +301,10 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -282,7 +301,10 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
282 | return resultObj; | 301 | return resultObj; |
283 | } | 302 | } |
284 | 303 | ||
285 | - ResponseEntity<String> responseEntity = restTemplate.postForEntity(http + ":" + port + uri, restRequestMap, String.class); | 304 | + HttpHeaders httpHeaders = new HttpHeaders(); |
305 | + httpHeaders.setContentType(MediaType.APPLICATION_JSON); | ||
306 | + HttpEntity<Object> httpEntity = new HttpEntity<>(restRequestMap, httpHeaders); | ||
307 | + ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://" + http + ":" + port + uri, httpEntity, String.class); | ||
286 | resultObj = JSON.parseObject(responseEntity.getBody()); | 308 | resultObj = JSON.parseObject(responseEntity.getBody()); |
287 | return resultObj; | 309 | return resultObj; |
288 | } | 310 | } |
@@ -394,6 +416,7 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -394,6 +416,7 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
394 | } | 416 | } |
395 | List<SyServiceConfigItem> configItems = configIdItemsMap.get(syServiceConfig.getId()); | 417 | List<SyServiceConfigItem> configItems = configIdItemsMap.get(syServiceConfig.getId()); |
396 | VSyServiceMainTable vSyServiceMainTable = new VSyServiceMainTable(); | 418 | VSyServiceMainTable vSyServiceMainTable = new VSyServiceMainTable(); |
419 | + vSyServiceMainTable.setServiceName(syServiceConfig.getServiceName()); | ||
397 | vSyServiceMainTable.setUpdateTime(DateUtil.format(new Date(syServiceConfig.getUpdateTime()), "yyyy-MM-dd HH:mm:ss")); | 420 | vSyServiceMainTable.setUpdateTime(DateUtil.format(new Date(syServiceConfig.getUpdateTime()), "yyyy-MM-dd HH:mm:ss")); |
398 | vSyServiceMainTable.setConfigId(syServiceConfig.getId()); | 421 | vSyServiceMainTable.setConfigId(syServiceConfig.getId()); |
399 | 422 | ||
@@ -483,6 +506,7 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -483,6 +506,7 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
483 | cmd += containerId + " " + syServiceConfigItem.getItemValue(); | 506 | cmd += containerId + " " + syServiceConfigItem.getItemValue(); |
484 | } | 507 | } |
485 | List<String> outList = new ArrayList<>(); | 508 | List<String> outList = new ArrayList<>(); |
509 | + log.info("BackGroundServiceImpl|serviceDockerOthers|cmd: {}", cmd); | ||
486 | LinuxUtils.executeLinuxCmd(cmd, outList); | 510 | LinuxUtils.executeLinuxCmd(cmd, outList); |
487 | if ("remove".equals(action)) { | 511 | if ("remove".equals(action)) { |
488 | redisTemplate.opsForHash().delete(GeneralContent.REDIS_SERVICE_DOCKER_CONTAINER_ID, configId); | 512 | redisTemplate.opsForHash().delete(GeneralContent.REDIS_SERVICE_DOCKER_CONTAINER_ID, configId); |
@@ -547,10 +571,14 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -547,10 +571,14 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
547 | } | 571 | } |
548 | if ("0".equals(resultCode)) { | 572 | if ("0".equals(resultCode)) { |
549 | resultObj.put("result", resultMsg); | 573 | resultObj.put("result", resultMsg); |
574 | + // sdkController | ||
575 | + try { | ||
576 | + sdkController(configId); | ||
577 | + } catch (Exception ignored) { | ||
578 | + } | ||
550 | } else { | 579 | } else { |
551 | resultObj.put("error", resultMsg); | 580 | resultObj.put("error", resultMsg); |
552 | } | 581 | } |
553 | - | ||
554 | } else { | 582 | } else { |
555 | resultObj.put("error", "没有找到对应数据"); | 583 | resultObj.put("error", "没有找到对应数据"); |
556 | } | 584 | } |
@@ -648,39 +676,38 @@ public class BackGroundServiceImpl implements IBackGroundService { | @@ -648,39 +676,38 @@ public class BackGroundServiceImpl implements IBackGroundService { | ||
648 | /** | 676 | /** |
649 | * 获取配置服务支持的所有接口信息(固定对应的itemName为 serviceInterface, interfaceMould) | 677 | * 获取配置服务支持的所有接口信息(固定对应的itemName为 serviceInterface, interfaceMould) |
650 | * | 678 | * |
651 | - * @param configId 服务主键 | ||
652 | * @return 支持的所有接口信息 | 679 | * @return 支持的所有接口信息 |
653 | */ | 680 | */ |
654 | @Override | 681 | @Override |
655 | - public List<SyServiceInterfaceMould> findAllAvailableInterface(Integer configId) { | ||
656 | - // serviceInterface(除接口模板外还有的接口信息), interfaceMould(接口模板对应的id) | ||
657 | - List<SyServiceConfigItem> syServiceConfigItems = syServiceConfigItemMapper.selectByExample(SyServiceConfigItemExample | ||
658 | - .newAndCreateCriteria() | ||
659 | - .andConfigIdEqualTo(configId) | ||
660 | - .andItemNameIn(Arrays.asList("serviceInterface", "interfaceMould")).example()); | ||
661 | - | ||
662 | - List<Integer> interfaceMouldIdList = new ArrayList<>(); | ||
663 | - List<Integer> mouldIdList = new ArrayList<>(); | ||
664 | - for (SyServiceConfigItem syServiceConfigItem : syServiceConfigItems) { | ||
665 | - if (syServiceConfigItem == null) { | ||
666 | - continue; | ||
667 | - } | ||
668 | - if ("serviceInterface".equals(syServiceConfigItem.getItemName())) { | ||
669 | - interfaceMouldIdList.add(Integer.valueOf(syServiceConfigItem.getItemValue())); | ||
670 | - } else if ("interfaceMould".equals(syServiceConfigItem.getItemName())) { | ||
671 | - mouldIdList.add(Integer.valueOf(syServiceConfigItem.getItemValue())); | 682 | + public List<SyServiceInterfaceMould> findAllAvailableInterface() { |
683 | + List<SyServiceInterfaceMould> interfaceMoulds = syServiceInterfaceMouldMapper.selectByExample(SyServiceInterfaceMouldExample.newAndCreateCriteria().example()); | ||
684 | + interfaceMoulds.forEach(syServiceInterfaceMould -> { | ||
685 | + if (syServiceInterfaceMould.getUri().contains("analysisBase64")) { | ||
686 | + JSONObject tempJson = new JSONObject(); | ||
687 | + try { | ||
688 | + byte[] bytes = Files.readAllBytes(Paths.get(TEST_BASE64_PATH)); | ||
689 | + tempJson.put("TPXX", Base64.getEncoder().encodeToString(bytes)); | ||
690 | + } catch (IOException e) { | ||
691 | + e.printStackTrace(); | ||
692 | + } | ||
693 | + syServiceInterfaceMould.setDefaultJson(tempJson.toJSONString()); | ||
694 | + } else if (syServiceInterfaceMould.getUri().contains("analysisUrl")) { | ||
695 | + JSONObject tempJson = new JSONObject(); | ||
696 | + tempJson.put("TPXX", TEST_PIC_URL); | ||
697 | + syServiceInterfaceMould.setDefaultJson(tempJson.toJSONString()); | ||
672 | } | 698 | } |
673 | - } | ||
674 | - SyServiceInterfaceMouldExample syServiceInterfaceMouldExample = new SyServiceInterfaceMouldExample(); | ||
675 | - boolean hasCondition = false; | ||
676 | - if (interfaceMouldIdList.size() > 0) { | ||
677 | - hasCondition = true; | ||
678 | - syServiceInterfaceMouldExample.or(SyServiceInterfaceMouldExample.newAndCreateCriteria().andIdIn(interfaceMouldIdList)); | ||
679 | - } | ||
680 | - if (mouldIdList.size() > 0) { | ||
681 | - hasCondition = true; | ||
682 | - syServiceInterfaceMouldExample.or(SyServiceInterfaceMouldExample.newAndCreateCriteria().andMouldIdIn(mouldIdList)); | ||
683 | - } | ||
684 | - return hasCondition ? syServiceInterfaceMouldMapper.selectByExample(syServiceInterfaceMouldExample) : new ArrayList<>(); | 699 | + }); |
700 | + return interfaceMoulds; | ||
701 | + } | ||
702 | + | ||
703 | + /** | ||
704 | + * 获取引擎返回结果对应信息表 | ||
705 | + * | ||
706 | + * @return 结果集 | ||
707 | + */ | ||
708 | + @Override | ||
709 | + public Map<String, List<SyVehicleResultContent>> findVehicleResultContent() { | ||
710 | + List<SyVehicleResultContent> contents = syVehicleResultContentMapper.selectByExample(SyVehicleResultContentExample.newAndCreateCriteria().example()); | ||
711 | + return contents.stream().collect(Collectors.groupingBy(SyVehicleResultContent::getContentTable)); | ||
685 | } | 712 | } |
686 | } | 713 | } |
src/main/java/com/objecteye/vo/VSyServiceMainTable.java
@@ -13,6 +13,10 @@ public class VSyServiceMainTable implements Serializable { | @@ -13,6 +13,10 @@ public class VSyServiceMainTable implements Serializable { | ||
13 | 13 | ||
14 | private static final long serialVersionUID = -7792368195135334610L; | 14 | private static final long serialVersionUID = -7792368195135334610L; |
15 | /** | 15 | /** |
16 | + * 配置服务名称 | ||
17 | + */ | ||
18 | + private String serviceName; | ||
19 | + /** | ||
16 | * 显卡编号 | 20 | * 显卡编号 |
17 | */ | 21 | */ |
18 | private String gpuId; | 22 | private String gpuId; |
src/main/resources/application-dev.yml
@@ -3,9 +3,7 @@ spring: | @@ -3,9 +3,7 @@ spring: | ||
3 | url: jdbc:mysql://192.168.10.153:3306/sy_vehicle?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai | 3 | url: jdbc:mysql://192.168.10.153:3306/sy_vehicle?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai |
4 | username: root | 4 | username: root |
5 | password: 123456 | 5 | password: 123456 |
6 | - data: | ||
7 | - mongodb: | ||
8 | - uri: mongodb://vehicle:shiyu2018@192.168.10.153:27017/vehicle | 6 | + |
9 | servlet: | 7 | servlet: |
10 | multipart: | 8 | multipart: |
11 | max-file-size: 20MB | 9 | max-file-size: 20MB |
src/main/resources/application-test.yml
1 | spring: | 1 | spring: |
2 | datasource: | 2 | datasource: |
3 | - url: jdbc:mysql://192.168.10.117:3306/sy_sdk?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai | 3 | + url: jdbc:mysql://192.168.10.6:3306/sy_sdk?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai |
4 | username: root | 4 | username: root |
5 | password: 123456 | 5 | password: 123456 |
6 | - data: | ||
7 | - mongodb: | ||
8 | - uri: mongodb://vehicle:shiyu2018@192.168.10.117:27017/vehicle | ||
9 | servlet: | 6 | servlet: |
10 | multipart: | 7 | multipart: |
11 | max-file-size: 20MB | 8 | max-file-size: 20MB |
12 | max-request-size: 20MB | 9 | max-request-size: 20MB |
13 | redis: | 10 | redis: |
14 | database: 0 | 11 | database: 0 |
15 | - host: 192.168.10.117 | 12 | + host: 192.168.10.6 |
16 | port: 6379 | 13 | port: 6379 |
17 | jedis: | 14 | jedis: |
18 | pool: | 15 | pool: |
src/main/resources/application.yml
1 | spring: | 1 | spring: |
2 | profiles: | 2 | profiles: |
3 | active: test #默认开发环境 | 3 | active: test #默认开发环境 |
4 | - rabbitmq: | ||
5 | - host: 192.168.10.117 | ||
6 | - port: 5672 | ||
7 | - username: shiyu | ||
8 | - password: shiyu | ||
9 | - virtualHost: / | ||
10 | 4 | ||
11 | 5 | ||
12 | mybatis: | 6 | mybatis: |
@@ -27,5 +21,9 @@ logging: | @@ -27,5 +21,9 @@ logging: | ||
27 | # path: /var/logs #配置日志文件名称 | 21 | # path: /var/logs #配置日志文件名称 |
28 | 22 | ||
29 | server: | 23 | server: |
30 | - port: 8888 | ||
31 | - address: 192.168.10.117 | ||
32 | \ No newline at end of file | 24 | \ No newline at end of file |
25 | + port: 8845 | ||
26 | + address: 192.168.10.6 | ||
27 | + | ||
28 | +# 默认预留的引擎测试文件信息 | ||
29 | +testBase64Path: /home/haoyu/static/picture/test01.jpg | ||
30 | +testPicUrl: http://192.168.10.6:8891/picture/test01.jpg | ||
33 | \ No newline at end of file | 31 | \ No newline at end of file |
src/main/resources/com.objecteye.mapper/SyServiceInterfaceMouldMapper.xml
@@ -2,13 +2,12 @@ | @@ -2,13 +2,12 @@ | ||
2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | <mapper namespace="com.objecteye.mapper.SyServiceInterfaceMouldMapper"> | 3 | <mapper namespace="com.objecteye.mapper.SyServiceInterfaceMouldMapper"> |
4 | <resultMap id="BaseResultMap" type="com.objecteye.entity.SyServiceInterfaceMould"> | 4 | <resultMap id="BaseResultMap" type="com.objecteye.entity.SyServiceInterfaceMould"> |
5 | - <id column="id" jdbcType="INTEGER" property="id"/> | ||
6 | - <result column="mould_id" jdbcType="INTEGER" property="mouldId"/> | ||
7 | - <result column="method_type" jdbcType="VARCHAR" property="methodType"/> | ||
8 | - <result column="content_type" jdbcType="VARCHAR" property="contentType"/> | ||
9 | - <result column="uri" jdbcType="VARCHAR" property="uri"/> | ||
10 | - <result column="default_json" jdbcType="VARCHAR" property="defaultJson"/> | ||
11 | - <result column="sort" jdbcType="INTEGER" property="sort"/> | 5 | + <id column="id" jdbcType="INTEGER" property="id"/> |
6 | + <result column="method_type" jdbcType="VARCHAR" property="methodType"/> | ||
7 | + <result column="content_type" jdbcType="VARCHAR" property="contentType"/> | ||
8 | + <result column="uri" jdbcType="VARCHAR" property="uri"/> | ||
9 | + <result column="default_json" jdbcType="VARCHAR" property="defaultJson"/> | ||
10 | + <result column="sort" jdbcType="INTEGER" property="sort"/> | ||
12 | </resultMap> | 11 | </resultMap> |
13 | <sql id="Example_Where_Clause"> | 12 | <sql id="Example_Where_Clause"> |
14 | <where> | 13 | <where> |
@@ -69,20 +68,20 @@ | @@ -69,20 +68,20 @@ | ||
69 | </where> | 68 | </where> |
70 | </sql> | 69 | </sql> |
71 | <sql id="Base_Column_List"> | 70 | <sql id="Base_Column_List"> |
72 | - id, mould_id, method_type, content_type, uri, default_json, sort | 71 | + id, method_type, content_type, uri, default_json, sort |
73 | </sql> | 72 | </sql> |
74 | - <select id="selectByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample" | ||
75 | - resultMap="BaseResultMap"> | ||
76 | - select | ||
77 | - <if test="distinct"> | ||
78 | - distinct | ||
79 | - </if> | ||
80 | - <include refid="Base_Column_List"/> | ||
81 | - from sy_service_interface_mould | ||
82 | - <if test="_parameter != null"> | ||
83 | - <include refid="Example_Where_Clause"/> | ||
84 | - </if> | ||
85 | - <if test="orderByClause != null"> | 73 | + <select id="selectByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample" |
74 | + resultMap="BaseResultMap"> | ||
75 | + select | ||
76 | + <if test="distinct"> | ||
77 | + distinct | ||
78 | + </if> | ||
79 | + <include refid="Base_Column_List"/> | ||
80 | + from sy_service_interface_mould | ||
81 | + <if test="_parameter != null"> | ||
82 | + <include refid="Example_Where_Clause"/> | ||
83 | + </if> | ||
84 | + <if test="orderByClause != null"> | ||
86 | order by ${orderByClause} | 85 | order by ${orderByClause} |
87 | </if> | 86 | </if> |
88 | <if test="rows != null"> | 87 | <if test="rows != null"> |
@@ -94,33 +93,33 @@ | @@ -94,33 +93,33 @@ | ||
94 | </if> | 93 | </if> |
95 | </if> | 94 | </if> |
96 | </select> | 95 | </select> |
97 | - <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | ||
98 | - select | ||
99 | - <include refid="Base_Column_List"/> | ||
100 | - from sy_service_interface_mould | ||
101 | - where id = #{id,jdbcType=INTEGER} | ||
102 | - </select> | 96 | + <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> |
97 | + select | ||
98 | + <include refid="Base_Column_List"/> | ||
99 | + from sy_service_interface_mould | ||
100 | + where id = #{id,jdbcType=INTEGER} | ||
101 | + </select> | ||
103 | <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> | 102 | <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> |
104 | - delete | ||
105 | - from sy_service_interface_mould | ||
106 | - where id = #{id,jdbcType=INTEGER} | 103 | + delete |
104 | + from sy_service_interface_mould | ||
105 | + where id = #{id,jdbcType=INTEGER} | ||
107 | </delete> | 106 | </delete> |
108 | <delete id="deleteByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample"> | 107 | <delete id="deleteByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample"> |
109 | delete from sy_service_interface_mould | 108 | delete from sy_service_interface_mould |
110 | <if test="_parameter != null"> | 109 | <if test="_parameter != null"> |
111 | - <include refid="Example_Where_Clause"/> | 110 | + <include refid="Example_Where_Clause"/> |
112 | </if> | 111 | </if> |
113 | </delete> | 112 | </delete> |
114 | <insert id="insert" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> | 113 | <insert id="insert" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> |
115 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer"> | 114 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer"> |
116 | SELECT LAST_INSERT_ID() | 115 | SELECT LAST_INSERT_ID() |
117 | </selectKey> | 116 | </selectKey> |
118 | - insert into sy_service_interface_mould (id, mould_id, method_type, | ||
119 | - content_type, uri, default_json, | ||
120 | - sort) | ||
121 | - values (#{id,jdbcType=INTEGER}, #{mouldId,jdbcType=INTEGER}, #{methodType,jdbcType=VARCHAR}, | ||
122 | - #{contentType,jdbcType=VARCHAR}, #{uri,jdbcType=VARCHAR}, #{defaultJson,jdbcType=VARCHAR}, | ||
123 | - #{sort,jdbcType=INTEGER}) | 117 | + insert into sy_service_interface_mould (id, method_type, content_type, |
118 | + uri, default_json, sort | ||
119 | + ) | ||
120 | + values (#{id,jdbcType=INTEGER}, #{methodType,jdbcType=VARCHAR}, #{contentType,jdbcType=VARCHAR}, | ||
121 | + #{uri,jdbcType=VARCHAR}, #{defaultJson,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER} | ||
122 | + ) | ||
124 | </insert> | 123 | </insert> |
125 | <insert id="insertSelective" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> | 124 | <insert id="insertSelective" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> |
126 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer"> | 125 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer"> |
@@ -129,9 +128,6 @@ | @@ -129,9 +128,6 @@ | ||
129 | insert into sy_service_interface_mould | 128 | insert into sy_service_interface_mould |
130 | <trim prefix="(" suffix=")" suffixOverrides=","> | 129 | <trim prefix="(" suffix=")" suffixOverrides=","> |
131 | id, | 130 | id, |
132 | - <if test="mouldId != null"> | ||
133 | - mould_id, | ||
134 | - </if> | ||
135 | <if test="methodType != null"> | 131 | <if test="methodType != null"> |
136 | method_type, | 132 | method_type, |
137 | </if> | 133 | </if> |
@@ -150,9 +146,6 @@ | @@ -150,9 +146,6 @@ | ||
150 | </trim> | 146 | </trim> |
151 | <trim prefix="values (" suffix=")" suffixOverrides=","> | 147 | <trim prefix="values (" suffix=")" suffixOverrides=","> |
152 | #{id,jdbcType=INTEGER}, | 148 | #{id,jdbcType=INTEGER}, |
153 | - <if test="mouldId != null"> | ||
154 | - #{mouldId,jdbcType=INTEGER}, | ||
155 | - </if> | ||
156 | <if test="methodType != null"> | 149 | <if test="methodType != null"> |
157 | #{methodType,jdbcType=VARCHAR}, | 150 | #{methodType,jdbcType=VARCHAR}, |
158 | </if> | 151 | </if> |
@@ -170,22 +163,19 @@ | @@ -170,22 +163,19 @@ | ||
170 | </if> | 163 | </if> |
171 | </trim> | 164 | </trim> |
172 | </insert> | 165 | </insert> |
173 | - <select id="countByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample" | ||
174 | - resultType="java.lang.Long"> | ||
175 | - select count(*) from sy_service_interface_mould | ||
176 | - <if test="_parameter != null"> | ||
177 | - <include refid="Example_Where_Clause"/> | ||
178 | - </if> | ||
179 | - </select> | 166 | + <select id="countByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample" |
167 | + resultType="java.lang.Long"> | ||
168 | + select count(*) from sy_service_interface_mould | ||
169 | + <if test="_parameter != null"> | ||
170 | + <include refid="Example_Where_Clause"/> | ||
171 | + </if> | ||
172 | + </select> | ||
180 | <update id="updateByExampleSelective" parameterType="map"> | 173 | <update id="updateByExampleSelective" parameterType="map"> |
181 | update sy_service_interface_mould | 174 | update sy_service_interface_mould |
182 | <set> | 175 | <set> |
183 | <if test="record.id != null"> | 176 | <if test="record.id != null"> |
184 | id = #{record.id,jdbcType=INTEGER}, | 177 | id = #{record.id,jdbcType=INTEGER}, |
185 | </if> | 178 | </if> |
186 | - <if test="record.mouldId != null"> | ||
187 | - mould_id = #{record.mouldId,jdbcType=INTEGER}, | ||
188 | - </if> | ||
189 | <if test="record.methodType != null"> | 179 | <if test="record.methodType != null"> |
190 | method_type = #{record.methodType,jdbcType=VARCHAR}, | 180 | method_type = #{record.methodType,jdbcType=VARCHAR}, |
191 | </if> | 181 | </if> |
@@ -203,28 +193,24 @@ | @@ -203,28 +193,24 @@ | ||
203 | </if> | 193 | </if> |
204 | </set> | 194 | </set> |
205 | <if test="_parameter != null"> | 195 | <if test="_parameter != null"> |
206 | - <include refid="Update_By_Example_Where_Clause"/> | 196 | + <include refid="Update_By_Example_Where_Clause"/> |
207 | </if> | 197 | </if> |
208 | </update> | 198 | </update> |
209 | <update id="updateByExample" parameterType="map"> | 199 | <update id="updateByExample" parameterType="map"> |
210 | - update sy_service_interface_mould | ||
211 | - set id = #{record.id,jdbcType=INTEGER}, | ||
212 | - mould_id = #{record.mouldId,jdbcType=INTEGER}, | ||
213 | - method_type = #{record.methodType,jdbcType=VARCHAR}, | ||
214 | - content_type = #{record.contentType,jdbcType=VARCHAR}, | ||
215 | - uri = #{record.uri,jdbcType=VARCHAR}, | ||
216 | - default_json = #{record.defaultJson,jdbcType=VARCHAR}, | ||
217 | - sort = #{record.sort,jdbcType=INTEGER} | ||
218 | - <if test="_parameter != null"> | ||
219 | - <include refid="Update_By_Example_Where_Clause"/> | 200 | + update sy_service_interface_mould |
201 | + set id = #{record.id,jdbcType=INTEGER}, | ||
202 | + method_type = #{record.methodType,jdbcType=VARCHAR}, | ||
203 | + content_type = #{record.contentType,jdbcType=VARCHAR}, | ||
204 | + uri = #{record.uri,jdbcType=VARCHAR}, | ||
205 | + default_json = #{record.defaultJson,jdbcType=VARCHAR}, | ||
206 | + sort = #{record.sort,jdbcType=INTEGER} | ||
207 | + <if test="_parameter != null"> | ||
208 | + <include refid="Update_By_Example_Where_Clause"/> | ||
220 | </if> | 209 | </if> |
221 | </update> | 210 | </update> |
222 | <update id="updateByPrimaryKeySelective" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> | 211 | <update id="updateByPrimaryKeySelective" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> |
223 | update sy_service_interface_mould | 212 | update sy_service_interface_mould |
224 | <set> | 213 | <set> |
225 | - <if test="mouldId != null"> | ||
226 | - mould_id = #{mouldId,jdbcType=INTEGER}, | ||
227 | - </if> | ||
228 | <if test="methodType != null"> | 214 | <if test="methodType != null"> |
229 | method_type = #{methodType,jdbcType=VARCHAR}, | 215 | method_type = #{methodType,jdbcType=VARCHAR}, |
230 | </if> | 216 | </if> |
@@ -244,26 +230,25 @@ | @@ -244,26 +230,25 @@ | ||
244 | where id = #{id,jdbcType=INTEGER} | 230 | where id = #{id,jdbcType=INTEGER} |
245 | </update> | 231 | </update> |
246 | <update id="updateByPrimaryKey" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> | 232 | <update id="updateByPrimaryKey" parameterType="com.objecteye.entity.SyServiceInterfaceMould"> |
247 | - update sy_service_interface_mould | ||
248 | - set mould_id = #{mouldId,jdbcType=INTEGER}, | ||
249 | - method_type = #{methodType,jdbcType=VARCHAR}, | ||
250 | - content_type = #{contentType,jdbcType=VARCHAR}, | ||
251 | - uri = #{uri,jdbcType=VARCHAR}, | ||
252 | - default_json = #{defaultJson,jdbcType=VARCHAR}, | ||
253 | - sort = #{sort,jdbcType=INTEGER} | ||
254 | - where id = #{id,jdbcType=INTEGER} | 233 | + update sy_service_interface_mould |
234 | + set method_type = #{methodType,jdbcType=VARCHAR}, | ||
235 | + content_type = #{contentType,jdbcType=VARCHAR}, | ||
236 | + uri = #{uri,jdbcType=VARCHAR}, | ||
237 | + default_json = #{defaultJson,jdbcType=VARCHAR}, | ||
238 | + sort = #{sort,jdbcType=INTEGER} | ||
239 | + where id = #{id,jdbcType=INTEGER} | ||
255 | </update> | 240 | </update> |
256 | - <select id="selectOneByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample" | ||
257 | - resultMap="BaseResultMap"> | ||
258 | - select | ||
259 | - <include refid="Base_Column_List"/> | ||
260 | - from sy_service_interface_mould | ||
261 | - <if test="_parameter != null"> | ||
262 | - <include refid="Example_Where_Clause"/> | ||
263 | - </if> | ||
264 | - <if test="orderByClause != null"> | ||
265 | - order by ${orderByClause} | ||
266 | - </if> | ||
267 | - limit 1 | 241 | + <select id="selectOneByExample" parameterType="com.objecteye.entity.SyServiceInterfaceMouldExample" |
242 | + resultMap="BaseResultMap"> | ||
243 | + select | ||
244 | + <include refid="Base_Column_List"/> | ||
245 | + from sy_service_interface_mould | ||
246 | + <if test="_parameter != null"> | ||
247 | + <include refid="Example_Where_Clause"/> | ||
248 | + </if> | ||
249 | + <if test="orderByClause != null"> | ||
250 | + order by ${orderByClause} | ||
251 | + </if> | ||
252 | + limit 1 | ||
268 | </select> | 253 | </select> |
269 | </mapper> | 254 | </mapper> |
270 | \ No newline at end of file | 255 | \ No newline at end of file |
src/main/resources/com.objecteye.mapper/SyVehicleResultContentMapper.xml
0 → 100644
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
3 | +<mapper namespace="com.objecteye.mapper.SyVehicleResultContentMapper"> | ||
4 | + <resultMap id="BaseResultMap" type="com.objecteye.entity.SyVehicleResultContent"> | ||
5 | + <id column="id" jdbcType="INTEGER" property="id"/> | ||
6 | + <result column="code" jdbcType="VARCHAR" property="code"/> | ||
7 | + <result column="item_name" jdbcType="VARCHAR" property="itemName"/> | ||
8 | + <result column="item_type" jdbcType="VARCHAR" property="itemType"/> | ||
9 | + <result column="description" jdbcType="VARCHAR" property="description"/> | ||
10 | + <result column="content_table" jdbcType="VARCHAR" property="contentTable"/> | ||
11 | + </resultMap> | ||
12 | + <sql id="Example_Where_Clause"> | ||
13 | + <where> | ||
14 | + <foreach collection="oredCriteria" item="criteria" separator="or"> | ||
15 | + <if test="criteria.valid"> | ||
16 | + <trim prefix="(" prefixOverrides="and" suffix=")"> | ||
17 | + <foreach collection="criteria.criteria" item="criterion"> | ||
18 | + <choose> | ||
19 | + <when test="criterion.noValue"> | ||
20 | + and ${criterion.condition} | ||
21 | + </when> | ||
22 | + <when test="criterion.singleValue"> | ||
23 | + and ${criterion.condition} #{criterion.value} | ||
24 | + </when> | ||
25 | + <when test="criterion.betweenValue"> | ||
26 | + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} | ||
27 | + </when> | ||
28 | + <when test="criterion.listValue"> | ||
29 | + and ${criterion.condition} | ||
30 | + <foreach close=")" collection="criterion.value" item="listItem" open="(" | ||
31 | + separator=","> | ||
32 | + #{listItem} | ||
33 | + </foreach> | ||
34 | + </when> | ||
35 | + </choose> | ||
36 | + </foreach> | ||
37 | + </trim> | ||
38 | + </if> | ||
39 | + </foreach> | ||
40 | + </where> | ||
41 | + </sql> | ||
42 | + <sql id="Update_By_Example_Where_Clause"> | ||
43 | + <where> | ||
44 | + <foreach collection="example.oredCriteria" item="criteria" separator="or"> | ||
45 | + <if test="criteria.valid"> | ||
46 | + <trim prefix="(" prefixOverrides="and" suffix=")"> | ||
47 | + <foreach collection="criteria.criteria" item="criterion"> | ||
48 | + <choose> | ||
49 | + <when test="criterion.noValue"> | ||
50 | + and ${criterion.condition} | ||
51 | + </when> | ||
52 | + <when test="criterion.singleValue"> | ||
53 | + and ${criterion.condition} #{criterion.value} | ||
54 | + </when> | ||
55 | + <when test="criterion.betweenValue"> | ||
56 | + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} | ||
57 | + </when> | ||
58 | + <when test="criterion.listValue"> | ||
59 | + and ${criterion.condition} | ||
60 | + <foreach close=")" collection="criterion.value" item="listItem" open="(" | ||
61 | + separator=","> | ||
62 | + #{listItem} | ||
63 | + </foreach> | ||
64 | + </when> | ||
65 | + </choose> | ||
66 | + </foreach> | ||
67 | + </trim> | ||
68 | + </if> | ||
69 | + </foreach> | ||
70 | + </where> | ||
71 | + </sql> | ||
72 | + <sql id="Base_Column_List"> | ||
73 | + id, code, item_name, item_type, description, content_table | ||
74 | + </sql> | ||
75 | + <select id="selectByExample" parameterType="com.objecteye.entity.SyVehicleResultContentExample" | ||
76 | + resultMap="BaseResultMap"> | ||
77 | + select | ||
78 | + <if test="distinct"> | ||
79 | + distinct | ||
80 | + </if> | ||
81 | + <include refid="Base_Column_List"/> | ||
82 | + from sy_vehicle_result_content | ||
83 | + <if test="_parameter != null"> | ||
84 | + <include refid="Example_Where_Clause"/> | ||
85 | + </if> | ||
86 | + <if test="orderByClause != null"> | ||
87 | + order by ${orderByClause} | ||
88 | + </if> | ||
89 | + <if test="rows != null"> | ||
90 | + <if test="offset != null"> | ||
91 | + limit ${offset}, ${rows} | ||
92 | + </if> | ||
93 | + <if test="offset == null"> | ||
94 | + limit ${rows} | ||
95 | + </if> | ||
96 | + </if> | ||
97 | + </select> | ||
98 | + <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | ||
99 | + select | ||
100 | + <include refid="Base_Column_List"/> | ||
101 | + from sy_vehicle_result_content | ||
102 | + where id = #{id,jdbcType=INTEGER} | ||
103 | + </select> | ||
104 | + <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> | ||
105 | + delete | ||
106 | + from sy_vehicle_result_content | ||
107 | + where id = #{id,jdbcType=INTEGER} | ||
108 | + </delete> | ||
109 | + <delete id="deleteByExample" parameterType="com.objecteye.entity.SyVehicleResultContentExample"> | ||
110 | + delete from sy_vehicle_result_content | ||
111 | + <if test="_parameter != null"> | ||
112 | + <include refid="Example_Where_Clause"/> | ||
113 | + </if> | ||
114 | + </delete> | ||
115 | + <insert id="insert" parameterType="com.objecteye.entity.SyVehicleResultContent"> | ||
116 | + <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer"> | ||
117 | + SELECT LAST_INSERT_ID() | ||
118 | + </selectKey> | ||
119 | + insert into sy_vehicle_result_content (id, code, item_name, | ||
120 | + item_type, description, content_table | ||
121 | + ) | ||
122 | + values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{itemName,jdbcType=VARCHAR}, | ||
123 | + #{itemType,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{contentTable,jdbcType=VARCHAR} | ||
124 | + ) | ||
125 | + </insert> | ||
126 | + <insert id="insertSelective" parameterType="com.objecteye.entity.SyVehicleResultContent"> | ||
127 | + <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer"> | ||
128 | + SELECT LAST_INSERT_ID() | ||
129 | + </selectKey> | ||
130 | + insert into sy_vehicle_result_content | ||
131 | + <trim prefix="(" suffix=")" suffixOverrides=","> | ||
132 | + id, | ||
133 | + <if test="code != null"> | ||
134 | + code, | ||
135 | + </if> | ||
136 | + <if test="itemName != null"> | ||
137 | + item_name, | ||
138 | + </if> | ||
139 | + <if test="itemType != null"> | ||
140 | + item_type, | ||
141 | + </if> | ||
142 | + <if test="description != null"> | ||
143 | + description, | ||
144 | + </if> | ||
145 | + <if test="contentTable != null"> | ||
146 | + content_table, | ||
147 | + </if> | ||
148 | + </trim> | ||
149 | + <trim prefix="values (" suffix=")" suffixOverrides=","> | ||
150 | + #{id,jdbcType=INTEGER}, | ||
151 | + <if test="code != null"> | ||
152 | + #{code,jdbcType=VARCHAR}, | ||
153 | + </if> | ||
154 | + <if test="itemName != null"> | ||
155 | + #{itemName,jdbcType=VARCHAR}, | ||
156 | + </if> | ||
157 | + <if test="itemType != null"> | ||
158 | + #{itemType,jdbcType=VARCHAR}, | ||
159 | + </if> | ||
160 | + <if test="description != null"> | ||
161 | + #{description,jdbcType=VARCHAR}, | ||
162 | + </if> | ||
163 | + <if test="contentTable != null"> | ||
164 | + #{contentTable,jdbcType=VARCHAR}, | ||
165 | + </if> | ||
166 | + </trim> | ||
167 | + </insert> | ||
168 | + <select id="countByExample" parameterType="com.objecteye.entity.SyVehicleResultContentExample" | ||
169 | + resultType="java.lang.Long"> | ||
170 | + select count(*) from sy_vehicle_result_content | ||
171 | + <if test="_parameter != null"> | ||
172 | + <include refid="Example_Where_Clause"/> | ||
173 | + </if> | ||
174 | + </select> | ||
175 | + <update id="updateByExampleSelective" parameterType="map"> | ||
176 | + update sy_vehicle_result_content | ||
177 | + <set> | ||
178 | + <if test="record.id != null"> | ||
179 | + id = #{record.id,jdbcType=INTEGER}, | ||
180 | + </if> | ||
181 | + <if test="record.code != null"> | ||
182 | + code = #{record.code,jdbcType=VARCHAR}, | ||
183 | + </if> | ||
184 | + <if test="record.itemName != null"> | ||
185 | + item_name = #{record.itemName,jdbcType=VARCHAR}, | ||
186 | + </if> | ||
187 | + <if test="record.itemType != null"> | ||
188 | + item_type = #{record.itemType,jdbcType=VARCHAR}, | ||
189 | + </if> | ||
190 | + <if test="record.description != null"> | ||
191 | + description = #{record.description,jdbcType=VARCHAR}, | ||
192 | + </if> | ||
193 | + <if test="record.contentTable != null"> | ||
194 | + content_table = #{record.contentTable,jdbcType=VARCHAR}, | ||
195 | + </if> | ||
196 | + </set> | ||
197 | + <if test="_parameter != null"> | ||
198 | + <include refid="Update_By_Example_Where_Clause"/> | ||
199 | + </if> | ||
200 | + </update> | ||
201 | + <update id="updateByExample" parameterType="map"> | ||
202 | + update sy_vehicle_result_content | ||
203 | + set id = #{record.id,jdbcType=INTEGER}, | ||
204 | + code = #{record.code,jdbcType=VARCHAR}, | ||
205 | + item_name = #{record.itemName,jdbcType=VARCHAR}, | ||
206 | + item_type = #{record.itemType,jdbcType=VARCHAR}, | ||
207 | + description = #{record.description,jdbcType=VARCHAR}, | ||
208 | + content_table = #{record.contentTable,jdbcType=VARCHAR} | ||
209 | + <if test="_parameter != null"> | ||
210 | + <include refid="Update_By_Example_Where_Clause"/> | ||
211 | + </if> | ||
212 | + </update> | ||
213 | + <update id="updateByPrimaryKeySelective" parameterType="com.objecteye.entity.SyVehicleResultContent"> | ||
214 | + update sy_vehicle_result_content | ||
215 | + <set> | ||
216 | + <if test="code != null"> | ||
217 | + code = #{code,jdbcType=VARCHAR}, | ||
218 | + </if> | ||
219 | + <if test="itemName != null"> | ||
220 | + item_name = #{itemName,jdbcType=VARCHAR}, | ||
221 | + </if> | ||
222 | + <if test="itemType != null"> | ||
223 | + item_type = #{itemType,jdbcType=VARCHAR}, | ||
224 | + </if> | ||
225 | + <if test="description != null"> | ||
226 | + description = #{description,jdbcType=VARCHAR}, | ||
227 | + </if> | ||
228 | + <if test="contentTable != null"> | ||
229 | + content_table = #{contentTable,jdbcType=VARCHAR}, | ||
230 | + </if> | ||
231 | + </set> | ||
232 | + where id = #{id,jdbcType=INTEGER} | ||
233 | + </update> | ||
234 | + <update id="updateByPrimaryKey" parameterType="com.objecteye.entity.SyVehicleResultContent"> | ||
235 | + update sy_vehicle_result_content | ||
236 | + set code = #{code,jdbcType=VARCHAR}, | ||
237 | + item_name = #{itemName,jdbcType=VARCHAR}, | ||
238 | + item_type = #{itemType,jdbcType=VARCHAR}, | ||
239 | + description = #{description,jdbcType=VARCHAR}, | ||
240 | + content_table = #{contentTable,jdbcType=VARCHAR} | ||
241 | + where id = #{id,jdbcType=INTEGER} | ||
242 | + </update> | ||
243 | + <select id="selectOneByExample" parameterType="com.objecteye.entity.SyVehicleResultContentExample" | ||
244 | + resultMap="BaseResultMap"> | ||
245 | + select | ||
246 | + <include refid="Base_Column_List"/> | ||
247 | + from sy_vehicle_result_content | ||
248 | + <if test="_parameter != null"> | ||
249 | + <include refid="Example_Where_Clause"/> | ||
250 | + </if> | ||
251 | + <if test="orderByClause != null"> | ||
252 | + order by ${orderByClause} | ||
253 | + </if> | ||
254 | + limit 1 | ||
255 | + </select> | ||
256 | +</mapper> | ||
0 | \ No newline at end of file | 257 | \ No newline at end of file |