* master: Merge branch 'dev_yy' into 2.0-dev Merge branch 'dev_yy' into 2.0-dev 提交代码 提交代码 # Conflicts: # hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java # hai-bweb/src/main/java/com/bweb/controller/HighTestController.java # hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java # hai-service/src/main/java/com/hai/service/impl/ApiMerchantsServiceImpl.java # hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java # hai-user/target/classes/com/web/controller/DiscountController.class # hai-user/target/hai-user-1.0-SNAPSHOT.jar # hai-user/target/hai-user-1.0-SNAPSHOT.jar.original # hai-user/target/maven-archiver/pom.properties # hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst # hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # v1/src/main/java/com/v1/controller/ApiMerchantsController.java # v1/src/main/java/com/v1/controller/ApiOrderController.java # v1/src/main/java/com/v1/controller/HighOrderController.java # v1/src/main/java/com/v1/controller/ThirdPartyController.javadev-discount
commit
bc4dfd0d04
@ -1,158 +0,0 @@ |
||||
package com.bweb.controller; |
||||
|
||||
import com.alibaba.fastjson.JSONObject; |
||||
import com.hai.common.exception.ErrorCode; |
||||
import com.hai.common.exception.ErrorHelp; |
||||
import com.hai.common.exception.SysCode; |
||||
import com.hai.common.security.SessionObject; |
||||
import com.hai.common.security.UserCenter; |
||||
import com.hai.common.utils.RedisUtil; |
||||
import com.hai.common.utils.ResponseMsgUtil; |
||||
import com.hai.entity.ApiIpAddress; |
||||
import com.hai.entity.ApiMerchants; |
||||
import com.hai.model.ResponseData; |
||||
import com.hai.model.UserInfoModel; |
||||
import com.hai.service.ApiIpAddressService; |
||||
import com.hai.service.ApiMerchantsService; |
||||
import com.hai.service.CommonService; |
||||
import com.hai.service.SecConfigService; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import org.slf4j.Logger; |
||||
import org.slf4j.LoggerFactory; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.stereotype.Controller; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
import javax.annotation.Resource; |
||||
import javax.servlet.http.HttpServletRequest; |
||||
import java.util.Date; |
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
|
||||
@Controller |
||||
@RequestMapping(value = "/apiIpAddress") |
||||
@Api(value = "Ip地址管理") |
||||
public class ApiIpAddressController { |
||||
|
||||
Logger log = LoggerFactory.getLogger(ApiMemberProductController.class); |
||||
|
||||
@Resource |
||||
private ApiIpAddressService apiIpAddressService; |
||||
|
||||
@Autowired |
||||
private UserCenter userCenter; |
||||
|
||||
@Resource |
||||
private SecConfigService secConfigService; |
||||
|
||||
@Resource |
||||
private ApiMerchantsService apiMerchantsService; |
||||
|
||||
|
||||
@RequestMapping(value="/editApiIpAddress",method = RequestMethod.POST) |
||||
@ResponseBody |
||||
@ApiOperation(value = "编辑ip地址") |
||||
public ResponseData editApiIpAddress(@RequestBody ApiIpAddress apiIpAddress, HttpServletRequest request) { |
||||
try { |
||||
SessionObject sessionObject = userCenter.getSessionObject(request); |
||||
UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); |
||||
if (userInfoModel.getBsCompany() == null) { |
||||
log.error("HighMerchantController -> updateMerchant() error!","该主角色没有权限"); |
||||
throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); |
||||
} |
||||
|
||||
if (apiIpAddress.getMchId() == null) { |
||||
log.error("ApiMemberProductController -> insertMemberProduct() error!","参数错误"); |
||||
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); |
||||
} |
||||
|
||||
ApiIpAddress apiIpAddressEdit = apiIpAddressService.findByMchId(apiIpAddress.getMchId()); |
||||
|
||||
// 判断是否存在ip地址内容
|
||||
if (apiIpAddressEdit == null ) { |
||||
apiIpAddress.setCreateTime(new Date()); |
||||
apiIpAddress.setUpdateTime(new Date()); |
||||
apiIpAddressService.insertApiIpAddress(apiIpAddress); |
||||
} else { |
||||
apiIpAddressEdit.setUpdateTime(new Date()); |
||||
apiIpAddressEdit.setIpAddress(apiIpAddress.getIpAddress()); |
||||
apiIpAddressService.updateApiIpAddress(apiIpAddressEdit); |
||||
} |
||||
|
||||
|
||||
|
||||
return ResponseMsgUtil.success("新增成功"); |
||||
} catch (Exception e) { |
||||
log.error("ApiMerchantsController -> insertMerchant() error!",e); |
||||
return ResponseMsgUtil.exception(e); |
||||
} |
||||
} |
||||
|
||||
|
||||
@RequestMapping(value = "/findByMchId", method = RequestMethod.GET) |
||||
@ResponseBody |
||||
@ApiOperation(value = "根据商户号查询详情") |
||||
public ResponseData findByMchId(@RequestParam(value = "mchId", required = true) String mchId) { |
||||
try { |
||||
|
||||
return ResponseMsgUtil.success(apiIpAddressService.findByMchId(mchId)); |
||||
|
||||
} catch (Exception e) { |
||||
log.error("OutRechargePriceController --> findById() error!", e); |
||||
return ResponseMsgUtil.exception(e); |
||||
} |
||||
} |
||||
|
||||
@RequestMapping(value = "/getSecConfigList", method = RequestMethod.GET) |
||||
@ResponseBody |
||||
@ApiOperation(value = "根据商户号查询已配置接口") |
||||
public ResponseData getSecConfigList(@RequestParam(value = "mchId", required = true) String mchId) { |
||||
try { |
||||
|
||||
Map<String , Object> map = new HashMap<>(); |
||||
map.put("codeValue", mchId); |
||||
|
||||
return ResponseMsgUtil.success(secConfigService.getSecConfigList(map)); |
||||
|
||||
} catch (Exception e) { |
||||
log.error("OutRechargePriceController --> findById() error!", e); |
||||
return ResponseMsgUtil.exception(e); |
||||
} |
||||
} |
||||
|
||||
@RequestMapping(value="/configMerchant",method = RequestMethod.POST) |
||||
@ResponseBody |
||||
@ApiOperation(value = "配置门店可用接口") |
||||
public ResponseData configMerchant(@RequestBody JSONObject object, HttpServletRequest request) { |
||||
try { |
||||
SessionObject sessionObject = userCenter.getSessionObject(request); |
||||
UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); |
||||
if (userInfoModel.getBsCompany() == null) { |
||||
log.error("HighMerchantController -> updateMerchant() error!","该主角色没有权限"); |
||||
throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); |
||||
} |
||||
|
||||
if (object.getString("mchId") == null || object.getString("configProduct") == null) { |
||||
log.error("ApiMemberProductController -> insertMemberProduct() error!","参数错误"); |
||||
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); |
||||
} |
||||
|
||||
ApiMerchants merchants = apiMerchantsService.findByMchId(object.getString("mchId")); |
||||
|
||||
if (merchants == null) { |
||||
log.error("ApiMemberProductController -> insertMemberProduct() error!","商户状态错误"); |
||||
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户状态错误"); |
||||
} |
||||
|
||||
secConfigService.configMerchant(object.getString("mchId") , object.getString("configProduct")); |
||||
|
||||
return ResponseMsgUtil.success("配置成功"); |
||||
} catch (Exception e) { |
||||
log.error("ApiMerchantsController -> insertMerchant() error!",e); |
||||
return ResponseMsgUtil.exception(e); |
||||
} |
||||
} |
||||
|
||||
|
||||
} |
||||
File diff suppressed because one or more lines are too long
@ -1,108 +0,0 @@ |
||||
package com.hai.dao; |
||||
|
||||
import com.hai.entity.ApiIpAddress; |
||||
import com.hai.entity.ApiIpAddressExample; |
||||
import java.util.List; |
||||
import org.apache.ibatis.annotations.Delete; |
||||
import org.apache.ibatis.annotations.DeleteProvider; |
||||
import org.apache.ibatis.annotations.Insert; |
||||
import org.apache.ibatis.annotations.InsertProvider; |
||||
import org.apache.ibatis.annotations.Options; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import org.apache.ibatis.annotations.Result; |
||||
import org.apache.ibatis.annotations.Results; |
||||
import org.apache.ibatis.annotations.Select; |
||||
import org.apache.ibatis.annotations.SelectProvider; |
||||
import org.apache.ibatis.annotations.Update; |
||||
import org.apache.ibatis.annotations.UpdateProvider; |
||||
import org.apache.ibatis.type.JdbcType; |
||||
import org.springframework.stereotype.Repository; |
||||
|
||||
/** |
||||
* |
||||
* 代码由工具生成,请勿修改!!! |
||||
* 如果需要扩展请在其父类进行扩展 |
||||
* |
||||
**/ |
||||
@Repository |
||||
public interface ApiIpAddressMapper extends ApiIpAddressMapperExt { |
||||
@SelectProvider(type=ApiIpAddressSqlProvider.class, method="countByExample") |
||||
long countByExample(ApiIpAddressExample example); |
||||
|
||||
@DeleteProvider(type=ApiIpAddressSqlProvider.class, method="deleteByExample") |
||||
int deleteByExample(ApiIpAddressExample example); |
||||
|
||||
@Delete({ |
||||
"delete from api_ip_address", |
||||
"where id = #{id,jdbcType=BIGINT}" |
||||
}) |
||||
int deleteByPrimaryKey(Long id); |
||||
|
||||
@Insert({ |
||||
"insert into api_ip_address (ip_address, mch_id, ", |
||||
"create_time, update_time, ", |
||||
"ext_1, ext_2, ext_3)", |
||||
"values (#{ipAddress,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, ", |
||||
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", |
||||
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" |
||||
}) |
||||
@Options(useGeneratedKeys=true,keyProperty="id") |
||||
int insert(ApiIpAddress record); |
||||
|
||||
@InsertProvider(type=ApiIpAddressSqlProvider.class, method="insertSelective") |
||||
@Options(useGeneratedKeys=true,keyProperty="id") |
||||
int insertSelective(ApiIpAddress record); |
||||
|
||||
@SelectProvider(type=ApiIpAddressSqlProvider.class, method="selectByExample") |
||||
@Results({ |
||||
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), |
||||
@Result(column="ip_address", property="ipAddress", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="mch_id", property="mchId", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), |
||||
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), |
||||
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) |
||||
}) |
||||
List<ApiIpAddress> selectByExample(ApiIpAddressExample example); |
||||
|
||||
@Select({ |
||||
"select", |
||||
"id, ip_address, mch_id, create_time, update_time, ext_1, ext_2, ext_3", |
||||
"from api_ip_address", |
||||
"where id = #{id,jdbcType=BIGINT}" |
||||
}) |
||||
@Results({ |
||||
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), |
||||
@Result(column="ip_address", property="ipAddress", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="mch_id", property="mchId", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), |
||||
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), |
||||
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), |
||||
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) |
||||
}) |
||||
ApiIpAddress selectByPrimaryKey(Long id); |
||||
|
||||
@UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByExampleSelective") |
||||
int updateByExampleSelective(@Param("record") ApiIpAddress record, @Param("example") ApiIpAddressExample example); |
||||
|
||||
@UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByExample") |
||||
int updateByExample(@Param("record") ApiIpAddress record, @Param("example") ApiIpAddressExample example); |
||||
|
||||
@UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByPrimaryKeySelective") |
||||
int updateByPrimaryKeySelective(ApiIpAddress record); |
||||
|
||||
@Update({ |
||||
"update api_ip_address", |
||||
"set ip_address = #{ipAddress,jdbcType=VARCHAR},", |
||||
"mch_id = #{mchId,jdbcType=VARCHAR},", |
||||
"create_time = #{createTime,jdbcType=TIMESTAMP},", |
||||
"update_time = #{updateTime,jdbcType=TIMESTAMP},", |
||||
"ext_1 = #{ext1,jdbcType=VARCHAR},", |
||||
"ext_2 = #{ext2,jdbcType=VARCHAR},", |
||||
"ext_3 = #{ext3,jdbcType=VARCHAR}", |
||||
"where id = #{id,jdbcType=BIGINT}" |
||||
}) |
||||
int updateByPrimaryKey(ApiIpAddress record); |
||||
} |
||||
@ -1,7 +0,0 @@ |
||||
package com.hai.dao; |
||||
|
||||
/** |
||||
* mapper扩展类 |
||||
*/ |
||||
public interface ApiIpAddressMapperExt { |
||||
} |
||||
@ -1,276 +0,0 @@ |
||||
package com.hai.dao; |
||||
|
||||
import com.hai.entity.ApiIpAddress; |
||||
import com.hai.entity.ApiIpAddressExample.Criteria; |
||||
import com.hai.entity.ApiIpAddressExample.Criterion; |
||||
import com.hai.entity.ApiIpAddressExample; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import org.apache.ibatis.jdbc.SQL; |
||||
|
||||
public class ApiIpAddressSqlProvider { |
||||
|
||||
public String countByExample(ApiIpAddressExample example) { |
||||
SQL sql = new SQL(); |
||||
sql.SELECT("count(*)").FROM("api_ip_address"); |
||||
applyWhere(sql, example, false); |
||||
return sql.toString(); |
||||
} |
||||
|
||||
public String deleteByExample(ApiIpAddressExample example) { |
||||
SQL sql = new SQL(); |
||||
sql.DELETE_FROM("api_ip_address"); |
||||
applyWhere(sql, example, false); |
||||
return sql.toString(); |
||||
} |
||||
|
||||
public String insertSelective(ApiIpAddress record) { |
||||
SQL sql = new SQL(); |
||||
sql.INSERT_INTO("api_ip_address"); |
||||
|
||||
if (record.getIpAddress() != null) { |
||||
sql.VALUES("ip_address", "#{ipAddress,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getMchId() != null) { |
||||
sql.VALUES("mch_id", "#{mchId,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getCreateTime() != null) { |
||||
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); |
||||
} |
||||
|
||||
if (record.getUpdateTime() != null) { |
||||
sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); |
||||
} |
||||
|
||||
if (record.getExt1() != null) { |
||||
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getExt2() != null) { |
||||
sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getExt3() != null) { |
||||
sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
return sql.toString(); |
||||
} |
||||
|
||||
public String selectByExample(ApiIpAddressExample example) { |
||||
SQL sql = new SQL(); |
||||
if (example != null && example.isDistinct()) { |
||||
sql.SELECT_DISTINCT("id"); |
||||
} else { |
||||
sql.SELECT("id"); |
||||
} |
||||
sql.SELECT("ip_address"); |
||||
sql.SELECT("mch_id"); |
||||
sql.SELECT("create_time"); |
||||
sql.SELECT("update_time"); |
||||
sql.SELECT("ext_1"); |
||||
sql.SELECT("ext_2"); |
||||
sql.SELECT("ext_3"); |
||||
sql.FROM("api_ip_address"); |
||||
applyWhere(sql, example, false); |
||||
|
||||
if (example != null && example.getOrderByClause() != null) { |
||||
sql.ORDER_BY(example.getOrderByClause()); |
||||
} |
||||
|
||||
return sql.toString(); |
||||
} |
||||
|
||||
public String updateByExampleSelective(Map<String, Object> parameter) { |
||||
ApiIpAddress record = (ApiIpAddress) parameter.get("record"); |
||||
ApiIpAddressExample example = (ApiIpAddressExample) parameter.get("example"); |
||||
|
||||
SQL sql = new SQL(); |
||||
sql.UPDATE("api_ip_address"); |
||||
|
||||
if (record.getId() != null) { |
||||
sql.SET("id = #{record.id,jdbcType=BIGINT}"); |
||||
} |
||||
|
||||
if (record.getIpAddress() != null) { |
||||
sql.SET("ip_address = #{record.ipAddress,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getMchId() != null) { |
||||
sql.SET("mch_id = #{record.mchId,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getCreateTime() != null) { |
||||
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); |
||||
} |
||||
|
||||
if (record.getUpdateTime() != null) { |
||||
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); |
||||
} |
||||
|
||||
if (record.getExt1() != null) { |
||||
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getExt2() != null) { |
||||
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getExt3() != null) { |
||||
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
applyWhere(sql, example, true); |
||||
return sql.toString(); |
||||
} |
||||
|
||||
public String updateByExample(Map<String, Object> parameter) { |
||||
SQL sql = new SQL(); |
||||
sql.UPDATE("api_ip_address"); |
||||
|
||||
sql.SET("id = #{record.id,jdbcType=BIGINT}"); |
||||
sql.SET("ip_address = #{record.ipAddress,jdbcType=VARCHAR}"); |
||||
sql.SET("mch_id = #{record.mchId,jdbcType=VARCHAR}"); |
||||
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); |
||||
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); |
||||
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); |
||||
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); |
||||
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); |
||||
|
||||
ApiIpAddressExample example = (ApiIpAddressExample) parameter.get("example"); |
||||
applyWhere(sql, example, true); |
||||
return sql.toString(); |
||||
} |
||||
|
||||
public String updateByPrimaryKeySelective(ApiIpAddress record) { |
||||
SQL sql = new SQL(); |
||||
sql.UPDATE("api_ip_address"); |
||||
|
||||
if (record.getIpAddress() != null) { |
||||
sql.SET("ip_address = #{ipAddress,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getMchId() != null) { |
||||
sql.SET("mch_id = #{mchId,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getCreateTime() != null) { |
||||
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); |
||||
} |
||||
|
||||
if (record.getUpdateTime() != null) { |
||||
sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); |
||||
} |
||||
|
||||
if (record.getExt1() != null) { |
||||
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getExt2() != null) { |
||||
sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
if (record.getExt3() != null) { |
||||
sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); |
||||
} |
||||
|
||||
sql.WHERE("id = #{id,jdbcType=BIGINT}"); |
||||
|
||||
return sql.toString(); |
||||
} |
||||
|
||||
protected void applyWhere(SQL sql, ApiIpAddressExample example, boolean includeExamplePhrase) { |
||||
if (example == null) { |
||||
return; |
||||
} |
||||
|
||||
String parmPhrase1; |
||||
String parmPhrase1_th; |
||||
String parmPhrase2; |
||||
String parmPhrase2_th; |
||||
String parmPhrase3; |
||||
String parmPhrase3_th; |
||||
if (includeExamplePhrase) { |
||||
parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; |
||||
parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; |
||||
parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; |
||||
parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; |
||||
parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; |
||||
parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; |
||||
} else { |
||||
parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; |
||||
parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; |
||||
parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; |
||||
parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; |
||||
parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; |
||||
parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; |
||||
} |
||||
|
||||
StringBuilder sb = new StringBuilder(); |
||||
List<Criteria> oredCriteria = example.getOredCriteria(); |
||||
boolean firstCriteria = true; |
||||
for (int i = 0; i < oredCriteria.size(); i++) { |
||||
Criteria criteria = oredCriteria.get(i); |
||||
if (criteria.isValid()) { |
||||
if (firstCriteria) { |
||||
firstCriteria = false; |
||||
} else { |
||||
sb.append(" or "); |
||||
} |
||||
|
||||
sb.append('('); |
||||
List<Criterion> criterions = criteria.getAllCriteria(); |
||||
boolean firstCriterion = true; |
||||
for (int j = 0; j < criterions.size(); j++) { |
||||
Criterion criterion = criterions.get(j); |
||||
if (firstCriterion) { |
||||
firstCriterion = false; |
||||
} else { |
||||
sb.append(" and "); |
||||
} |
||||
|
||||
if (criterion.isNoValue()) { |
||||
sb.append(criterion.getCondition()); |
||||
} else if (criterion.isSingleValue()) { |
||||
if (criterion.getTypeHandler() == null) { |
||||
sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); |
||||
} else { |
||||
sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); |
||||
} |
||||
} else if (criterion.isBetweenValue()) { |
||||
if (criterion.getTypeHandler() == null) { |
||||
sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); |
||||
} else { |
||||
sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); |
||||
} |
||||
} else if (criterion.isListValue()) { |
||||
sb.append(criterion.getCondition()); |
||||
sb.append(" ("); |
||||
List<?> listItems = (List<?>) criterion.getValue(); |
||||
boolean comma = false; |
||||
for (int k = 0; k < listItems.size(); k++) { |
||||
if (comma) { |
||||
sb.append(", "); |
||||
} else { |
||||
comma = true; |
||||
} |
||||
if (criterion.getTypeHandler() == null) { |
||||
sb.append(String.format(parmPhrase3, i, j, k)); |
||||
} else { |
||||
sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); |
||||
} |
||||
} |
||||
sb.append(')'); |
||||
} |
||||
} |
||||
sb.append(')'); |
||||
} |
||||
} |
||||
|
||||
if (sb.length() > 0) { |
||||
sql.WHERE(sb.toString()); |
||||
} |
||||
} |
||||
} |
||||
@ -1,177 +0,0 @@ |
||||
package com.hai.entity; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* api_ip_address |
||||
* @author |
||||
*/ |
||||
/** |
||||
* |
||||
* 代码由工具生成 |
||||
* |
||||
**/ |
||||
public class ApiIpAddress implements Serializable { |
||||
/** |
||||
* 主键 |
||||
*/ |
||||
private Long id; |
||||
|
||||
/** |
||||
* ip地址 |
||||
*/ |
||||
private String ipAddress; |
||||
|
||||
/** |
||||
* 商户号 |
||||
*/ |
||||
private String mchId; |
||||
|
||||
/** |
||||
* 创建时间 |
||||
*/ |
||||
private Date createTime; |
||||
|
||||
/** |
||||
* 更新时间 |
||||
*/ |
||||
private Date updateTime; |
||||
|
||||
/** |
||||
* ext_1 |
||||
*/ |
||||
private String ext1; |
||||
|
||||
/** |
||||
* ext_2 |
||||
*/ |
||||
private String ext2; |
||||
|
||||
/** |
||||
* ext_3 |
||||
*/ |
||||
private String ext3; |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
public Long getId() { |
||||
return id; |
||||
} |
||||
|
||||
public void setId(Long id) { |
||||
this.id = id; |
||||
} |
||||
|
||||
public String getIpAddress() { |
||||
return ipAddress; |
||||
} |
||||
|
||||
public void setIpAddress(String ipAddress) { |
||||
this.ipAddress = ipAddress; |
||||
} |
||||
|
||||
public String getMchId() { |
||||
return mchId; |
||||
} |
||||
|
||||
public void setMchId(String mchId) { |
||||
this.mchId = mchId; |
||||
} |
||||
|
||||
public Date getCreateTime() { |
||||
return createTime; |
||||
} |
||||
|
||||
public void setCreateTime(Date createTime) { |
||||
this.createTime = createTime; |
||||
} |
||||
|
||||
public Date getUpdateTime() { |
||||
return updateTime; |
||||
} |
||||
|
||||
public void setUpdateTime(Date updateTime) { |
||||
this.updateTime = updateTime; |
||||
} |
||||
|
||||
public String getExt1() { |
||||
return ext1; |
||||
} |
||||
|
||||
public void setExt1(String ext1) { |
||||
this.ext1 = ext1; |
||||
} |
||||
|
||||
public String getExt2() { |
||||
return ext2; |
||||
} |
||||
|
||||
public void setExt2(String ext2) { |
||||
this.ext2 = ext2; |
||||
} |
||||
|
||||
public String getExt3() { |
||||
return ext3; |
||||
} |
||||
|
||||
public void setExt3(String ext3) { |
||||
this.ext3 = ext3; |
||||
} |
||||
|
||||
@Override |
||||
public boolean equals(Object that) { |
||||
if (this == that) { |
||||
return true; |
||||
} |
||||
if (that == null) { |
||||
return false; |
||||
} |
||||
if (getClass() != that.getClass()) { |
||||
return false; |
||||
} |
||||
ApiIpAddress other = (ApiIpAddress) that; |
||||
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) |
||||
&& (this.getIpAddress() == null ? other.getIpAddress() == null : this.getIpAddress().equals(other.getIpAddress())) |
||||
&& (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId())) |
||||
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) |
||||
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) |
||||
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) |
||||
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) |
||||
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); |
||||
} |
||||
|
||||
@Override |
||||
public int hashCode() { |
||||
final int prime = 31; |
||||
int result = 1; |
||||
result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); |
||||
result = prime * result + ((getIpAddress() == null) ? 0 : getIpAddress().hashCode()); |
||||
result = prime * result + ((getMchId() == null) ? 0 : getMchId().hashCode()); |
||||
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); |
||||
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); |
||||
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); |
||||
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); |
||||
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); |
||||
return result; |
||||
} |
||||
|
||||
@Override |
||||
public String toString() { |
||||
StringBuilder sb = new StringBuilder(); |
||||
sb.append(getClass().getSimpleName()); |
||||
sb.append(" ["); |
||||
sb.append("Hash = ").append(hashCode()); |
||||
sb.append(", id=").append(id); |
||||
sb.append(", ipAddress=").append(ipAddress); |
||||
sb.append(", mchId=").append(mchId); |
||||
sb.append(", createTime=").append(createTime); |
||||
sb.append(", updateTime=").append(updateTime); |
||||
sb.append(", ext1=").append(ext1); |
||||
sb.append(", ext2=").append(ext2); |
||||
sb.append(", ext3=").append(ext3); |
||||
sb.append(", serialVersionUID=").append(serialVersionUID); |
||||
sb.append("]"); |
||||
return sb.toString(); |
||||
} |
||||
} |
||||
@ -1,753 +0,0 @@ |
||||
package com.hai.entity; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.Date; |
||||
import java.util.List; |
||||
|
||||
public class ApiIpAddressExample { |
||||
protected String orderByClause; |
||||
|
||||
protected boolean distinct; |
||||
|
||||
protected List<Criteria> oredCriteria; |
||||
|
||||
private Integer limit; |
||||
|
||||
private Long offset; |
||||
|
||||
public ApiIpAddressExample() { |
||||
oredCriteria = new ArrayList<Criteria>(); |
||||
} |
||||
|
||||
public void setOrderByClause(String orderByClause) { |
||||
this.orderByClause = orderByClause; |
||||
} |
||||
|
||||
public String getOrderByClause() { |
||||
return orderByClause; |
||||
} |
||||
|
||||
public void setDistinct(boolean distinct) { |
||||
this.distinct = distinct; |
||||
} |
||||
|
||||
public boolean isDistinct() { |
||||
return distinct; |
||||
} |
||||
|
||||
public List<Criteria> getOredCriteria() { |
||||
return oredCriteria; |
||||
} |
||||
|
||||
public void or(Criteria criteria) { |
||||
oredCriteria.add(criteria); |
||||
} |
||||
|
||||
public Criteria or() { |
||||
Criteria criteria = createCriteriaInternal(); |
||||
oredCriteria.add(criteria); |
||||
return criteria; |
||||
} |
||||
|
||||
public Criteria createCriteria() { |
||||
Criteria criteria = createCriteriaInternal(); |
||||
if (oredCriteria.size() == 0) { |
||||
oredCriteria.add(criteria); |
||||
} |
||||
return criteria; |
||||
} |
||||
|
||||
protected Criteria createCriteriaInternal() { |
||||
Criteria criteria = new Criteria(); |
||||
return criteria; |
||||
} |
||||
|
||||
public void clear() { |
||||
oredCriteria.clear(); |
||||
orderByClause = null; |
||||
distinct = false; |
||||
} |
||||
|
||||
public void setLimit(Integer limit) { |
||||
this.limit = limit; |
||||
} |
||||
|
||||
public Integer getLimit() { |
||||
return limit; |
||||
} |
||||
|
||||
public void setOffset(Long offset) { |
||||
this.offset = offset; |
||||
} |
||||
|
||||
public Long getOffset() { |
||||
return offset; |
||||
} |
||||
|
||||
protected abstract static class GeneratedCriteria { |
||||
protected List<Criterion> criteria; |
||||
|
||||
protected GeneratedCriteria() { |
||||
super(); |
||||
criteria = new ArrayList<Criterion>(); |
||||
} |
||||
|
||||
public boolean isValid() { |
||||
return criteria.size() > 0; |
||||
} |
||||
|
||||
public List<Criterion> getAllCriteria() { |
||||
return criteria; |
||||
} |
||||
|
||||
public List<Criterion> getCriteria() { |
||||
return criteria; |
||||
} |
||||
|
||||
protected void addCriterion(String condition) { |
||||
if (condition == null) { |
||||
throw new RuntimeException("Value for condition cannot be null"); |
||||
} |
||||
criteria.add(new Criterion(condition)); |
||||
} |
||||
|
||||
protected void addCriterion(String condition, Object value, String property) { |
||||
if (value == null) { |
||||
throw new RuntimeException("Value for " + property + " cannot be null"); |
||||
} |
||||
criteria.add(new Criterion(condition, value)); |
||||
} |
||||
|
||||
protected void addCriterion(String condition, Object value1, Object value2, String property) { |
||||
if (value1 == null || value2 == null) { |
||||
throw new RuntimeException("Between values for " + property + " cannot be null"); |
||||
} |
||||
criteria.add(new Criterion(condition, value1, value2)); |
||||
} |
||||
|
||||
public Criteria andIdIsNull() { |
||||
addCriterion("id is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdIsNotNull() { |
||||
addCriterion("id is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdEqualTo(Long value) { |
||||
addCriterion("id =", value, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdNotEqualTo(Long value) { |
||||
addCriterion("id <>", value, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdGreaterThan(Long value) { |
||||
addCriterion("id >", value, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdGreaterThanOrEqualTo(Long value) { |
||||
addCriterion("id >=", value, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdLessThan(Long value) { |
||||
addCriterion("id <", value, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdLessThanOrEqualTo(Long value) { |
||||
addCriterion("id <=", value, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdIn(List<Long> values) { |
||||
addCriterion("id in", values, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdNotIn(List<Long> values) { |
||||
addCriterion("id not in", values, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdBetween(Long value1, Long value2) { |
||||
addCriterion("id between", value1, value2, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIdNotBetween(Long value1, Long value2) { |
||||
addCriterion("id not between", value1, value2, "id"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressIsNull() { |
||||
addCriterion("ip_address is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressIsNotNull() { |
||||
addCriterion("ip_address is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressEqualTo(String value) { |
||||
addCriterion("ip_address =", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressNotEqualTo(String value) { |
||||
addCriterion("ip_address <>", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressGreaterThan(String value) { |
||||
addCriterion("ip_address >", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressGreaterThanOrEqualTo(String value) { |
||||
addCriterion("ip_address >=", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressLessThan(String value) { |
||||
addCriterion("ip_address <", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressLessThanOrEqualTo(String value) { |
||||
addCriterion("ip_address <=", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressLike(String value) { |
||||
addCriterion("ip_address like", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressNotLike(String value) { |
||||
addCriterion("ip_address not like", value, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressIn(List<String> values) { |
||||
addCriterion("ip_address in", values, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressNotIn(List<String> values) { |
||||
addCriterion("ip_address not in", values, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressBetween(String value1, String value2) { |
||||
addCriterion("ip_address between", value1, value2, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andIpAddressNotBetween(String value1, String value2) { |
||||
addCriterion("ip_address not between", value1, value2, "ipAddress"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdIsNull() { |
||||
addCriterion("mch_id is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdIsNotNull() { |
||||
addCriterion("mch_id is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdEqualTo(String value) { |
||||
addCriterion("mch_id =", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdNotEqualTo(String value) { |
||||
addCriterion("mch_id <>", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdGreaterThan(String value) { |
||||
addCriterion("mch_id >", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdGreaterThanOrEqualTo(String value) { |
||||
addCriterion("mch_id >=", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdLessThan(String value) { |
||||
addCriterion("mch_id <", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdLessThanOrEqualTo(String value) { |
||||
addCriterion("mch_id <=", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdLike(String value) { |
||||
addCriterion("mch_id like", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdNotLike(String value) { |
||||
addCriterion("mch_id not like", value, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdIn(List<String> values) { |
||||
addCriterion("mch_id in", values, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdNotIn(List<String> values) { |
||||
addCriterion("mch_id not in", values, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdBetween(String value1, String value2) { |
||||
addCriterion("mch_id between", value1, value2, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andMchIdNotBetween(String value1, String value2) { |
||||
addCriterion("mch_id not between", value1, value2, "mchId"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeIsNull() { |
||||
addCriterion("create_time is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeIsNotNull() { |
||||
addCriterion("create_time is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeEqualTo(Date value) { |
||||
addCriterion("create_time =", value, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeNotEqualTo(Date value) { |
||||
addCriterion("create_time <>", value, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeGreaterThan(Date value) { |
||||
addCriterion("create_time >", value, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { |
||||
addCriterion("create_time >=", value, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeLessThan(Date value) { |
||||
addCriterion("create_time <", value, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeLessThanOrEqualTo(Date value) { |
||||
addCriterion("create_time <=", value, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeIn(List<Date> values) { |
||||
addCriterion("create_time in", values, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeNotIn(List<Date> values) { |
||||
addCriterion("create_time not in", values, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeBetween(Date value1, Date value2) { |
||||
addCriterion("create_time between", value1, value2, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andCreateTimeNotBetween(Date value1, Date value2) { |
||||
addCriterion("create_time not between", value1, value2, "createTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeIsNull() { |
||||
addCriterion("update_time is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeIsNotNull() { |
||||
addCriterion("update_time is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeEqualTo(Date value) { |
||||
addCriterion("update_time =", value, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeNotEqualTo(Date value) { |
||||
addCriterion("update_time <>", value, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeGreaterThan(Date value) { |
||||
addCriterion("update_time >", value, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { |
||||
addCriterion("update_time >=", value, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeLessThan(Date value) { |
||||
addCriterion("update_time <", value, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { |
||||
addCriterion("update_time <=", value, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeIn(List<Date> values) { |
||||
addCriterion("update_time in", values, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeNotIn(List<Date> values) { |
||||
addCriterion("update_time not in", values, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeBetween(Date value1, Date value2) { |
||||
addCriterion("update_time between", value1, value2, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { |
||||
addCriterion("update_time not between", value1, value2, "updateTime"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1IsNull() { |
||||
addCriterion("ext_1 is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1IsNotNull() { |
||||
addCriterion("ext_1 is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1EqualTo(String value) { |
||||
addCriterion("ext_1 =", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1NotEqualTo(String value) { |
||||
addCriterion("ext_1 <>", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1GreaterThan(String value) { |
||||
addCriterion("ext_1 >", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1GreaterThanOrEqualTo(String value) { |
||||
addCriterion("ext_1 >=", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1LessThan(String value) { |
||||
addCriterion("ext_1 <", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1LessThanOrEqualTo(String value) { |
||||
addCriterion("ext_1 <=", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1Like(String value) { |
||||
addCriterion("ext_1 like", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1NotLike(String value) { |
||||
addCriterion("ext_1 not like", value, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1In(List<String> values) { |
||||
addCriterion("ext_1 in", values, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1NotIn(List<String> values) { |
||||
addCriterion("ext_1 not in", values, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1Between(String value1, String value2) { |
||||
addCriterion("ext_1 between", value1, value2, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt1NotBetween(String value1, String value2) { |
||||
addCriterion("ext_1 not between", value1, value2, "ext1"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2IsNull() { |
||||
addCriterion("ext_2 is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2IsNotNull() { |
||||
addCriterion("ext_2 is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2EqualTo(String value) { |
||||
addCriterion("ext_2 =", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2NotEqualTo(String value) { |
||||
addCriterion("ext_2 <>", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2GreaterThan(String value) { |
||||
addCriterion("ext_2 >", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2GreaterThanOrEqualTo(String value) { |
||||
addCriterion("ext_2 >=", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2LessThan(String value) { |
||||
addCriterion("ext_2 <", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2LessThanOrEqualTo(String value) { |
||||
addCriterion("ext_2 <=", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2Like(String value) { |
||||
addCriterion("ext_2 like", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2NotLike(String value) { |
||||
addCriterion("ext_2 not like", value, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2In(List<String> values) { |
||||
addCriterion("ext_2 in", values, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2NotIn(List<String> values) { |
||||
addCriterion("ext_2 not in", values, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2Between(String value1, String value2) { |
||||
addCriterion("ext_2 between", value1, value2, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt2NotBetween(String value1, String value2) { |
||||
addCriterion("ext_2 not between", value1, value2, "ext2"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3IsNull() { |
||||
addCriterion("ext_3 is null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3IsNotNull() { |
||||
addCriterion("ext_3 is not null"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3EqualTo(String value) { |
||||
addCriterion("ext_3 =", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3NotEqualTo(String value) { |
||||
addCriterion("ext_3 <>", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3GreaterThan(String value) { |
||||
addCriterion("ext_3 >", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3GreaterThanOrEqualTo(String value) { |
||||
addCriterion("ext_3 >=", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3LessThan(String value) { |
||||
addCriterion("ext_3 <", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3LessThanOrEqualTo(String value) { |
||||
addCriterion("ext_3 <=", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3Like(String value) { |
||||
addCriterion("ext_3 like", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3NotLike(String value) { |
||||
addCriterion("ext_3 not like", value, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3In(List<String> values) { |
||||
addCriterion("ext_3 in", values, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3NotIn(List<String> values) { |
||||
addCriterion("ext_3 not in", values, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3Between(String value1, String value2) { |
||||
addCriterion("ext_3 between", value1, value2, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
|
||||
public Criteria andExt3NotBetween(String value1, String value2) { |
||||
addCriterion("ext_3 not between", value1, value2, "ext3"); |
||||
return (Criteria) this; |
||||
} |
||||
} |
||||
|
||||
/** |
||||
*/ |
||||
public static class Criteria extends GeneratedCriteria { |
||||
|
||||
protected Criteria() { |
||||
super(); |
||||
} |
||||
} |
||||
|
||||
public static class Criterion { |
||||
private String condition; |
||||
|
||||
private Object value; |
||||
|
||||
private Object secondValue; |
||||
|
||||
private boolean noValue; |
||||
|
||||
private boolean singleValue; |
||||
|
||||
private boolean betweenValue; |
||||
|
||||
private boolean listValue; |
||||
|
||||
private String typeHandler; |
||||
|
||||
public String getCondition() { |
||||
return condition; |
||||
} |
||||
|
||||
public Object getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public Object getSecondValue() { |
||||
return secondValue; |
||||
} |
||||
|
||||
public boolean isNoValue() { |
||||
return noValue; |
||||
} |
||||
|
||||
public boolean isSingleValue() { |
||||
return singleValue; |
||||
} |
||||
|
||||
public boolean isBetweenValue() { |
||||
return betweenValue; |
||||
} |
||||
|
||||
public boolean isListValue() { |
||||
return listValue; |
||||
} |
||||
|
||||
public String getTypeHandler() { |
||||
return typeHandler; |
||||
} |
||||
|
||||
protected Criterion(String condition) { |
||||
super(); |
||||
this.condition = condition; |
||||
this.typeHandler = null; |
||||
this.noValue = true; |
||||
} |
||||
|
||||
protected Criterion(String condition, Object value, String typeHandler) { |
||||
super(); |
||||
this.condition = condition; |
||||
this.value = value; |
||||
this.typeHandler = typeHandler; |
||||
if (value instanceof List<?>) { |
||||
this.listValue = true; |
||||
} else { |
||||
this.singleValue = true; |
||||
} |
||||
} |
||||
|
||||
protected Criterion(String condition, Object value) { |
||||
this(condition, value, null); |
||||
} |
||||
|
||||
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { |
||||
super(); |
||||
this.condition = condition; |
||||
this.value = value; |
||||
this.secondValue = secondValue; |
||||
this.typeHandler = typeHandler; |
||||
this.betweenValue = true; |
||||
} |
||||
|
||||
protected Criterion(String condition, Object value, Object secondValue) { |
||||
this(condition, value, secondValue, null); |
||||
} |
||||
} |
||||
} |
||||
@ -1,78 +0,0 @@ |
||||
package com.hai.service; |
||||
|
||||
import com.hai.entity.ApiAmountRecord; |
||||
import com.hai.entity.ApiIpAddress; |
||||
|
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* @serviceName ApiIpAddressService.java |
||||
* @author Sum1Dream |
||||
* @version 1.0.0 |
||||
* @Description // Api商户IP地址管理
|
||||
* @createTime 14:18 2022/12/6 |
||||
**/ |
||||
public interface ApiIpAddressService { |
||||
|
||||
/** |
||||
* @Author Sum1Dream |
||||
* @Name insertApiIpAddress |
||||
* @Description // 新增ip地址内容
|
||||
* @Date 14:21 2022/12/6 |
||||
* @Param [apiIpAddress] |
||||
* @Return void |
||||
*/ |
||||
void insertApiIpAddress(ApiIpAddress apiIpAddress); |
||||
|
||||
/** |
||||
* @Author Sum1Dream |
||||
* @Name updateApiIpAddress |
||||
* @Description // 修改IP地址内容
|
||||
* @Date 15:29 2022/12/6 |
||||
* @Param [apiIpAddress] |
||||
* @Return void |
||||
*/ |
||||
void updateApiIpAddress(ApiIpAddress apiIpAddress); |
||||
|
||||
/** |
||||
* @Author Sum1Dream |
||||
* @Name findById |
||||
* @Description // 查询ip地址详情
|
||||
* @Date 14:19 2022/12/6 |
||||
* @Param [id] |
||||
* @Return com.hai.entity.ApiIpAddress |
||||
*/ |
||||
ApiIpAddress findById(Long id); |
||||
|
||||
/** |
||||
* @Author Sum1Dream |
||||
* @Name findByMchId |
||||
* @Description // 根据商户号查询IP地址内容
|
||||
* @Date 14:23 2022/12/6 |
||||
* @Param [mchId] |
||||
* @Return com.hai.entity.ApiIpAddress |
||||
*/ |
||||
ApiIpAddress findByMchId(String mchId); |
||||
|
||||
/** |
||||
* @Author Sum1Dream |
||||
* @Name getApiIpAddressByList |
||||
* @Description // 查询IP地址列表
|
||||
* @Date 14:19 2022/12/6 |
||||
* @Param [map] |
||||
* @Return java.util.List<com.hai.entity.ApiIpAddress> |
||||
*/ |
||||
List<ApiIpAddress> getApiIpAddressByList(Map<String , Object> map); |
||||
|
||||
/** |
||||
* @Author Sum1Dream |
||||
* @Name validationIpAddressLegal |
||||
* @Description // 验证IP地址合法性
|
||||
* @Date 09:49 2022/12/13 |
||||
* @Param [mchId, ipAddress] |
||||
* @Return java.lang.Boolean |
||||
*/ |
||||
Boolean validationIpAddressLegal(String mchId , String ipAddress); |
||||
|
||||
} |
||||
@ -1,64 +0,0 @@ |
||||
package com.hai.service.impl; |
||||
|
||||
import com.hai.dao.ApiIpAddressMapper; |
||||
import com.hai.entity.ApiIpAddress; |
||||
import com.hai.entity.ApiIpAddressExample; |
||||
import com.hai.service.ApiIpAddressService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import javax.annotation.Resource; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
@Service("apiIpAddressService") |
||||
public class ApiIpAddressServiceImpl implements ApiIpAddressService { |
||||
|
||||
@Resource |
||||
private ApiIpAddressMapper apiIpAddressMapper; |
||||
|
||||
@Override |
||||
public void insertApiIpAddress(ApiIpAddress apiIpAddress) { |
||||
apiIpAddressMapper.insert(apiIpAddress); |
||||
} |
||||
|
||||
@Override |
||||
public void updateApiIpAddress(ApiIpAddress apiIpAddress) { |
||||
apiIpAddressMapper.updateByPrimaryKey(apiIpAddress); |
||||
} |
||||
|
||||
@Override |
||||
public ApiIpAddress findById(Long id) { |
||||
return apiIpAddressMapper.selectByPrimaryKey(id); |
||||
} |
||||
|
||||
@Override |
||||
public ApiIpAddress findByMchId(String mchId) { |
||||
ApiIpAddressExample example = new ApiIpAddressExample(); |
||||
ApiIpAddressExample.Criteria criteria = example.createCriteria(); |
||||
criteria.andMchIdEqualTo(mchId); |
||||
|
||||
List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example); |
||||
|
||||
if (list.size() > 0) { |
||||
return list.get(0); |
||||
} |
||||
|
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
public List<ApiIpAddress> getApiIpAddressByList(Map<String, Object> map) { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
public Boolean validationIpAddressLegal(String mchId, String ipAddress) { |
||||
|
||||
ApiIpAddressExample example = new ApiIpAddressExample(); |
||||
example.createCriteria().andMchIdEqualTo(mchId).andIpAddressEqualTo(ipAddress); |
||||
|
||||
List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example); |
||||
|
||||
return list.size()>0; |
||||
} |
||||
} |
||||
Binary file not shown.
Binary file not shown.
@ -1,4 +1,8 @@ |
||||
<<<<<<< HEAD |
||||
#Created by Apache Maven 3.8.2 |
||||
======= |
||||
#Created by Apache Maven 3.6.3 |
||||
>>>>>>> master |
||||
version=1.0-SNAPSHOT |
||||
groupId=com.hsg |
||||
artifactId=hai-user |
||||
|
||||
Loading…
Reference in new issue