Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
91b73aff
Commit
91b73aff
authored
Nov 28, 2024
by
董国亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复mybatis 根据map查询的bug
parent
f4340281
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
8 deletions
+21
-8
GreenwaveInducesController.java
...nji/opt/controller/induce/GreenwaveInducesController.java
+4
-1
GreenwaveInducesHistController.java
...opt/controller/induce/GreenwaveInducesHistController.java
+5
-1
InduceHistController.java
...net/wanji/opt/controller/induce/InduceHistController.java
+6
-5
InduceTemplateController.java
...wanji/opt/controller/induce/InduceTemplateController.java
+6
-1
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesController.java
View file @
91b73aff
...
...
@@ -10,6 +10,7 @@ import net.wanji.common.framework.i18n.I18nResourceBundle;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.common.framework.rest.Page
;
import
net.wanji.common.framework.rest.ValidationGroups
;
import
net.wanji.common.utils.tool.StringUtils
;
import
net.wanji.databus.dao.entity.GreenwaveInfoPO
;
import
net.wanji.databus.dao.mapper.GreenwaveInfoMapper
;
import
net.wanji.opt.dto.induce.GreenwaveDTO
;
...
...
@@ -141,7 +142,9 @@ public class GreenwaveInducesController {
String
jsonStr
=
JSON
.
toJSONString
(
GreenwaveInduces
);
try
{
//参数校验过程中修改,兼容实现,restful入参不用map,便于进行参数逐个校验
Map
params
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
GreenwaveInduces
),
Map
.
class
);
//Map params = JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInduces), Map.class);
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
GreenwaveInduces
),
Map
.
class
).
forEach
((
k
,
v
)
->
params
.
put
(
StringUtils
.
camelToCapital
(
k
.
toString
()).
toLowerCase
(),
v
));
List
<
GreenwaveInduces
>
greenwaveInducesList
=
this
.
greenwaveInducesService
.
listByMap
(
params
);
List
<
InduceTemplate
>
induceTemplateList
=
induceTemplateService
.
list
();
List
<
DeviceInduces
>
deviceInducesList
=
deviceInducesService
.
list
();
...
...
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/GreenwaveInducesHistController.java
View file @
91b73aff
...
...
@@ -10,6 +10,7 @@ import net.wanji.common.framework.i18n.I18nResourceBundle;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.common.framework.rest.Page
;
import
net.wanji.common.framework.rest.ValidationGroups
;
import
net.wanji.common.utils.tool.StringUtils
;
import
net.wanji.databus.dao.entity.GreenwaveInfoPO
;
import
net.wanji.databus.dao.mapper.GreenwaveInfoMapper
;
import
net.wanji.opt.dto.induce.GreenwaveInducesDTO
;
...
...
@@ -146,7 +147,10 @@ public class GreenwaveInducesHistController {
String
jsonStr
=
JSON
.
toJSONString
(
GreenwaveInducesHist
);
try
{
//参数校验过程中修改,兼容实现,restful入参不用map,便于进行参数逐个校验
Map
params
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
GreenwaveInducesHist
),
Map
.
class
);
// Map params = JSONObject.parseObject(JSONObject.toJSONString(GreenwaveInducesHist), Map.class);
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
GreenwaveInducesHist
),
Map
.
class
).
forEach
((
k
,
v
)
->
params
.
put
(
StringUtils
.
camelToCapital
(
k
.
toString
()).
toLowerCase
(),
v
));
List
<
GreenwaveInducesDTO
>
list
=
new
ArrayList
<>();
List
<
GreenwaveInducesHist
>
greenwaveInducesHistList
=
this
.
greenwaveInducesHistService
.
listByMap
(
params
);
List
<
GreenwaveInfoPO
>
greenwaveInfoPOList
=
greenwaveInfoMapper
.
selectAll
();
...
...
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceHistController.java
View file @
91b73aff
...
...
@@ -10,6 +10,7 @@ import net.wanji.common.framework.i18n.I18nResourceBundle;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.common.framework.rest.Page
;
import
net.wanji.common.framework.rest.ValidationGroups
;
import
net.wanji.common.utils.tool.StringUtils
;
import
net.wanji.opt.dto.induce.InduceDTO
;
import
net.wanji.opt.entity.InduceHist
;
import
net.wanji.opt.service.induce.InduceHistService
;
...
...
@@ -20,10 +21,7 @@ import javax.annotation.Resource;
import
javax.validation.constraints.NotBlank
;
import
javax.ws.rs.QueryParam
;
import
javax.ws.rs.core.MediaType
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
/**
* <p>
...
...
@@ -78,7 +76,10 @@ public class InduceHistController {
String
jsonStr
=
JSON
.
toJSONString
(
InduceHist
);
try
{
//参数校验过程中修改,兼容实现,restful入参不用map,便于进行参数逐个校验
Map
params
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
InduceHist
),
Map
.
class
);
// Map params = JSONObject.parseObject(JSONObject.toJSONString(InduceHist), Map.class);
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
InduceHist
),
Map
.
class
).
forEach
((
k
,
v
)
->
params
.
put
(
StringUtils
.
camelToCapital
(
k
.
toString
()).
toLowerCase
(),
v
));
List
list
=
this
.
induceHistService
.
listByMap
(
params
);
jsonView
.
success
(
list
);
}
catch
(
Exception
e
)
{
...
...
signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceTemplateController.java
View file @
91b73aff
...
...
@@ -10,6 +10,7 @@ import net.wanji.common.framework.i18n.I18nResourceBundle;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.common.framework.rest.Page
;
import
net.wanji.common.framework.rest.ValidationGroups
;
import
net.wanji.common.utils.tool.StringUtils
;
import
net.wanji.opt.entity.InduceTemplate
;
import
net.wanji.opt.service.induce.InduceTemplateService
;
import
org.springframework.validation.annotation.Validated
;
...
...
@@ -20,6 +21,7 @@ import javax.validation.constraints.NotBlank;
import
javax.ws.rs.QueryParam
;
import
javax.ws.rs.core.MediaType
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -77,7 +79,10 @@ public class InduceTemplateController {
String
jsonStr
=
JSON
.
toJSONString
(
InduceTemplate
);
try
{
//参数校验过程中修改,兼容实现,restful入参不用map,便于进行参数逐个校验
Map
params
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
InduceTemplate
),
Map
.
class
);
// Map params = JSONObject.parseObject(JSONObject.toJSONString(InduceTemplate), Map.class);
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
InduceTemplate
),
Map
.
class
).
forEach
((
k
,
v
)
->
params
.
put
(
StringUtils
.
camelToCapital
(
k
.
toString
()).
toLowerCase
(),
v
));
List
list
=
this
.
induceTemplateService
.
listByMap
(
params
);
jsonView
.
success
(
list
);
}
catch
(
Exception
e
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment