记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit a5fe8056 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

commit

parent 9a9ef975
Show whitespace changes
Inline Side-by-side
Showing with 153 additions and 57 deletions
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @ a5fe8056
......@@ -34,9 +34,12 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) {
String[] keys = {
"kylin:performances_inventory:ticket:id:545532380412108806781770:surplusGeneral",
"kylin:performances_inventory:ticket:id:571907440470466561438090:surplusGeneral",
"kylin:performances_inventory:ticket:id:571910454067650563092295:surplusGeneral",
"kylin:performances_inventory:ticket:id:575422212015185926395076:surplusGeneral",
"kylin:performances_inventory:ticket:id:575423832945909762737992:surplusGeneral",
"kylin:performances_inventory:ticket:id:575424371127296001891205:surplusGeneral",
"kylin:performances_inventory:ticket:id:575424699866603521727423:surplusGeneral",
"kylin:order:id:585335405046292488883367",
"kylin:order:id:585337076784250883411769"
};
for (String key : keys) {
long value = key.hashCode();
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java
View file @ a5fe8056
......@@ -20,25 +20,39 @@ public class DataController {
private DataImpl data;
@PostMapping("initScore")
@ApiOperation("积分数据迁移")
public ResponseDto<Boolean> initScore(@RequestParam("page") int page, @RequestParam("size") int size) {
Boolean result = data.initScore(page,size);
return ResponseDto.success(result);
@PostMapping("fieldData")
@ApiOperation("场地数据迁移")
public ResponseDto<Boolean> fieldData() {
data.fieldData();
return ResponseDto.success();
}
@PostMapping("initScoreSingle")
@ApiOperation("积分数据迁移(根据uid)")
public ResponseDto<Boolean> initScore(@RequestParam("uid") String uid) {
Boolean result = data.initScore(uid);
return ResponseDto.success(result);
@PostMapping("account")
@ApiOperation("演出关联用户id迁移")
public ResponseDto<Boolean> account() {
data.account();
return ResponseDto.success();
}
@PostMapping("initLogsSingle")
@ApiOperation("初始化用户积分日志(根据uid)")
public ResponseDto<Boolean> initLogs(@RequestParam("uid") String uid) {
Boolean result = data.initLogs(uid);
return ResponseDto.success(result);
}
// @PostMapping("initScore")
// @ApiOperation("积分数据迁移")
// public ResponseDto<Boolean> initScore(@RequestParam("page") int page, @RequestParam("size") int size) {
// Boolean result = data.initScore(page,size);
// return ResponseDto.success(result);
// }
//
// @PostMapping("initScoreSingle")
// @ApiOperation("积分数据迁移(根据uid)")
// public ResponseDto<Boolean> initScore(@RequestParam("uid") String uid) {
// Boolean result = data.initScore(uid);
// return ResponseDto.success(result);
// }
//
// @PostMapping("initLogsSingle")
// @ApiOperation("初始化用户积分日志(根据uid)")
// public ResponseDto<Boolean> initLogs(@RequestParam("uid") String uid) {
// Boolean result = data.initLogs(uid);
// return ResponseDto.success(result);
// }
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ a5fe8056
......@@ -13,6 +13,7 @@ import com.liquidnet.service.adam.entity.AdamUser;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.KylinExpressModule;
import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
......@@ -21,6 +22,7 @@ import com.liquidnet.service.merchant.constant.MerchantRedisConst;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.entity.MerchantFields;
import com.liquidnet.service.merchant.mapper.MerchantFieldsMapper;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.liquidnet.service.stone.constant.StoneConstant;
import com.liquidnet.service.stone.entity.StoneScoreLogs;
import com.liquidnet.service.stone.entity.StoneScoreUser;
......@@ -31,6 +33,7 @@ import com.liquidnet.service.sweet.constant.SweetConstant;
import com.liquidnet.service.sweet.entity.SweetArtists;
import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
import com.mongodb.BasicDBObject;
import com.mysql.cj.jdbc.result.ResultSetImpl;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
......@@ -61,8 +64,8 @@ import java.util.List;
@Slf4j
public class DataImpl {
@Value("${liquidnet.service.stone.url}")
private String stoneUrl;
@Value("${liquidnet.service.adam.url}")
private String adamUrl;
@Autowired
private MongoTemplate mongoTemplate;
......@@ -370,10 +373,9 @@ public class DataImpl {
}
private static final String SQL_URL = "jdbc:mysql://39.106.122.201:3308/test_ln_scene";
private static final String SQL_URL = "jdbc:mysql://39.107.71.112:3308/dev_ln_scene";
private static final String SQL_USER = "testmall";
private static final String SQL_PWD = "zhengzai!mYT";
private static final String ADAM_URL = "http://adam.zhengzai.tv";
//迁移场地和场地认领关系
public void fieldData() {
......@@ -404,15 +406,13 @@ public class DataImpl {
" mf.admin_id\n" +
"from kylin_performances as kp\n" +
" inner join kylin_performance_relations as kpr on kpr.performance_id = kp.performances_id\n" +
" inner join mall.fields as mf on mf.id = kpr.field_id\n" +
" left join mall.merchants as mm on mm.id = mf.admin_id\n" +
"group by field_id;";
" inner join testmall.fields as mf on mf.id = kpr.field_id\n" +
" left join testmall.merchants as mm on mm.id = mf.admin_id\n" +
"group by field_id";
Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
//查询数据
PreparedStatement preparedStatement = connection.prepareStatement(sql);
ResultSetImpl row = (ResultSetImpl) preparedStatement.executeQuery();
row.close();
preparedStatement.close();
//数据迁移
while (row.next()) {
MerchantFields fields = new MerchantFields();
......@@ -425,7 +425,7 @@ public class DataImpl {
params.add("mobile", contactMobile);
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8");
String returnData = HttpUtil.post(ADAM_URL.concat("/adam/rsc/reg/mobile"), params, headers);
String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/reg/mobile"), params, headers);
AdamUserInfoVo adamUserInfoVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserInfoVo>>() {
}).getData();
String uid = adamUserInfoVo.getUid();
......@@ -465,35 +465,38 @@ public class DataImpl {
//REDIS
setRdsFieldsVoByFieldId(fields.getFieldId(), vo);
}
row.close();
preparedStatement.close();
} catch (Exception e) {
e.printStackTrace();
}
}
//演出所属账号修改
public void Account() {
public void account() {
try {
String sql = "select merchant_id, mm.mobile\n" +
"from kylin_performances kp\n" +
" inner join kylin_performance_relations kpr on kpr.performance_id = kp.performances_id\n" +
" left join mall.merchants mm on mm.id = kpr.merchant_id\n" +
" left join testmall.merchants mm on mm.id = kpr.merchant_id\n" +
"group by mm.mobile";
Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
//查询数据
PreparedStatement preparedStatement = connection.prepareStatement(sql);
ResultSetImpl row = (ResultSetImpl) preparedStatement.executeQuery();
row.close();
preparedStatement.close();
//数据迁移
while (row.next()) {
String mobile = row.getString("mobile");
String merchantId =row.getString("merchant_id");
if(mobile==null){
continue;
}
//获取java用户id
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("mobile", mobile);
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8");
String returnData = HttpUtil.post(ADAM_URL.concat("/adam/rsc/reg/mobile"), params, headers);
String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/reg/mobile"), params, headers);
AdamUserInfoVo adamUserInfoVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserInfoVo>>() {
}).getData();
String uid = adamUserInfoVo.getUid();
......@@ -501,12 +504,87 @@ public class DataImpl {
kylinPerformanceRelations.setMerchantId(uid);
kylinPerformanceRelationsMapper.update(kylinPerformanceRelations,
Wrappers.lambdaUpdate(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getMerchantId, merchantId));
HashMap<String,Object> map = CollectionUtil.mapStringObject();
map.put("merchantId",merchantId);
//修改vo
Query voQuery = Query.query(Criteria.where("merchantId").is(merchantId));
BasicDBObject objectVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
voQuery.getQueryObject(),
objectVo
);
//修改partnerVo
Query partnerVoQuery = Query.query(Criteria.where("merchantId").is(merchantId));
BasicDBObject objectPartnerVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
partnerVoQuery.getQueryObject(),
objectPartnerVo
);
}
row.close();
preparedStatement.close();
} catch (Exception e) {
e.printStackTrace();
}
}
//演出主办
// public void sponsor() {
// try {
// String sql = "select sponsor_id,sponsor_type from kylin_performances kp\n" +
// "inner join kylin_performance_status kps on kps.performance_id = kp.performances_id\n" +
// "where status >=3 and sponsor_id != ''\n" +
// "group by sponsor_id,sponsor_type;";
// Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
// //查询数据
// PreparedStatement preparedStatement = connection.prepareStatement(sql);
// ResultSetImpl row = (ResultSetImpl) preparedStatement.executeQuery();
// //数据迁移
// while (row.next()) {
// String sponsorId = row.getString("sponsor_id");
// String sponsorType =row.getString("sponsor_type");
// if(mobile==null){
// continue;
// }
// //获取java用户id
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("mobile", mobile);
// MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
// headers.add("Accept", "application/json;charset=UTF-8");
// String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/reg/mobile"), params, headers);
// AdamUserInfoVo adamUserInfoVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserInfoVo>>() {
// }).getData();
// String uid = adamUserInfoVo.getUid();
// KylinPerformanceRelations kylinPerformanceRelations = KylinPerformanceRelations.getNew();
// kylinPerformanceRelations.setMerchantId(uid);
// kylinPerformanceRelationsMapper.update(kylinPerformanceRelations,
// Wrappers.lambdaUpdate(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getMerchantId, merchantId));
//
// HashMap<String,Object> map = CollectionUtil.mapStringObject();
// map.put("merchantId",merchantId);
// //修改vo
// Query voQuery = Query.query(Criteria.where("merchantId").is(merchantId));
// BasicDBObject objectVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
// mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
// voQuery.getQueryObject(),
// objectVo
// );
// //修改partnerVo
// Query partnerVoQuery = Query.query(Criteria.where("merchantId").is(merchantId));
// BasicDBObject objectPartnerVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
// mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
// partnerVoQuery.getQueryObject(),
// objectPartnerVo
// );
// }
// row.close();
// preparedStatement.close();
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//相关权限迁移
private void setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java
View file @ a5fe8056
......@@ -97,7 +97,7 @@ public class PerformanceVoTask {
List<String> performanceIdList = new ArrayList<>();
if (performanceSingleId == null) {
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 3, 4, 6, 7, 8, 9, 10));
for (KylinPerformanceStatus item : list) {
performanceIdList.add(item.getPerformanceId());
}
......@@ -386,41 +386,42 @@ public class PerformanceVoTask {
KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
if (!misVo.getTitle().equals(mongoVo.getTitle())) {
log.info("performanceId = "+performanceId+" NEED CHANGE TITLE");
log.info("performanceId = " + performanceId + " NEED CHANGE TITLE");
return true;
} if (!misVo.getImgPoster().equals(mongoVo.getImgPoster())) {
log.info("performanceId = "+performanceId+" NEED CHANGE IMGPOSTER");
}
if (!misVo.getImgPoster().equals(mongoVo.getImgPoster())) {
log.info("performanceId = " + performanceId + " NEED CHANGE IMGPOSTER");
return true;
} else if (!misVo.getType().equals(mongoVo.getType())) {
log.info("performanceId = "+performanceId+" NEED CHANGE TYPE");
log.info("performanceId = " + performanceId + " NEED CHANGE TYPE");
return true;
} else if (!misVo.getTimeStart().equals(mongoVo.getTimeStart())) {
log.info("performanceId = "+performanceId+" NEED CHANGE TIMESTART");
log.info("performanceId = " + performanceId + " NEED CHANGE TIMESTART");
return true;
} else if (!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())) {
log.info("performanceId = "+performanceId+" NEED CHANGE TIMEEND");
log.info("performanceId = " + performanceId + " NEED CHANGE TIMEEND");
return true;
} else if (!misVo.getFieldId().equals(mongoVo.getFieldId())) {
log.info("performanceId = "+performanceId+" NEED CHANGE FIELDID");
log.info("performanceId = " + performanceId + " NEED CHANGE FIELDID");
return true;
} else if (!misVo.getNotice().equals(mongoVo.getNotice())) {
log.info("performanceId = "+performanceId+" NEED CHANGE NOTICE");
log.info("performanceId = " + performanceId + " NEED CHANGE NOTICE");
return true;
} else if (!misVo.getDetails().replace("'","").equals(mongoVo.getDetails().replace("'",""))) {
log.info("performanceId = "+performanceId+" NEED CHANGE DETAILS");
} else if (!misVo.getDetails().replace("'", "").equals(mongoVo.getDetails().replace("'", ""))) {
log.info("performanceId = " + performanceId + " NEED CHANGE DETAILS");
return true;
} else if (!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())) {
log.info("performanceId = "+performanceId+" NEED CHANGE APPROVALURL");
log.info("performanceId = " + performanceId + " NEED CHANGE APPROVALURL");
return true;
} else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
log.info("performanceId = "+performanceId+" NEED CHANGE PAYCOUTDOWN");
log.info("performanceId = " + performanceId + " NEED CHANGE PAYCOUTDOWN");
return true;
}
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is(-1).and("performancesId").is(performanceId)),
KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
if (exists) {
log.info("performanceId = "+performanceId+" NEED CHANGE NEW TIMES");
log.info("performanceId = " + performanceId + " NEED CHANGE NEW TIMES");
return true;
}
......@@ -428,26 +429,26 @@ public class PerformanceVoTask {
TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
KylinTicketTimesVo timesVo = mongoVo.getTicketTimeList().get(i);
if(!times.getUseStart().equals(timesVo.getUseStart())){
log.info("performanceId = "+performanceId+" NEED CHANGE TIMES USE_START");
if (!times.getUseStart().equals(timesVo.getUseStart())) {
log.info("performanceId = " + performanceId + " NEED CHANGE TIMES USE_START");
return true;
}
if(!times.getUseEnd().equals(timesVo.getUseEnd())){
log.info("performanceId = "+performanceId+" NEED CHANGE TIMES USE_END");
if (!times.getUseEnd().equals(timesVo.getUseEnd())) {
log.info("performanceId = " + performanceId + " NEED CHANGE TIMES USE_END");
return true;
}
boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is(-2).and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if (exists2) {
log.info("performanceId = "+performanceId+" NEED CHANGE NEW TICKET");
log.info("performanceId = " + performanceId + " NEED CHANGE NEW TICKET");
return true;
}
for (KylinTicketPartnerVo ticketPartnerVo : times.getTicket()) {
for (KylinTicketVo ticketVo : timesVo.getTicketList()) {
if (ticketVo.getTicketsId().equals(ticketPartnerVo.getTicketsId())) {
if (!ticketVo.getTitle().equals(ticketPartnerVo.getTitle())) {
log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET TITLE");
log.info("performanceId = " + performanceId + " ticketId = " + ticketVo.getTicketsId() + " NEED CHANGE TICKET TITLE");
return true;
}
// else if (!ticketVo.getQrCodeShowTime().equals(ticketPartnerVo.getQrCodeShowTime())) {
......@@ -455,14 +456,14 @@ public class PerformanceVoTask {
// return true;
// }
else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET DESCRIBEELECTRONIC");
log.info("performanceId = " + performanceId + " ticketId = " + ticketVo.getTicketsId() + " NEED CHANGE TICKET DESCRIBEELECTRONIC");
return true;
} else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribeExpress())) {
log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET DESCRIBEELEXPRESS");
log.info("performanceId = " + performanceId + " ticketId = " + ticketVo.getTicketsId() + " NEED CHANGE TICKET DESCRIBEELEXPRESS");
return true;
}
if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
log.info("performanceId = "+performanceId+" NEED CHANGE TICKET DESCRIBES");
log.info("performanceId = " + performanceId + " NEED CHANGE TICKET DESCRIBES");
return true;
}
break;
......
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