Skip to content

D
dc-java
Commit 40e481fd by yinyong
Options

paypal增加币种、汇率等字段，广告费表名更改、任务ids存储db

parent 4e5be9f7
Showing with 549 additions and 98 deletions
data-base/base-sync-paypal/src/main/java/com/bailuntec/job/PayPalSyncJob.java
......@@ -3,11 +3,13 @@ package com.bailuntec.job;
import com.alibaba.fastjson.JSON;
import com.bailuntec.domain.constant.CommonConstant;
import com.bailuntec.domain.entity.*;
import com.bailuntec.domain.enumerate.CurrencyType;
import com.bailuntec.domain.pojo.PayPalResultInfo;
import com.bailuntec.domain.pojo.ResultData;
import com.bailuntec.domain.entity.DcBaseFinancePaypal;
import com.bailuntec.mapper.DcBaseFinancePaypalMapper;
import com.bailuntec.mapper.JobPointLogMapper;
import com.bailuntec.support.CallBailunSystem;
import com.bailuntec.support.PointJob;
import com.bailuntec.utils.OkHttpUtil;
import com.bailuntec.utils.PropertiesUtil;
......@@ -19,7 +21,10 @@ import okhttp3.Request;
import okhttp3.Response;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
......@@ -90,9 +95,14 @@ public class PayPalSyncJob extends PointJob {
private void handlePayPalJson(List<DcBaseFinancePaypal> data, JobPointLog jobPointLog) {
try{
DcBaseFinancePaypalMapper mapper = SessionUtil.getSession().getMapper(DcBaseFinancePaypalMapper.class);
for(DcBaseFinancePaypal paypal : data) {
paypal.setGmtCreateTime(LocalDateTime.now());
handleSourceJson(paypal);
Instant instant = paypal.getPaymentDate().toInstant();
ZoneId zone = ZoneId.systemDefault();
LocalDateTime paymentDate = LocalDateTime.ofInstant(instant, zone);
BigDecimal exchangeRate = CallBailunSystem.getExchangeRate(paypal.getCurrency(), CurrencyType.CNY.value(), paymentDate);
paypal.setOtherToCnyExchangeRate(exchangeRate);
DcBaseFinancePaypalMapper mapper = SessionUtil.getSession().getMapper(DcBaseFinancePaypalMapper.class);
mapper.upsertSelective(paypal);
}
}catch (RuntimeException e) {
......@@ -102,4 +112,25 @@ public class PayPalSyncJob extends PointJob {
}
}
private void handleSourceJson(DcBaseFinancePaypal paypal) {
String sourceJson = paypal.getSourceJson();
if(StringUtils.isNotBlank(sourceJson)) {
paypal.setBusiness(getValue(sourceJson, "Business\":"));
paypal.setReceiver(getValue(sourceJson, "Receiver\":"));
paypal.setReceiverId(getValue(sourceJson, "ReceiverID\":"));
paypal.setPayer(getValue(sourceJson, "Payer\":"));
paypal.setPayerId(getValue(sourceJson, "PayerID\":"));
paypal.setCurrencyId(getValue(sourceJson, "currencyID\":") == null ? 0 : Integer.parseInt(getValue(sourceJson, "currencyID\":")) );
paypal.setCurrency(CurrencyType.getVal(paypal.getCurrencyId()));
}
}
public String getValue(String sourceJson, String key) {
String value = sourceJson.substring(sourceJson.indexOf(key) + key.length(), sourceJson.indexOf(",", sourceJson.indexOf(key))).replace("\"", "").replace("}", "");
if("null".equals(value)) {
return null;
}
return value;
}
}
data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/job/AdvertAddTaskSyncJob.java
......@@ -13,7 +13,6 @@ import com.bailuntec.mapper.JobAccountLogMapper;
import com.bailuntec.support.PointJob;
import com.bailuntec.utils.OkHttpUtil;
import com.bailuntec.utils.PropertiesUtil;
import com.bailuntec.utils.RedisUtil;
import com.bailuntec.utils.SessionUtil;
import com.dangdang.ddframe.job.api.ShardingContext;
import lombok.extern.slf4j.Slf4j;
......@@ -31,7 +30,6 @@ public class AdvertAddTaskSyncJob extends PointJob {
private PropertiesUtil propertiesUtil = PropertiesUtil.getInstance("const");
private OkHttpClient client = OkHttpUtil.getInstance();
private RedisUtil redisUtil = new RedisUtil();
@Override
public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
......@@ -119,10 +117,8 @@ public class AdvertAddTaskSyncJob extends PointJob {
}
localDateTime = localDateTime.plusDays(1L);
} while (localDateTime.compareTo(job.getEndTime()) <= 0);
String taskIdsStr = JSONObject.toJSONString(taskIdsLists);
redisUtil.saveValueByKey(String.valueOf(job.getAccountId()), taskIdsStr);
job.setTaskIds(taskIdsStr);
job.setStartTime(job.getEndTime());
job.setEndTime(job.getStartTime().plusDays(job.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : job.getEndTime().plusDays(job.getIntervalTime()));
job.setMessage("执行成功");
......
data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/job/AdvertResultSyncJob.java
......@@ -10,17 +10,17 @@ import com.bailuntec.domain.entity.JobAccountLog;
import com.bailuntec.domain.entity.JobPointLog;
import com.bailuntec.domain.enumerate.AccountPlatformType;
import com.bailuntec.domain.example.DcBaseCompanyAccountExample;
import com.bailuntec.mapper.DcAmazonAdvertMapper;
import com.bailuntec.mapper.DcBaseFinanceAmazonMapper;
import com.bailuntec.mapper.DcBaseCompanyAccountMapper;
import com.bailuntec.mapper.JobAccountLogMapper;
import com.bailuntec.support.PointJob;
import com.bailuntec.utils.OkHttpUtil;
import com.bailuntec.utils.PropertiesUtil;
import com.bailuntec.utils.RedisUtil;
import com.bailuntec.utils.SessionUtil;
import com.dangdang.ddframe.job.api.ShardingContext;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.List;
......@@ -30,7 +30,6 @@ public class AdvertResultSyncJob extends PointJob {
private PropertiesUtil propertiesUtil = PropertiesUtil.getInstance("const");
private OkHttpClient client = OkHttpUtil.getInstance();
private RedisUtil redisUtil = new RedisUtil();
@Override
public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
......@@ -40,10 +39,12 @@ public class AdvertResultSyncJob extends PointJob {
int pageSize = totalPage % shardingContext.getShardingTotalCount() == 0 ? totalPage / shardingContext.getShardingTotalCount() : totalPage / shardingContext.getShardingTotalCount() + 1;
List<JobAccountLog> listByPage = jobAccountLogMapper.getListByPage(AccountPlatformType.Amazon.code(), pageSize * shardingContext.getShardingItem(), pageSize);
for (JobAccountLog jobAccountLog : listByPage) {
String taskIds = redisUtil.getValueByKey(String.valueOf(jobAccountLog.getAccountId()));
List<List<Integer>> taskIdsList = (List<List<Integer>>) JSONArray.parse(taskIds);
for (List<Integer> ids : taskIdsList) {
callSaasApi(jobAccountLog, ids);
String taskIds = jobAccountLog.getTaskIds();
if(StringUtils.isNotBlank(taskIds)) {
List<List<Integer>> taskIdsList = (List<List<Integer>>) JSONArray.parse(taskIds);
for (List<Integer> ids : taskIdsList) {
callSaasApi(jobAccountLog, ids);
}
}
}
} catch (Exception e) {
......@@ -74,7 +75,7 @@ public class AdvertResultSyncJob extends PointJob {
MediaType mediaType = MediaType.parse("application/json");
Response response = null;
try {
DcAmazonAdvertMapper dcAmazonAdvertMapper = SessionUtil.getSession().getMapper(DcAmazonAdvertMapper.class);
DcBaseFinanceAmazonMapper dcBaseFinanceAmazonMapper = SessionUtil.getSession().getMapper(DcBaseFinanceAmazonMapper.class);
RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
Request request = new Request.Builder()
......@@ -92,7 +93,7 @@ public class AdvertResultSyncJob extends PointJob {
for (AmazonAdvert amazonAdvert : advertList) {
amazonAdvert.setAccountId(job.getAccountId());
amazonAdvert.setCompanyId(job.getCompanyId());
dcAmazonAdvertMapper.upsertSelective(amazonAdvert);
dcBaseFinanceAmazonMapper.upsertSelective(amazonAdvert);
}
}
} else {
......
data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/mapper/DcAmazonAdvertMapper.java → data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/mapper/DcBaseFinanceAmazonMapper.java
package com.bailuntec.mapper;
import com.bailuntec.domain.AmazonAdvert;
import com.bailuntec.domain.entity.DcAmazonAdvert;
import com.bailuntec.domain.example.DcAmazonAdvertExample;
import com.bailuntec.domain.entity.DcBaseFinanceAmazon;
import com.bailuntec.domain.example.DcBaseFinanceAmazonExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DcAmazonAdvertMapper {
public interface DcBaseFinanceAmazonMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
long countByExample(DcAmazonAdvertExample example);
long countByExample(DcBaseFinanceAmazonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int deleteByExample(DcAmazonAdvertExample example);
int deleteByExample(DcBaseFinanceAmazonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
......@@ -34,89 +34,89 @@ public interface DcAmazonAdvertMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int insert(DcAmazonAdvert record);
int insert(DcBaseFinanceAmazon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int insertSelective(DcAmazonAdvert record);
int insertSelective(DcBaseFinanceAmazon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcAmazonAdvert selectOneByExample(DcAmazonAdvertExample example);
DcBaseFinanceAmazon selectOneByExample(DcBaseFinanceAmazonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
List<DcAmazonAdvert> selectByExample(DcAmazonAdvertExample example);
List<DcBaseFinanceAmazon> selectByExample(DcBaseFinanceAmazonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
DcAmazonAdvert selectByPrimaryKey(Integer id);
DcBaseFinanceAmazon selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DcAmazonAdvert record, @Param("example") DcAmazonAdvertExample example);
int updateByExampleSelective(@Param("record") DcBaseFinanceAmazon record, @Param("example") DcBaseFinanceAmazonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int updateByExample(@Param("record") DcAmazonAdvert record, @Param("example") DcAmazonAdvertExample example);
int updateByExample(@Param("record") DcBaseFinanceAmazon record, @Param("example") DcBaseFinanceAmazonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DcAmazonAdvert record);
int updateByPrimaryKeySelective(DcBaseFinanceAmazon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
*/
int updateByPrimaryKey(DcAmazonAdvert record);
int updateByPrimaryKey(DcBaseFinanceAmazon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsert(DcAmazonAdvert record);
int upsert(DcBaseFinanceAmazon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_amazon_advert
* This method corresponds to the database table dc_base_finance_amazon
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
......
data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/mapper/DcAmazonAdvertMapper.xml → data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/mapper/DcBaseFinanceAmazonMapper.xml
<?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.bailuntec.mapper.DcAmazonAdvertMapper">
<resultMap id="BaseResultMap" type="com.bailuntec.domain.entity.DcAmazonAdvert">
<mapper namespace="com.bailuntec.mapper.DcBaseFinanceAmazonMapper">
<resultMap id="BaseResultMap" type="com.bailuntec.domain.entity.DcBaseFinanceAmazon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -107,7 +107,7 @@
attributed_conversions_sevenday, attributed_sales_thirtyday, attributed_sales_fourteenday,
attributed_sales_sevenday, account_id, company_id, currency, gmt_create_time, gmt_modify_time
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAmazonAdvertExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceAmazonExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -117,7 +117,7 @@
distinct
</if>
<include refid="Base_Column_List" />
from dc_amazon_advert
from dc_base_finance_amazon
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
......@@ -140,7 +140,7 @@
-->
select
<include refid="Base_Column_List" />
from dc_amazon_advert
from dc_base_finance_amazon
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
......@@ -148,25 +148,25 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from dc_amazon_advert
delete from dc_base_finance_amazon
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.bailuntec.domain.example.DcAmazonAdvertExample">
<delete id="deleteByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceAmazonExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from dc_amazon_advert
delete from dc_base_finance_amazon
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.bailuntec.domain.entity.DcAmazonAdvert">
<insert id="insert" parameterType="com.bailuntec.domain.entity.DcBaseFinanceAmazon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into dc_amazon_advert (id, campaign_name, campaign_id,
insert into dc_base_finance_amazon (id, campaign_name, campaign_id,
campaign_status, campaign_budget, attributed_conversions_oneday,
attributed_units_ordered_oneday, attributed_sales_oneday,
attributed_units_ordered_sevenday, impressions,
......@@ -187,12 +187,12 @@
#{currency,jdbcType=VARCHAR}, #{gmtCreateTime,jdbcType=TIMESTAMP}, #{gmtModifyTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAmazonAdvert">
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinanceAmazon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into dc_amazon_advert
insert into dc_base_finance_amazon
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
......@@ -336,12 +336,12 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcAmazonAdvertExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceAmazonExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from dc_amazon_advert
select count(*) from dc_base_finance_amazon
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
......@@ -351,7 +351,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update dc_amazon_advert
update dc_base_finance_amazon
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
......@@ -432,7 +432,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update dc_amazon_advert
update dc_base_finance_amazon
set id = #{record.id,jdbcType=INTEGER},
campaign_name = #{record.campaignName,jdbcType=VARCHAR},
campaign_id = #{record.campaignId,jdbcType=VARCHAR},
......@@ -460,12 +460,12 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.bailuntec.domain.entity.DcAmazonAdvert">
<update id="updateByPrimaryKeySelective" parameterType="com.bailuntec.domain.entity.DcBaseFinanceAmazon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update dc_amazon_advert
update dc_base_finance_amazon
<set>
<if test="campaignName != null">
campaign_name = #{campaignName,jdbcType=VARCHAR},
......@@ -536,12 +536,12 @@
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.bailuntec.domain.entity.DcAmazonAdvert">
<update id="updateByPrimaryKey" parameterType="com.bailuntec.domain.entity.DcBaseFinanceAmazon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update dc_amazon_advert
update dc_base_finance_amazon
set campaign_name = #{campaignName,jdbcType=VARCHAR},
campaign_id = #{campaignId,jdbcType=VARCHAR},
campaign_status = #{campaignStatus,jdbcType=VARCHAR},
......@@ -572,7 +572,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
insert into dc_amazon_advert
insert into dc_base_finance_amazon
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
......@@ -789,13 +789,13 @@
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAmazonAdvert">
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseFinanceAmazon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
insert into dc_amazon_advert
insert into dc_base_finance_amazon
(id, campaign_name, campaign_id, campaign_status, campaign_budget, attributed_conversions_oneday,
attributed_units_ordered_oneday, attributed_sales_oneday, attributed_units_ordered_sevenday,
impressions, clicks, cost, attributed_conversions_thirtyday, attributed_conversions_fourteenday,
......@@ -838,7 +838,7 @@
gmt_create_time = #{gmtCreateTime,jdbcType=TIMESTAMP},
gmt_modify_time = #{gmtModifyTime,jdbcType=TIMESTAMP}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAmazonAdvertExample" resultMap="BaseResultMap">
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceAmazonExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -846,7 +846,7 @@
-->
select
<include refid="Base_Column_List" />
from dc_amazon_advert
from dc_base_finance_amazon
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
......
data-common/src/main/java/com/bailuntec/domain/entity/DcAmazonAdvert.java → data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinanceAmazon.java
......@@ -6,7 +6,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class DcAmazonAdvert {
public class DcBaseFinanceAmazon {
/**
*
* This field was generated by MyBatis Generator.
......@@ -270,7 +270,7 @@ public class DcAmazonAdvert {
if (getClass() != that.getClass()) {
return false;
}
DcAmazonAdvert other = (DcAmazonAdvert) that;
DcBaseFinanceAmazon other = (DcBaseFinanceAmazon) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getCampaignName() == null ? other.getCampaignName() == null : this.getCampaignName().equals(other.getCampaignName()))
&& (this.getCampaignId() == null ? other.getCampaignId() == null : this.getCampaignId().equals(other.getCampaignId()))
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinancePaypal.java
......@@ -183,6 +183,80 @@ public class DcBaseFinancePaypal {
private LocalDateTime gmtModifyTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.business
*
* @mbg.generated
*/
private String business;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.receiver
*
* @mbg.generated
*/
private String receiver;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.receiver_id
*
* @mbg.generated
*/
private String receiverId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.payer
*
* @mbg.generated
*/
private String payer;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.payer_id
*
* @mbg.generated
*/
private String payerId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.currency
*
* @mbg.generated
*/
private String currency;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.currency_id
*
* @mbg.generated
*/
private Integer currencyId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_paypal.other_to_cny_exchange_rate
*
* @mbg.generated
*/
private BigDecimal otherToCnyExchangeRate;
private String sourceJson;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_finance_paypal
*
......@@ -213,6 +287,14 @@ public class DcBaseFinancePaypal {
sb.append(", saasCompanyId=").append(saasCompanyId);
sb.append(", gmtCreateTime=").append(gmtCreateTime);
sb.append(", gmtModifyTime=").append(gmtModifyTime);
sb.append(", business=").append(business);
sb.append(", receiver=").append(receiver);
sb.append(", receiverId=").append(receiverId);
sb.append(", payer=").append(payer);
sb.append(", payerId=").append(payerId);
sb.append(", currency=").append(currency);
sb.append(", currencyId=").append(currencyId);
sb.append(", otherToCnyExchangeRate=").append(otherToCnyExchangeRate);
sb.append("]");
return sb.toString();
}
......@@ -253,7 +335,15 @@ public class DcBaseFinancePaypal {
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getSaasCompanyId() == null ? other.getSaasCompanyId() == null : this.getSaasCompanyId().equals(other.getSaasCompanyId()))
&& (this.getGmtCreateTime() == null ? other.getGmtCreateTime() == null : this.getGmtCreateTime().equals(other.getGmtCreateTime()))
&& (this.getGmtModifyTime() == null ? other.getGmtModifyTime() == null : this.getGmtModifyTime().equals(other.getGmtModifyTime()));
&& (this.getGmtModifyTime() == null ? other.getGmtModifyTime() == null : this.getGmtModifyTime().equals(other.getGmtModifyTime()))
&& (this.getBusiness() == null ? other.getBusiness() == null : this.getBusiness().equals(other.getBusiness()))
&& (this.getReceiver() == null ? other.getReceiver() == null : this.getReceiver().equals(other.getReceiver()))
&& (this.getReceiverId() == null ? other.getReceiverId() == null : this.getReceiverId().equals(other.getReceiverId()))
&& (this.getPayer() == null ? other.getPayer() == null : this.getPayer().equals(other.getPayer()))
&& (this.getPayerId() == null ? other.getPayerId() == null : this.getPayerId().equals(other.getPayerId()))
&& (this.getCurrency() == null ? other.getCurrency() == null : this.getCurrency().equals(other.getCurrency()))
&& (this.getCurrencyId() == null ? other.getCurrencyId() == null : this.getCurrencyId().equals(other.getCurrencyId()))
&& (this.getOtherToCnyExchangeRate() == null ? other.getOtherToCnyExchangeRate() == null : this.getOtherToCnyExchangeRate().equals(other.getOtherToCnyExchangeRate()));
}
/**
......@@ -285,6 +375,14 @@ public class DcBaseFinancePaypal {
result = prime * result + ((getSaasCompanyId() == null) ? 0 : getSaasCompanyId().hashCode());
result = prime * result + ((getGmtCreateTime() == null) ? 0 : getGmtCreateTime().hashCode());
result = prime * result + ((getGmtModifyTime() == null) ? 0 : getGmtModifyTime().hashCode());
result = prime * result + ((getBusiness() == null) ? 0 : getBusiness().hashCode());
result = prime * result + ((getReceiver() == null) ? 0 : getReceiver().hashCode());
result = prime * result + ((getReceiverId() == null) ? 0 : getReceiverId().hashCode());
result = prime * result + ((getPayer() == null) ? 0 : getPayer().hashCode());
result = prime * result + ((getPayerId() == null) ? 0 : getPayerId().hashCode());
result = prime * result + ((getCurrency() == null) ? 0 : getCurrency().hashCode());
result = prime * result + ((getCurrencyId() == null) ? 0 : getCurrencyId().hashCode());
result = prime * result + ((getOtherToCnyExchangeRate() == null) ? 0 : getOtherToCnyExchangeRate().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/JobAccountLog.java
......@@ -124,6 +124,15 @@ public class JobAccountLog {
private String message;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column job_account_log.task_ids
*
* @mbg.generated
*/
private String taskIds;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table job_account_log
*
......@@ -148,6 +157,7 @@ public class JobAccountLog {
sb.append(", bjCreate=").append(bjCreate);
sb.append(", bjModified=").append(bjModified);
sb.append(", message=").append(message);
sb.append(", taskIds=").append(taskIds);
sb.append("]");
return sb.toString();
}
......@@ -182,7 +192,8 @@ public class JobAccountLog {
&& (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
&& (this.getBjCreate() == null ? other.getBjCreate() == null : this.getBjCreate().equals(other.getBjCreate()))
&& (this.getBjModified() == null ? other.getBjModified() == null : this.getBjModified().equals(other.getBjModified()))
&& (this.getMessage() == null ? other.getMessage() == null : this.getMessage().equals(other.getMessage()));
&& (this.getMessage() == null ? other.getMessage() == null : this.getMessage().equals(other.getMessage()))
&& (this.getTaskIds() == null ? other.getTaskIds() == null : this.getTaskIds().equals(other.getTaskIds()));
}
/**
......@@ -208,6 +219,7 @@ public class JobAccountLog {
result = prime * result + ((getBjCreate() == null) ? 0 : getBjCreate().hashCode());
result = prime * result + ((getBjModified() == null) ? 0 : getBjModified().hashCode());
result = prime * result + ((getMessage() == null) ? 0 : getMessage().hashCode());
result = prime * result + ((getTaskIds() == null) ? 0 : getTaskIds().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/enumerate/CurrencyType.java 0 → 100644
package com.bailuntec.domain.enumerate;
public enum CurrencyType {
AFA(0, "AFA"),
ALL(1, "ALL"),
DZD(2, "DZD"),
ADP(3, "ADP"),
AOA(4, "AOA"),
ARS(5, "ARS"),
AMD(6, "AMD"),
AWG(7, "AWG"),
AZM(8, "AZM"),
BSD(9, "BSD"),
BHD(10, "BHD"),
BDT(11, "BDT"),
BBD(12, "BBD"),
BYR(13, "BYR"),
BZD(14, "BZD"),
BMD(15, "BMD"),
BTN(16, "BTN"),
INR(17, "INR"),
BOV(18, "BOV"),
BOB(19, "BOB"),
BAM(20, "BAM"),
BWP(21, "BWP"),
BRL(22, "BRL"),
BND(23, "BND"),
BGL(24, "BGL"),
BGN(25, "BGN"),
BIF(26, "BIF"),
KHR(27, "KHR"),
CAD(28, "CAD"),
CVE(29, "CVE"),
KYD(30, "KYD"),
XAF(31, "XAF"),
CLF(32, "CLF"),
CLP(33, "CLP"),
CNY(34, "CNY"),
COP(35, "COP"),
KMF(36, "KMF"),
CDF(37, "CDF"),
CRC(38, "CRC"),
HRK(39, "HRK"),
CUP(40, "CUP"),
CYP(41, "CYP"),
CZK(42, "CZK"),
DKK(43, "DKK"),
DJF(44, "DJF"),
DOP(45, "DOP"),
TPE(46, "TPE"),
ECV(47, "ECV"),
ECS(48, "ECS"),
EGP(49, "EGP"),
SVC(50, "SVC"),
ERN(51, "ERN"),
EEK(52, "EEK"),
ETB(53, "ETB"),
FKP(54, "FKP"),
FJD(55, "FJD"),
GMD(56, "GMD"),
GEL(57, "GEL"),
GHC(58, "GHC"),
GIP(59, "GIP"),
GTQ(60, "GTQ"),
GNF(61, "GNF"),
GWP(62, "GWP"),
GYD(63, "GYD"),
HTG(64, "HTG"),
HNL(65, "HNL"),
HKD(66, "HKD"),
HUF(67, "HUF"),
ISK(68, "ISK"),
IDR(69, "IDR"),
IRR(70, "IRR"),
IQD(71, "IQD"),
ILS(72, "ILS"),
JMD(73, "JMD"),
JPY(74, "JPY"),
JOD(75, "JOD"),
KZT(76, "KZT"),
KES(77, "KES"),
AUD(78, "AUD"),
KPW(79, "KPW"),
KRW(80, "KRW"),
KWD(81, "KWD"),
KGS(82, "KGS"),
LAK(83, "LAK"),
LVL(84, "LVL"),
LBP(85, "LBP"),
LSL(86, "LSL"),
LRD(87, "LRD"),
LYD(88, "LYD"),
CHF(89, "CHF"),
LTL(90, "LTL"),
MOP(91, "MOP"),
MKD(92, "MKD"),
MGF(93, "MGF"),
MWK(94, "MWK"),
MYR(95, "MYR"),
MVR(96, "MVR"),
MTL(97, "MTL"),
EUR(98, "EUR"),
MRO(99, "MRO"),
MUR(100, "MUR"),
MXN(101, "MXN"),
MXV(102, "MXV"),
MDL(103, "MDL"),
MNT(104, "MNT"),
XCD(105, "XCD"),
MZM(106, "MZM"),
MMK(107, "MMK"),
ZAR(108, "ZAR"),
NAD(109, "NAD"),
NPR(110, "NPR"),
ANG(111, "ANG"),
XPF(112, "XPF"),
NZD(113, "NZD"),
NIO(114, "NIO"),
NGN(115, "NGN"),
NOK(116, "NOK"),
OMR(117, "OMR"),
PKR(118, "PKR"),
PAB(119, "PAB"),
PGK(120, "PGK"),
PYG(121, "PYG"),
PEN(122, "PEN"),
PHP(123, "PHP"),
PLN(124, "PLN"),
USD(125, "USD"),
QAR(126, "QAR"),
ROL(127, "ROL"),
RUB(128, "RUB"),
RUR(129, "RUR"),
RWF(130, "RWF"),
SHP(131, "SHP"),
WST(132, "WST"),
STD(133, "STD"),
SAR(134, "SAR"),
SCR(135, "SCR"),
SLL(136, "SLL"),
SGD(137, "SGD"),
SKK(138, "SKK"),
SIT(139, "SIT"),
SBD(140, "SBD"),
SOS(141, "SOS"),
LKR(142, "LKR"),
SDD(143, "SDD"),
SRG(144, "SRG"),
SZL(145, "SZL"),
SEK(146, "SEK"),
SYP(147, "SYP"),
TWD(148, "TWD"),
TJS(149, "TJS"),
TZS(150, "TZS"),
THB(151, "THB"),
XOF(152, "XOF"),
TOP(153, "TOP"),
TTD(154, "TTD"),
TND(155, "TND"),
TRY(156, "TRY"),
TMM(157, "TMM"),
UGX(158, "UGX"),
UAH(159, "UAH"),
AED(160, "AED"),
GBP(161, "GBP"),
USS(162, "USS"),
USN(163, "USN"),
UYU(164, "UYU"),
UZS(165, "UZS"),
VUV(166, "VUV"),
VEB(167, "VEB"),
VND(168, "VND"),
MAD(169, "MAD"),
YER(170,"YER"),
YUM(171, "YUM"),
ZMK(172, "ZMK"),
ZWD(173, "ZWD"),
CUSTOMCODE(174, "CustomCode");
private final Integer code;
private final String value;
CurrencyType(Integer code, String value) {
this.code = code;
this.value = value;
}
public Integer code() {
return code;
}
public String value() {
return value;
}
public static String getVal(Integer code) {
CurrencyType [] currencyTypes = values();
for(CurrencyType currencyType : currencyTypes) {
if(currencyType.code().equals(code)) {
return currencyType.value();
}
}
return null;
}
public static Integer getKey(String value) {
CurrencyType [] currencyTypes = values();
for(CurrencyType currencyType : currencyTypes) {
if(currencyType.value().equals(value)) {
return currencyType.code();
}
}
return null;
}
}
data-common/src/main/java/com/bailuntec/domain/example/DcAmazonAdvertExample.java → data-common/src/main/java/com/bailuntec/domain/example/DcBaseFinanceAmazonExample.java
......@@ -5,7 +5,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
public class DcAmazonAdvertExample {
public class DcBaseFinanceAmazonExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dc_amazon_advert
......@@ -54,7 +54,7 @@ public class DcAmazonAdvertExample {
*
* @mbg.generated
*/
public DcAmazonAdvertExample() {
public DcBaseFinanceAmazonExample() {
oredCriteria = new ArrayList<Criteria>();
}
......@@ -137,7 +137,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample orderBy(String orderByClause) {
public DcBaseFinanceAmazonExample orderBy(String orderByClause) {
this.setOrderByClause(orderByClause);
return this;
}
......@@ -149,7 +149,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample orderBy(String ... orderByClauses) {
public DcBaseFinanceAmazonExample orderBy(String ... orderByClauses) {
StringBuffer sb = new StringBuffer();
for (int i = 0; i < orderByClauses.length; i++) {
sb.append(orderByClauses[i]);
......@@ -208,7 +208,7 @@ public class DcAmazonAdvertExample {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public static Criteria newAndCreateCriteria() {
DcAmazonAdvertExample example = new DcAmazonAdvertExample();
DcBaseFinanceAmazonExample example = new DcBaseFinanceAmazonExample();
return example.createCriteria();
}
......@@ -219,7 +219,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample when(boolean condition, IExampleWhen then) {
public DcBaseFinanceAmazonExample when(boolean condition, IExampleWhen then) {
if (condition) {
then.example(this);
}
......@@ -233,7 +233,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
public DcBaseFinanceAmazonExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
if (condition) {
then.example(this);
} else {
......@@ -293,7 +293,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample limit(Integer rows) {
public DcBaseFinanceAmazonExample limit(Integer rows) {
this.rows = rows;
return this;
}
......@@ -305,7 +305,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample limit(Integer offset, Integer rows) {
public DcBaseFinanceAmazonExample limit(Integer offset, Integer rows) {
this.offset = offset;
this.rows = rows;
return this;
......@@ -318,7 +318,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample page(Integer page, Integer pageSize) {
public DcBaseFinanceAmazonExample page(Integer page, Integer pageSize) {
this.offset = page * pageSize;
this.rows = pageSize;
return this;
......@@ -1806,7 +1806,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
private DcAmazonAdvertExample example;
private DcBaseFinanceAmazonExample example;
/**
* This method was generated by MyBatis Generator.
......@@ -1815,7 +1815,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
protected Criteria(DcAmazonAdvertExample example) {
protected Criteria(DcBaseFinanceAmazonExample example) {
super();
this.example = example;
}
......@@ -1827,7 +1827,7 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public DcAmazonAdvertExample example() {
public DcBaseFinanceAmazonExample example() {
return this.example;
}
......@@ -2021,6 +2021,6 @@ public class DcAmazonAdvertExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
void example(DcAmazonAdvertExample example);
void example(DcBaseFinanceAmazonExample example);
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/JobAccountLogExample.java
......@@ -1169,6 +1169,76 @@ public class JobAccountLogExample {
addCriterion("message not between", value1, value2, "message");
return (Criteria) this;
}
public Criteria andTaskIdsIsNull() {
addCriterion("task_ids is null");
return (Criteria) this;
}
public Criteria andTaskIdsIsNotNull() {
addCriterion("task_ids is not null");
return (Criteria) this;
}
public Criteria andTaskIdsEqualTo(String value) {
addCriterion("task_ids =", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsNotEqualTo(String value) {
addCriterion("task_ids <>", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsGreaterThan(String value) {
addCriterion("task_ids >", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsGreaterThanOrEqualTo(String value) {
addCriterion("task_ids >=", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsLessThan(String value) {
addCriterion("task_ids <", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsLessThanOrEqualTo(String value) {
addCriterion("task_ids <=", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsLike(String value) {
addCriterion("task_ids like", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsNotLike(String value) {
addCriterion("task_ids not like", value, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsIn(List<String> values) {
addCriterion("task_ids in", values, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsNotIn(List<String> values) {
addCriterion("task_ids not in", values, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsBetween(String value1, String value2) {
addCriterion("task_ids between", value1, value2, "taskIds");
return (Criteria) this;
}
public Criteria andTaskIdsNotBetween(String value1, String value2) {
addCriterion("task_ids not between", value1, value2, "taskIds");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/mapper/JobAccountLogMapper.xml
......@@ -19,6 +19,7 @@
<result column="bj_create" jdbcType="TIMESTAMP" property="bjCreate" />
<result column="bj_modified" jdbcType="TIMESTAMP" property="bjModified" />
<result column="message" jdbcType="VARCHAR" property="message" />
<result column="task_ids" jdbcType="VARCHAR" property="taskIds" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -92,7 +93,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, company_id, account_id, job_name, page_index, page_size, type, interval_time,
start_time, end_time, bj_create, bj_modified, message
start_time, end_time, bj_create, bj_modified, message, task_ids
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.JobAccountLogExample" resultMap="BaseResultMap">
<!--
......@@ -157,12 +158,12 @@
job_name, page_index, page_size,
type, interval_time, start_time,
end_time, bj_create, bj_modified,
message)
message, task_ids)
values (#{id,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{accountId,jdbcType=INTEGER},
#{jobName,jdbcType=VARCHAR}, #{pageIndex,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER},
#{type,jdbcType=TINYINT}, #{intervalTime,jdbcType=TINYINT}, #{startTime,jdbcType=TIMESTAMP},
#{endTime,jdbcType=TIMESTAMP}, #{bjCreate,jdbcType=TIMESTAMP}, #{bjModified,jdbcType=TIMESTAMP},
#{message,jdbcType=VARCHAR})
#{message,jdbcType=VARCHAR}, #{taskIds,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.JobAccountLog">
<!--
......@@ -210,6 +211,9 @@
<if test="message != null">
message,
</if>
<if test="taskIds != null">
task_ids,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -251,6 +255,9 @@
<if test="message != null">
#{message,jdbcType=VARCHAR},
</if>
<if test="taskIds != null">
#{taskIds,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.JobAccountLogExample" resultType="java.lang.Long">
......@@ -309,6 +316,9 @@
<if test="record.message != null">
message = #{record.message,jdbcType=VARCHAR},
</if>
<if test="record.taskIds != null">
task_ids = #{record.taskIds,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -332,7 +342,8 @@
end_time = #{record.endTime,jdbcType=TIMESTAMP},
bj_create = #{record.bjCreate,jdbcType=TIMESTAMP},
bj_modified = #{record.bjModified,jdbcType=TIMESTAMP},
message = #{record.message,jdbcType=VARCHAR}
message = #{record.message,jdbcType=VARCHAR},
task_ids = #{record.taskIds,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -380,6 +391,9 @@
<if test="message != null">
message = #{message,jdbcType=VARCHAR},
</if>
<if test="taskIds != null">
task_ids = #{taskIds,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -400,7 +414,8 @@
end_time = #{endTime,jdbcType=TIMESTAMP},
bj_create = #{bjCreate,jdbcType=TIMESTAMP},
bj_modified = #{bjModified,jdbcType=TIMESTAMP},
message = #{message,jdbcType=VARCHAR}
message = #{message,jdbcType=VARCHAR},
task_ids = #{taskIds,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.JobAccountLog">
......@@ -450,6 +465,9 @@
<if test="message != null">
message,
</if>
<if test="taskIds != null">
task_ids,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -492,6 +510,9 @@
<if test="message != null">
#{message,jdbcType=VARCHAR},
</if>
<if test="taskIds != null">
#{taskIds,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -534,6 +555,9 @@
<if test="message != null">
message = #{message,jdbcType=VARCHAR},
</if>
<if test="taskIds != null">
task_ids = #{taskIds,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.JobAccountLog">
......@@ -544,13 +568,13 @@
-->
insert into job_account_log
(id, company_id, account_id, job_name, page_index, page_size, type, interval_time,
start_time, end_time, bj_create, bj_modified, message)
start_time, end_time, bj_create, bj_modified, message, task_ids)
values
(#{id,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{accountId,jdbcType=INTEGER},
#{jobName,jdbcType=VARCHAR}, #{pageIndex,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER},
#{type,jdbcType=TINYINT}, #{intervalTime,jdbcType=TINYINT}, #{startTime,jdbcType=TIMESTAMP},
#{endTime,jdbcType=TIMESTAMP}, #{bjCreate,jdbcType=TIMESTAMP}, #{bjModified,jdbcType=TIMESTAMP},
#{message,jdbcType=VARCHAR})
#{message,jdbcType=VARCHAR}, #{taskIds,jdbcType=VARCHAR})
on duplicate key update
id = #{id,jdbcType=INTEGER},
company_id = #{companyId,jdbcType=INTEGER},
......@@ -564,7 +588,8 @@
end_time = #{endTime,jdbcType=TIMESTAMP},
bj_create = #{bjCreate,jdbcType=TIMESTAMP},
bj_modified = #{bjModified,jdbcType=TIMESTAMP},
message = #{message,jdbcType=VARCHAR}
message = #{message,jdbcType=VARCHAR},
task_ids = #{taskIds,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.JobAccountLogExample" resultMap="BaseResultMap">
<!--
......@@ -584,9 +609,8 @@
limit 1
</select>
<select id="getListByPage" resultType="com.bailuntec.domain.entity.JobAccountLog">
SELECT t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time FROM
SELECT t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time, t2.task_ids FROM
(SELECT * FROM dc_base_company_account WHERE 1=1 <if test="platformId != null">and platform_id=#{platformId} </if>) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id order by id limit #{pageIndex},#{pageSize}
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment