Showing
6 changed files
with
45 additions
and
44 deletions
| ... | @@ -36,8 +36,8 @@ public class ConsignmentUtil { | ... | @@ -36,8 +36,8 @@ public class ConsignmentUtil { |
| 36 | 36 | ||
| 37 | // 校验字段是否匹配,并将错误信息添加到errList中 | 37 | // 校验字段是否匹配,并将错误信息添加到errList中 |
| 38 | checkFieldMismatch(bo.getShipperAccount(), consignment.getShipperAccount(), "con_shipperAccount", errList); | 38 | checkFieldMismatch(bo.getShipperAccount(), consignment.getShipperAccount(), "con_shipperAccount", errList); |
| 39 | - checkFieldMismatch(bo.getRecipientCountry(), consignment.getRecipientCountry(), "con_recipientCountry", errList); | 39 | + //checkFieldMismatch(bo.getRecipientCountry(), consignment.getRecipientCountry(), "con_recipientCountry", errList); |
| 40 | - checkFieldMismatch(bo.getShipperCountry(), consignment.getShipperCountry(), "con_shipperCountry", errList); | 40 | + //checkFieldMismatch(bo.getShipperCountry(), consignment.getShipperCountry(), "con_shipperCountry", errList); |
| 41 | 41 | ||
| 42 | if (!errList.isEmpty()) { | 42 | if (!errList.isEmpty()) { |
| 43 | String enumResCode601 = localeMessageUtil.getMessage("enum_res_code_601"); | 43 | String enumResCode601 = localeMessageUtil.getMessage("enum_res_code_601"); | ... | ... |
| 1 | +package com.fedex.connect.common.dao.sys; | ||
| 2 | + | ||
| 3 | +import com.fedex.connect.common.model.sys.RedisSlab; | ||
| 4 | +import com.fedex.connect.common.model.sys.RedisSlabExample; | ||
| 5 | +import org.apache.ibatis.annotations.Param; | ||
| 6 | + | ||
| 7 | +import java.util.List; | ||
| 8 | + | ||
| 9 | +public interface RedisSlabMapper { | ||
| 10 | + long countByExample(RedisSlabExample example); | ||
| 11 | + | ||
| 12 | + int deleteByExample(RedisSlabExample example); | ||
| 13 | + | ||
| 14 | + int deleteByPrimaryKey(Long id); | ||
| 15 | + | ||
| 16 | + int insert(RedisSlab record); | ||
| 17 | + | ||
| 18 | + int insertSelective(RedisSlab record); | ||
| 19 | + | ||
| 20 | + List<RedisSlab> selectByExample(RedisSlabExample example); | ||
| 21 | + | ||
| 22 | + RedisSlab selectByPrimaryKey(Long id); | ||
| 23 | + | ||
| 24 | + int updateByExampleSelective(@Param("record") RedisSlab record, @Param("example") RedisSlabExample example); | ||
| 25 | + | ||
| 26 | + int updateByExample(@Param("record") RedisSlab record, @Param("example") RedisSlabExample example); | ||
| 27 | + | ||
| 28 | + int updateByPrimaryKeySelective(RedisSlab record); | ||
| 29 | + | ||
| 30 | + int updateByPrimaryKey(RedisSlab record); | ||
| 31 | +} | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
server/common-dao/src/main/java/com/fedex/connect/common/dao/sys/redisSlabMapper.java
deleted
100644 → 0
| 1 | -package com.fedex.connect.common.dao.sys; | ||
| 2 | - | ||
| 3 | -import com.fedex.connect.common.model.sys.redisSlab; | ||
| 4 | -import com.fedex.connect.common.model.sys.redisSlabExample; | ||
| 5 | -import java.util.List; | ||
| 6 | -import org.apache.ibatis.annotations.Param; | ||
| 7 | - | ||
| 8 | -public interface redisSlabMapper { | ||
| 9 | - long countByExample(redisSlabExample example); | ||
| 10 | - | ||
| 11 | - int deleteByExample(redisSlabExample example); | ||
| 12 | - | ||
| 13 | - int deleteByPrimaryKey(Long id); | ||
| 14 | - | ||
| 15 | - int insert(redisSlab record); | ||
| 16 | - | ||
| 17 | - int insertSelective(redisSlab record); | ||
| 18 | - | ||
| 19 | - List<redisSlab> selectByExample(redisSlabExample example); | ||
| 20 | - | ||
| 21 | - redisSlab selectByPrimaryKey(Long id); | ||
| 22 | - | ||
| 23 | - int updateByExampleSelective(@Param("record") redisSlab record, @Param("example") redisSlabExample example); | ||
| 24 | - | ||
| 25 | - int updateByExample(@Param("record") redisSlab record, @Param("example") redisSlabExample example); | ||
| 26 | - | ||
| 27 | - int updateByPrimaryKeySelective(redisSlab record); | ||
| 28 | - | ||
| 29 | - int updateByPrimaryKey(redisSlab record); | ||
| 30 | -} | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 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"> | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
| 3 | -<mapper namespace="com.fedex.connect.common.dao.sys.redisSlabMapper"> | 3 | +<mapper namespace="com.fedex.connect.common.dao.sys.RedisSlabMapper"> |
| 4 | - <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.sys.redisSlab"> | 4 | + <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.sys.RedisSlab"> |
| 5 | <id column="ID" jdbcType="NUMERIC" property="id" /> | 5 | <id column="ID" jdbcType="NUMERIC" property="id" /> |
| 6 | <result column="REDIS_KEY" jdbcType="VARCHAR" property="redisKey" /> | 6 | <result column="REDIS_KEY" jdbcType="VARCHAR" property="redisKey" /> |
| 7 | <result column="REDIS_MSG" jdbcType="VARCHAR" property="redisMsg" /> | 7 | <result column="REDIS_MSG" jdbcType="VARCHAR" property="redisMsg" /> |
| ... | @@ -76,7 +76,7 @@ | ... | @@ -76,7 +76,7 @@ |
| 76 | ID, REDIS_KEY, REDIS_MSG, VALID_DURATION, DIS_TIME, CREATE_TIME, CREATE_USER_ID, | 76 | ID, REDIS_KEY, REDIS_MSG, VALID_DURATION, DIS_TIME, CREATE_TIME, CREATE_USER_ID, |
| 77 | CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME | 77 | CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME |
| 78 | </sql> | 78 | </sql> |
| 79 | - <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample" resultMap="BaseResultMap"> | 79 | + <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample" resultMap="BaseResultMap"> |
| 80 | <include refid="OracleDialectPrefix" /> | 80 | <include refid="OracleDialectPrefix" /> |
| 81 | select | 81 | select |
| 82 | <if test="distinct"> | 82 | <if test="distinct"> |
| ... | @@ -103,13 +103,13 @@ | ... | @@ -103,13 +103,13 @@ |
| 103 | delete from T_SYS_REDIS_SLAB | 103 | delete from T_SYS_REDIS_SLAB |
| 104 | where ID = #{id,jdbcType=NUMERIC} | 104 | where ID = #{id,jdbcType=NUMERIC} |
| 105 | </delete> | 105 | </delete> |
| 106 | - <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample"> | 106 | + <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample"> |
| 107 | delete from T_SYS_REDIS_SLAB | 107 | delete from T_SYS_REDIS_SLAB |
| 108 | <if test="_parameter != null"> | 108 | <if test="_parameter != null"> |
| 109 | <include refid="Example_Where_Clause" /> | 109 | <include refid="Example_Where_Clause" /> |
| 110 | </if> | 110 | </if> |
| 111 | </delete> | 111 | </delete> |
| 112 | - <insert id="insert" parameterType="com.fedex.connect.common.model.sys.redisSlab"> | 112 | + <insert id="insert" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> |
| 113 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> | 113 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> |
| 114 | SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL | 114 | SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL |
| 115 | </selectKey> | 115 | </selectKey> |
| ... | @@ -122,7 +122,7 @@ | ... | @@ -122,7 +122,7 @@ |
| 122 | #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, | 122 | #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, |
| 123 | #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}) | 123 | #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}) |
| 124 | </insert> | 124 | </insert> |
| 125 | - <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.redisSlab"> | 125 | + <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> |
| 126 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> | 126 | <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> |
| 127 | SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL | 127 | SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL |
| 128 | </selectKey> | 128 | </selectKey> |
| ... | @@ -194,7 +194,7 @@ | ... | @@ -194,7 +194,7 @@ |
| 194 | </if> | 194 | </if> |
| 195 | </trim> | 195 | </trim> |
| 196 | </insert> | 196 | </insert> |
| 197 | - <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample" resultType="java.lang.Long"> | 197 | + <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample" resultType="java.lang.Long"> |
| 198 | select count(*) from T_SYS_REDIS_SLAB | 198 | select count(*) from T_SYS_REDIS_SLAB |
| 199 | <if test="_parameter != null"> | 199 | <if test="_parameter != null"> |
| 200 | <include refid="Example_Where_Clause" /> | 200 | <include refid="Example_Where_Clause" /> |
| ... | @@ -258,7 +258,7 @@ | ... | @@ -258,7 +258,7 @@ |
| 258 | <include refid="Update_By_Example_Where_Clause" /> | 258 | <include refid="Update_By_Example_Where_Clause" /> |
| 259 | </if> | 259 | </if> |
| 260 | </update> | 260 | </update> |
| 261 | - <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.redisSlab"> | 261 | + <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> |
| 262 | update T_SYS_REDIS_SLAB | 262 | update T_SYS_REDIS_SLAB |
| 263 | <set> | 263 | <set> |
| 264 | <if test="redisKey != null"> | 264 | <if test="redisKey != null"> |
| ... | @@ -294,7 +294,7 @@ | ... | @@ -294,7 +294,7 @@ |
| 294 | </set> | 294 | </set> |
| 295 | where ID = #{id,jdbcType=NUMERIC} | 295 | where ID = #{id,jdbcType=NUMERIC} |
| 296 | </update> | 296 | </update> |
| 297 | - <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.redisSlab"> | 297 | + <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> |
| 298 | update T_SYS_REDIS_SLAB | 298 | update T_SYS_REDIS_SLAB |
| 299 | set REDIS_KEY = #{redisKey,jdbcType=VARCHAR}, | 299 | set REDIS_KEY = #{redisKey,jdbcType=VARCHAR}, |
| 300 | REDIS_MSG = #{redisMsg,jdbcType=VARCHAR}, | 300 | REDIS_MSG = #{redisMsg,jdbcType=VARCHAR}, | ... | ... |
| ... | @@ -7,7 +7,7 @@ import java.util.Date; | ... | @@ -7,7 +7,7 @@ import java.util.Date; |
| 7 | * DESC: 用户登录信息token表 | 7 | * DESC: 用户登录信息token表 |
| 8 | * TABLE: T_SYS_REDIS_SLAB | 8 | * TABLE: T_SYS_REDIS_SLAB |
| 9 | */ | 9 | */ |
| 10 | -public class redisSlab implements Serializable { | 10 | +public class RedisSlab implements Serializable { |
| 11 | /** | 11 | /** |
| 12 | * ID,自动增加 | 12 | * ID,自动增加 |
| 13 | */ | 13 | */ | ... | ... |
| ... | @@ -4,7 +4,7 @@ import java.util.ArrayList; | ... | @@ -4,7 +4,7 @@ import java.util.ArrayList; |
| 4 | import java.util.Date; | 4 | import java.util.Date; |
| 5 | import java.util.List; | 5 | import java.util.List; |
| 6 | 6 | ||
| 7 | -public class redisSlabExample { | 7 | +public class RedisSlabExample { |
| 8 | protected String orderByClause; | 8 | protected String orderByClause; |
| 9 | 9 | ||
| 10 | protected boolean distinct; | 10 | protected boolean distinct; |
| ... | @@ -15,7 +15,7 @@ public class redisSlabExample { | ... | @@ -15,7 +15,7 @@ public class redisSlabExample { |
| 15 | 15 | ||
| 16 | protected Integer limitSize; | 16 | protected Integer limitSize; |
| 17 | 17 | ||
| 18 | - public redisSlabExample() { | 18 | + public RedisSlabExample() { |
| 19 | oredCriteria = new ArrayList<Criteria>(); | 19 | oredCriteria = new ArrayList<Criteria>(); |
| 20 | } | 20 | } |
| 21 | 21 | ... | ... |
-
Please register or login to post a comment