Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-Connect-Pre-Clearance
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zelong.shao
2024-11-11 11:15:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
42d329e66d933254a0fc178be41dc04df6b005e6
42d329e6
1 parent
e474f9d4
dao|dao层重新生成报错调整
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
44 deletions
server/biz-customer/src/main/java/com/fedex/connect/customer/util/service/biz/ConsignmentUtil.java
server/common-dao/src/main/java/com/fedex/connect/common/dao/sys/RedisSlabMapper.java
server/common-dao/src/main/java/com/fedex/connect/common/dao/sys/redisSlabMapper.java
server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/redisSlabMapper.xml → server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/RedisSlabMapper.xml
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/redisSlab.java → server/common-dao/src/main/java/com/fedex/connect/common/model/sys/RedisSlab.java
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/redisSlabExample.java → server/common-dao/src/main/java/com/fedex/connect/common/model/sys/RedisSlabExample.java
server/biz-customer/src/main/java/com/fedex/connect/customer/util/service/biz/ConsignmentUtil.java
View file @
42d329e
...
...
@@ -36,8 +36,8 @@ public class ConsignmentUtil {
// 校验字段是否匹配,并将错误信息添加到errList中
checkFieldMismatch
(
bo
.
getShipperAccount
(),
consignment
.
getShipperAccount
(),
"con_shipperAccount"
,
errList
);
checkFieldMismatch
(
bo
.
getRecipientCountry
(),
consignment
.
getRecipientCountry
(),
"con_recipientCountry"
,
errList
);
checkFieldMismatch
(
bo
.
getShipperCountry
(),
consignment
.
getShipperCountry
(),
"con_shipperCountry"
,
errList
);
//
checkFieldMismatch(bo.getRecipientCountry(), consignment.getRecipientCountry(), "con_recipientCountry", errList);
//
checkFieldMismatch(bo.getShipperCountry(), consignment.getShipperCountry(), "con_shipperCountry", errList);
if
(!
errList
.
isEmpty
())
{
String
enumResCode601
=
localeMessageUtil
.
getMessage
(
"enum_res_code_601"
);
...
...
server/common-dao/src/main/java/com/fedex/connect/common/dao/sys/RedisSlabMapper.java
0 → 100644
View file @
42d329e
package
com
.
fedex
.
connect
.
common
.
dao
.
sys
;
import
com.fedex.connect.common.model.sys.RedisSlab
;
import
com.fedex.connect.common.model.sys.RedisSlabExample
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
public
interface
RedisSlabMapper
{
long
countByExample
(
RedisSlabExample
example
);
int
deleteByExample
(
RedisSlabExample
example
);
int
deleteByPrimaryKey
(
Long
id
);
int
insert
(
RedisSlab
record
);
int
insertSelective
(
RedisSlab
record
);
List
<
RedisSlab
>
selectByExample
(
RedisSlabExample
example
);
RedisSlab
selectByPrimaryKey
(
Long
id
);
int
updateByExampleSelective
(
@Param
(
"record"
)
RedisSlab
record
,
@Param
(
"example"
)
RedisSlabExample
example
);
int
updateByExample
(
@Param
(
"record"
)
RedisSlab
record
,
@Param
(
"example"
)
RedisSlabExample
example
);
int
updateByPrimaryKeySelective
(
RedisSlab
record
);
int
updateByPrimaryKey
(
RedisSlab
record
);
}
\ No newline at end of file
server/common-dao/src/main/java/com/fedex/connect/common/dao/sys/redisSlabMapper.java
deleted
100644 → 0
View file @
e474f9d
package
com
.
fedex
.
connect
.
common
.
dao
.
sys
;
import
com.fedex.connect.common.model.sys.redisSlab
;
import
com.fedex.connect.common.model.sys.redisSlabExample
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
public
interface
redisSlabMapper
{
long
countByExample
(
redisSlabExample
example
);
int
deleteByExample
(
redisSlabExample
example
);
int
deleteByPrimaryKey
(
Long
id
);
int
insert
(
redisSlab
record
);
int
insertSelective
(
redisSlab
record
);
List
<
redisSlab
>
selectByExample
(
redisSlabExample
example
);
redisSlab
selectByPrimaryKey
(
Long
id
);
int
updateByExampleSelective
(
@Param
(
"record"
)
redisSlab
record
,
@Param
(
"example"
)
redisSlabExample
example
);
int
updateByExample
(
@Param
(
"record"
)
redisSlab
record
,
@Param
(
"example"
)
redisSlabExample
example
);
int
updateByPrimaryKeySelective
(
redisSlab
record
);
int
updateByPrimaryKey
(
redisSlab
record
);
}
\ No newline at end of file
server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/
r
edisSlabMapper.xml
→
server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/
R
edisSlabMapper.xml
View file @
42d329e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.fedex.connect.common.dao.sys.
r
edisSlabMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.fedex.connect.common.model.sys.
r
edisSlab"
>
<mapper
namespace=
"com.fedex.connect.common.dao.sys.
R
edisSlabMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.fedex.connect.common.model.sys.
R
edisSlab"
>
<id
column=
"ID"
jdbcType=
"NUMERIC"
property=
"id"
/>
<result
column=
"REDIS_KEY"
jdbcType=
"VARCHAR"
property=
"redisKey"
/>
<result
column=
"REDIS_MSG"
jdbcType=
"VARCHAR"
property=
"redisMsg"
/>
...
...
@@ -76,7 +76,7 @@
ID, REDIS_KEY, REDIS_MSG, VALID_DURATION, DIS_TIME, CREATE_TIME, CREATE_USER_ID,
CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
</sql>
<select
id=
"selectByExample"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlabExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectByExample"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlabExample"
resultMap=
"BaseResultMap"
>
<include
refid=
"OracleDialectPrefix"
/>
select
<if
test=
"distinct"
>
...
...
@@ -103,13 +103,13 @@
delete from T_SYS_REDIS_SLAB
where ID = #{id,jdbcType=NUMERIC}
</delete>
<delete
id=
"deleteByExample"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlabExample"
>
<delete
id=
"deleteByExample"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlabExample"
>
delete from T_SYS_REDIS_SLAB
<if
test=
"_parameter != null"
>
<include
refid=
"Example_Where_Clause"
/>
</if>
</delete>
<insert
id=
"insert"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlab"
>
<insert
id=
"insert"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlab"
>
<selectKey
keyProperty=
"id"
order=
"BEFORE"
resultType=
"java.lang.Long"
>
SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL
</selectKey>
...
...
@@ -122,7 +122,7 @@
#{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
#{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR})
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlab"
>
<insert
id=
"insertSelective"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlab"
>
<selectKey
keyProperty=
"id"
order=
"BEFORE"
resultType=
"java.lang.Long"
>
SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL
</selectKey>
...
...
@@ -194,7 +194,7 @@
</if>
</trim>
</insert>
<select
id=
"countByExample"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlabExample"
resultType=
"java.lang.Long"
>
<select
id=
"countByExample"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlabExample"
resultType=
"java.lang.Long"
>
select count(*) from T_SYS_REDIS_SLAB
<if
test=
"_parameter != null"
>
<include
refid=
"Example_Where_Clause"
/>
...
...
@@ -258,7 +258,7 @@
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
</update>
<update
id=
"updateByPrimaryKeySelective"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlab"
>
<update
id=
"updateByPrimaryKeySelective"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlab"
>
update T_SYS_REDIS_SLAB
<set>
<if
test=
"redisKey != null"
>
...
...
@@ -294,7 +294,7 @@
</set>
where ID = #{id,jdbcType=NUMERIC}
</update>
<update
id=
"updateByPrimaryKey"
parameterType=
"com.fedex.connect.common.model.sys.
r
edisSlab"
>
<update
id=
"updateByPrimaryKey"
parameterType=
"com.fedex.connect.common.model.sys.
R
edisSlab"
>
update T_SYS_REDIS_SLAB
set REDIS_KEY = #{redisKey,jdbcType=VARCHAR},
REDIS_MSG = #{redisMsg,jdbcType=VARCHAR},
...
...
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/
r
edisSlab.java
→
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/
R
edisSlab.java
View file @
42d329e
...
...
@@ -7,7 +7,7 @@ import java.util.Date;
* DESC: 用户登录信息token表
* TABLE: T_SYS_REDIS_SLAB
*/
public
class
r
edisSlab
implements
Serializable
{
public
class
R
edisSlab
implements
Serializable
{
/**
* ID,自动增加
*/
...
...
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/
r
edisSlabExample.java
→
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/
R
edisSlabExample.java
View file @
42d329e
...
...
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import
java.util.Date
;
import
java.util.List
;
public
class
r
edisSlabExample
{
public
class
R
edisSlabExample
{
protected
String
orderByClause
;
protected
boolean
distinct
;
...
...
@@ -15,7 +15,7 @@ public class redisSlabExample {
protected
Integer
limitSize
;
public
r
edisSlabExample
()
{
public
R
edisSlabExample
()
{
oredCriteria
=
new
ArrayList
<
Criteria
>();
}
...
...
Please
register
or
login
to post a comment