Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
4b21da27
Commit
4b21da27
authored
Sep 17, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] fixed some filed type error
parent
158e0c4c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
23 deletions
+23
-23
DimensionServiceImpl.java
...a/pwc/taxtech/atms/service/impl/DimensionServiceImpl.java
+2
-2
generatorConfig.xml
atms-dao/etc/generator-oracle/generatorConfig.xml
+3
-3
Dimension.java
...-dao/src/main/java/pwc/taxtech/atms/entity/Dimension.java
+3
-3
Region.java
atms-dao/src/main/java/pwc/taxtech/atms/entity/Region.java
+6
-6
Dimension.java
...-gen/src/main/java/pwc/taxtech/atms/entity/Dimension.java
+3
-3
Region.java
atms-gen/src/main/java/pwc/taxtech/atms/entity/Region.java
+6
-6
No files found.
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DimensionServiceImpl.java
View file @
4b21da27
...
...
@@ -432,8 +432,8 @@ public class DimensionServiceImpl extends AbstractService implements DimensionSe
Dimension
entity
=
new
Dimension
();
CommonUtils
.
copyProperties
(
model
,
entity
);
entity
.
setId
(
CommonUtils
.
getUUID
());
boolean
orderIndex
=
dimensionMapper
.
selectByExample
(
null
).
stream
().
map
(
Dimension:
:
getOrderIndex
)
.
filter
(
Objects:
:
nonNull
).
max
(
Comparator
.
naturalOrder
()).
orElse
(
false
);
Short
orderIndex
=
dimensionMapper
.
selectByExample
(
null
).
stream
().
map
(
Dimension:
:
getOrderIndex
)
.
filter
(
Objects:
:
nonNull
).
max
(
Comparator
.
naturalOrder
()).
orElse
(
Short
.
valueOf
(
"0"
)
);
entity
.
setOrderIndex
(
orderIndex
);
entity
.
setIsSystemDimension
(
false
);
...
...
atms-dao/etc/generator-oracle/generatorConfig.xml
View file @
4b21da27
...
...
@@ -122,7 +122,7 @@
<table
tableName=
"DIMENSION"
schema=
"tax_admin"
domainObjectName=
"Dimension"
>
<property
name=
"useActualColumnNames"
value=
"false"
/>
<property
name=
"ignoreQualifiersAtRuntime"
value=
"true"
/>
<columnOverride
column=
"ORDER_INDEX"
javaType=
"java.lang.
Boolean
"
/>
<columnOverride
column=
"ORDER_INDEX"
javaType=
"java.lang.
Short
"
/>
<columnOverride
column=
"IS_MANDATORY"
javaType=
"java.lang.Boolean"
/>
<columnOverride
column=
"IS_ACTIVE"
javaType=
"java.lang.Boolean"
/>
<columnOverride
column=
"IS_SYSTEM_DIMENSION"
javaType=
"java.lang.Boolean"
/>
...
...
@@ -340,8 +340,8 @@
<property
name=
"useActualColumnNames"
value=
"false"
/>
<property
name=
"ignoreQualifiersAtRuntime"
value=
"true"
/>
<columnOverride
column=
"LEVEL_TYPE"
javaType=
"java.lang.Integer"
/>
<columnOverride
column=
"LONGITUDE"
javaType=
"
Double
"
/>
<columnOverride
column=
"LATITUDE"
javaType=
"
Double
"
/>
<columnOverride
column=
"LONGITUDE"
javaType=
"
java.lang.Float
"
/>
<columnOverride
column=
"LATITUDE"
javaType=
"
java.lang.Float
"
/>
<columnOverride
column=
"IS_ACTIVE"
javaType=
"java.lang.Boolean"
/>
</table>
...
...
atms-dao/src/main/java/pwc/taxtech/atms/entity/Dimension.java
View file @
4b21da27
...
...
@@ -45,7 +45,7 @@ public class Dimension extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
private
Boolean
orderIndex
;
private
Short
orderIndex
;
/**
*
...
...
@@ -198,7 +198,7 @@ public class Dimension extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public
Boolean
getOrderIndex
()
{
public
Short
getOrderIndex
()
{
return
orderIndex
;
}
...
...
@@ -210,7 +210,7 @@ public class Dimension extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public
void
setOrderIndex
(
Boolean
orderIndex
)
{
public
void
setOrderIndex
(
Short
orderIndex
)
{
this
.
orderIndex
=
orderIndex
;
}
...
...
atms-dao/src/main/java/pwc/taxtech/atms/entity/Region.java
View file @
4b21da27
...
...
@@ -87,7 +87,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
*
* @mbg.generated
*/
private
Double
longitude
;
private
Float
longitude
;
/**
* This field was generated by MyBatis Generator.
...
...
@@ -95,7 +95,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
*
* @mbg.generated
*/
private
Double
latitude
;
private
Float
latitude
;
/**
* This field was generated by MyBatis Generator.
...
...
@@ -318,7 +318,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @return the value of REGION.LONGITUDE
* @mbg.generated
*/
public
Double
getLongitude
()
{
public
Float
getLongitude
()
{
return
longitude
;
}
...
...
@@ -329,7 +329,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @param longitude the value for REGION.LONGITUDE
* @mbg.generated
*/
public
void
setLongitude
(
Double
longitude
)
{
public
void
setLongitude
(
Float
longitude
)
{
this
.
longitude
=
longitude
;
}
...
...
@@ -340,7 +340,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @return the value of REGION.LATITUDE
* @mbg.generated
*/
public
Double
getLatitude
()
{
public
Float
getLatitude
()
{
return
latitude
;
}
...
...
@@ -351,7 +351,7 @@ public class Region extends BaseEntity implements Serializable, Cloneable {
* @param latitude the value for REGION.LATITUDE
* @mbg.generated
*/
public
void
setLatitude
(
Double
latitude
)
{
public
void
setLatitude
(
Float
latitude
)
{
this
.
latitude
=
latitude
;
}
...
...
atms-gen/src/main/java/pwc/taxtech/atms/entity/Dimension.java
View file @
4b21da27
...
...
@@ -18,7 +18,7 @@ public class Dimension {
private
String
id
;
private
String
name
;
private
String
attributeId
;
private
Boolean
orderIndex
;
private
Short
orderIndex
;
private
Boolean
isMandatory
;
private
Boolean
isActive
;
private
Boolean
isSystemDimension
;
...
...
@@ -61,11 +61,11 @@ public class Dimension {
@Basic
@Column
(
name
=
"ORDER_INDEX"
,
nullable
=
false
)
public
Boolean
getOrderIndex
()
{
public
Short
getOrderIndex
()
{
return
orderIndex
;
}
public
void
setOrderIndex
(
Boolean
orderIndex
)
{
public
void
setOrderIndex
(
Short
orderIndex
)
{
this
.
orderIndex
=
orderIndex
;
}
...
...
atms-gen/src/main/java/pwc/taxtech/atms/entity/Region.java
View file @
4b21da27
...
...
@@ -23,8 +23,8 @@ public class Region {
private
String
telCode
;
private
String
zipCode
;
private
String
pinYin
;
private
Double
longitude
;
private
Double
latitude
;
private
Float
longitude
;
private
Float
latitude
;
private
Boolean
isActive
;
@Id
...
...
@@ -128,22 +128,22 @@ public class Region {
@Basic
@Column
(
name
=
"LONGITUDE"
,
nullable
=
false
,
precision
=
0
)
@ColumnDefault
(
DEF_DEFAULT_BIG_DECIMAL
)
public
Double
getLongitude
()
{
public
Float
getLongitude
()
{
return
longitude
;
}
public
void
setLongitude
(
Double
longitude
)
{
public
void
setLongitude
(
Float
longitude
)
{
this
.
longitude
=
longitude
;
}
@Basic
@Column
(
name
=
"LATITUDE"
,
nullable
=
false
,
precision
=
0
)
@ColumnDefault
(
DEF_DEFAULT_BIG_DECIMAL
)
public
Double
getLatitude
()
{
public
Float
getLatitude
()
{
return
latitude
;
}
public
void
setLatitude
(
Double
latitude
)
{
public
void
setLatitude
(
Float
latitude
)
{
this
.
latitude
=
latitude
;
}
...
...
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