bob
/
RuoYi-flowable-bak
mirror of https://gitee.com/libobio/RuoYi-flowable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: bob:c129c0962413d41b3c17876c93db8036cb93b96b
Branches Tags
bob:畅捷通同步方案更新
bob:报表弃用中间表
bob:master
bob:odoo切换查询方式
bob:畅捷通报表
bob:飞书小程序
bob:沃森川job同步飞书
bob:yxy/生成PDF
bob:于相涌/robot_optimize
bob:于相涌/robot
bob:于相涌/Lark
bob:deliver/approver-flow
bob:于相涌/mail
bob:test
bob:approve-sys
..
compare: bob:8c397edad7e412e66463a43971309ee81106276b
Branches Tags
bob:畅捷通同步方案更新
bob:报表弃用中间表
bob:master
bob:odoo切换查询方式
bob:畅捷通报表
bob:飞书小程序
bob:沃森川job同步飞书
bob:yxy/生成PDF
bob:于相涌/robot_optimize
bob:于相涌/robot
bob:于相涌/Lark
bob:deliver/approver-flow
bob:于相涌/mail
bob:test
bob:approve-sys

No commits in common. 'c129c0962413d41b3c17876c93db8036cb93b96b' and '8c397edad7e412e66463a43971309ee81106276b' have entirely different histories.
c129c09624 ... 8c397edad7

11 changed files with 121 additions and 139 deletions
Show Stats

2
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMapper.java
Unescape View File

@ -65,7 +65,7 @@ public interface ErpLarkRelationMapper
public List<ErpLarkRelation> queryListByKeyList(@Param("keyList") List<String> keyList,@Param("method") String method); public List<ErpLarkRelation> queryListByKeyList(@Param("keyList") List<String> keyList,@Param("method") String method);
public List<ErpLarkRelation> queryListByKeyListAndRemark(@Param("keyList") List<String> keyList,@Param("method") String method,@Param("remark") String remark,@Param("tableId") String tableId); public List<ErpLarkRelation> queryListByKeyListAndRemark(@Param("keyList") List<String> keyList,@Param("method") String method,@Param("remark") String remark);
public List<String> queryWaitDeleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark); public List<String> queryWaitDeleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark);
public void deleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark); public void deleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark);
/** /**

176
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/CJTOperateCallBackAbstract.java
Unescape View File

@ -37,7 +37,6 @@ import java.util.stream.Collectors;
/** /**
* 畅捷通回调接口操作 * 畅捷通回调接口操作
*
* @author yuxiangyong * @author yuxiangyong
* @create 2023-10-11 19:54 * @create 2023-10-11 19:54
*/ */
@ -64,11 +63,11 @@ public abstract class CJTOperateCallBackAbstract {
*/ */
protected static final String REQUEST_ROOT_PATH = "https://openapi.chanjet.com"; protected static final String REQUEST_ROOT_PATH = "https://openapi.chanjet.com";
public void execute(CJTEdiCallbackRequestVo req) { public void execute(CJTEdiCallbackRequestVo req){
String operateCallBackFlag = buildCacheUniqueKey(RedisConstants.CJT_CALLBACK_OPERATE, req.getAppId() + req.getMsgType() + req.getVoucherId()); String operateCallBackFlag = buildCacheUniqueKey(RedisConstants.CJT_CALLBACK_OPERATE, req.getAppId() + req.getMsgType() + req.getVoucherId());
try { try {
Boolean operateFlag = redisCache.setCacheObjectIfAbsent(operateCallBackFlag, operateCallBackFlag, 10L, TimeUnit.MINUTES); Boolean operateFlag = redisCache.setCacheObjectIfAbsent(operateCallBackFlag, operateCallBackFlag, 10L, TimeUnit.MINUTES);
if (!operateFlag) { if (!operateFlag){
return; return;
} }
preHandle(req); preHandle(req);
@ -76,27 +75,27 @@ public abstract class CJTOperateCallBackAbstract {
// resetTicket(req); // resetTicket(req);
sync(req); sync(req);
endHandle(req); endHandle(req);
} catch (Exception e) { }catch (Exception e){
log.error("{} execute error", this.getClass().getSimpleName(), e); log.error("{} execute error",this.getClass().getSimpleName(),e);
if (req.getRetry() && req.getRetryCount() < 3) { if (req.getRetry() && req.getRetryCount() < 3){
req.addRetryCount(); req.addRetryCount();
execute(req); execute(req);
} else { }else {
errorHandle(req, e); errorHandle(req,e);
larkRobotHelper.sendMessageByBot(ROBOT_GROUP, buildRobotErrorCountMessage(req, e)); larkRobotHelper.sendMessageByBot(ROBOT_GROUP, buildRobotErrorCountMessage(req,e));
} }
} finally { }finally {
redisCache.deleteObject(operateCallBackFlag); redisCache.deleteObject(operateCallBackFlag);
} }
} }
private void preHandle(CJTEdiCallbackRequestVo req) { private void preHandle(CJTEdiCallbackRequestVo req){
if (req.getRetryCount() > 0) { if (req.getRetryCount() > 0){
return; return;
} }
Date date = new Date(); Date date = new Date();
ErpLarkTempRelation erpLarkTempRelation = new ErpLarkTempRelation(); ErpLarkTempRelation erpLarkTempRelation = new ErpLarkTempRelation();
erpLarkTempRelation.setKey(req.getVoucherId()); erpLarkTempRelation.setKey(req.getBody().getString("voucherID"));
erpLarkTempRelation.setMethod(req.getMsgType()); erpLarkTempRelation.setMethod(req.getMsgType());
erpLarkTempRelation.setLarkKey(req.getAppId()); erpLarkTempRelation.setLarkKey(req.getAppId());
erpLarkTempRelation.setCreateBy("System"); erpLarkTempRelation.setCreateBy("System");
@ -107,33 +106,32 @@ public abstract class CJTOperateCallBackAbstract {
req.setTempId(erpLarkTempRelation.getId()); req.setTempId(erpLarkTempRelation.getId());
} }
private void endHandle(CJTEdiCallbackRequestVo req) { private void endHandle(CJTEdiCallbackRequestVo req){
if (req.getTempId() != null) { if (req.getTempId() != null){
erpLarkTempRelationMapper.updateForCjt(FlagStatus.DELETED.getCode(), req.getTempId(), ""); erpLarkTempRelationMapper.updateForCjt(FlagStatus.DELETED.getCode(), req.getTempId(),"");
} }
} }
private void errorHandle(CJTEdiCallbackRequestVo req, Exception e) { private void errorHandle(CJTEdiCallbackRequestVo req,Exception e){
if (req.getTempId() != null) { if (req.getTempId() != null){
erpLarkTempRelationMapper.updateForCjt(FlagStatus.OK.getCode(), req.getTempId(), e.getMessage()); erpLarkTempRelationMapper.updateForCjt(FlagStatus.OK.getCode(), req.getTempId(),e.getMessage());
} }
} }
private void sync(CJTEdiCallbackRequestVo req) { private void sync(CJTEdiCallbackRequestVo req){
CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum(); CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum();
LarkCJTRequestBody cjtRequestBody = new LarkCJTRequestBody(req.getVoucherId()); LarkCJTRequestBody cjtRequestBody = new LarkCJTRequestBody(req.getVoucherId());
LarkCJTRequest cjtRequest = new LarkCJTRequest(getRequestUrl(), cjtAccountEnum.getAppKey(), cjtAccountEnum.getAppSecret(), generateToken(req), cjtRequestBody); LarkCJTRequest cjtRequest = new LarkCJTRequest(getRequestUrl(), cjtAccountEnum.getAppKey(), cjtAccountEnum.getAppSecret(), generateToken(req),cjtRequestBody);
LarkOkHttpHelper.post(cjtRequest); LarkOkHttpHelper.post(cjtRequest);
JSONObject jsonObject = requestCjt(cjtRequest); JSONObject jsonObject = requestCjt(cjtRequest);
syncRecord(req, jsonObject); syncRecord(req,jsonObject);
} }
/** /**
* 解析实体，并构建 * 解析实体，并构建
*
* @param req * @param req
*/ */
protected abstract void syncRecord(CJTEdiCallbackRequestVo req, JSONObject returnBody); protected abstract void syncRecord(CJTEdiCallbackRequestVo req,JSONObject returnBody);
/** /**
* 获取请求明细的路径 * 获取请求明细的路径
@ -145,52 +143,52 @@ public abstract class CJTOperateCallBackAbstract {
*/ */
protected abstract String getMethodUrl(); protected abstract String getMethodUrl();
private void initContext(CJTEdiCallbackRequestVo req) { private void initContext(CJTEdiCallbackRequestVo req){
LarkCompanyRelation companyRelation = req.getCompanyRelation(); LarkCompanyRelation companyRelation = req.getCompanyRelation();
String larkCompanyCode = req.getMsgTypeEnum().getLarkCompanyCode(); String larkCompanyCode = req.getMsgTypeEnum().getLarkCompanyCode();
if (companyRelation == null) { if (companyRelation == null){
LarkCompanyRelation queryCompany = new LarkCompanyRelation(); LarkCompanyRelation queryCompany = new LarkCompanyRelation();
queryCompany.setAppType(larkCompanyCode); queryCompany.setAppType(larkCompanyCode);
queryCompany.setFlag(FlagStatus.OK.getCode()); queryCompany.setFlag(FlagStatus.OK.getCode());
queryCompany.setRemark(req.getAppId()); queryCompany.setRemark(req.getAppId());
List<LarkCompanyRelation> larkCompanyRelations = larkCompanyRelationMapper.selectLarkCompanyRelationList(queryCompany); List<LarkCompanyRelation> larkCompanyRelations = larkCompanyRelationMapper.selectLarkCompanyRelationList(queryCompany);
if (CollectionUtils.isEmpty(larkCompanyRelations)) { if (CollectionUtils.isEmpty(larkCompanyRelations)){
throw new RuntimeException(String.format("%s 无larkCompany配置信息 appId:%s appType:%s", req.getMsgType(), req.getAppId(), larkCompanyCode)); throw new RuntimeException(String.format("%s 无larkCompany配置信息 appId:%s appType:%s",req.getMsgType(),req.getAppId(),larkCompanyCode));
} }
companyRelation = larkCompanyRelations.get(0); companyRelation = larkCompanyRelations.get(0);
req.setCompanyRelation(companyRelation); req.setCompanyRelation(companyRelation);
} }
LarkTableRelation tableRelation = req.getTableRelation(); LarkTableRelation tableRelation = req.getTableRelation();
if (tableRelation == null) { if (tableRelation == null){
LarkTableRelation queryTable = new LarkTableRelation(); LarkTableRelation queryTable = new LarkTableRelation();
queryTable.setLarkCompanyRelationId(companyRelation.getId()); queryTable.setLarkCompanyRelationId(companyRelation.getId());
queryTable.setFlag(FlagStatus.OK.getCode()); queryTable.setFlag(FlagStatus.OK.getCode());
List<LarkTableRelation> larkTableRelations = larkTableRelationMapper.selectLarkTableRelationList(queryTable); List<LarkTableRelation> larkTableRelations = larkTableRelationMapper.selectLarkTableRelationList(queryTable);
if (CollectionUtils.isEmpty(larkTableRelations)) { if (CollectionUtils.isEmpty(larkTableRelations)){
throw new RuntimeException(String.format("%s 无larkTableRelation配置信息 appId:%s appType:%s larkCompanyId:%s", req.getMsgType(), req.getAppId(), larkCompanyCode, companyRelation.getId())); throw new RuntimeException(String.format("%s 无larkTableRelation配置信息 appId:%s appType:%s larkCompanyId:%s",req.getMsgType(),req.getAppId(),larkCompanyCode,companyRelation.getId()));
} }
tableRelation = larkTableRelations.get(0); tableRelation = larkTableRelations.get(0);
req.setTableRelation(tableRelation); req.setTableRelation(tableRelation);
} }
} }
private String buildRobotErrorCountMessage(CJTEdiCallbackRequestVo req, Exception e) { private String buildRobotErrorCountMessage(CJTEdiCallbackRequestVo req,Exception e){
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
body.put("cjtId", req.getAppId()); body.put("cjtId",req.getAppId());
body.put("msgType", req.getMsgType()); body.put("msgType",req.getMsgType());
LarkCompanyRelation companyRelation = req.getCompanyRelation(); LarkCompanyRelation companyRelation = req.getCompanyRelation();
if (companyRelation != null) { if (companyRelation != null){
body.put("companyRelationId", companyRelation.getId()); body.put("companyRelationId",companyRelation.getId());
} }
LarkTableRelation tableRelation = req.getTableRelation(); LarkTableRelation tableRelation = req.getTableRelation();
if (tableRelation != null) { if (tableRelation != null){
body.put("tableRelationId", tableRelation.getId()); body.put("tableRelationId",tableRelation.getId());
} }
body.put("errorInfo", e.getMessage()); body.put("errorInfo",e.getMessage());
return body.toJSONString(); return body.toJSONString();
} }
protected LarkTableRequest buildLarkTableRequest(CJTEdiCallbackRequestVo req) { protected LarkTableRequest buildLarkTableRequest(CJTEdiCallbackRequestVo req){
LarkTableRequest request = new LarkTableRequest(); LarkTableRequest request = new LarkTableRequest();
request.setAppId(req.getLarkAppId()); request.setAppId(req.getLarkAppId());
request.setAppSecret(req.getLarkAppSecret()); request.setAppSecret(req.getLarkAppSecret());
@ -200,6 +198,9 @@ public abstract class CJTOperateCallBackAbstract {
} }
protected void addRecord(CJTEdiCallbackRequestVo req, JSONObject header) { protected void addRecord(CJTEdiCallbackRequestVo req, JSONObject header) {
//多维表格id //多维表格id
String toTableId = req.getLarkToTableId(); String toTableId = req.getLarkToTableId();
@ -213,24 +214,24 @@ public abstract class CJTOperateCallBackAbstract {
for (int i = 0; i < details.size(); i++) { for (int i = 0; i < details.size(); i++) {
try { try {
JSONObject detail = details.getJSONObject(i); JSONObject detail = details.getJSONObject(i);
String uniqueKey = buildUniqueKey(toTableId, header, detail, cjtAccountEnum); String uniqueKey = buildUniqueKey(toTableId, header, detail,cjtAccountEnum);
Map<String, Object> larkBody = buildLarkBody(header, detail, cjtAccountEnum); Map<String, Object> larkBody = buildLarkBody(header, detail,cjtAccountEnum);
request.setBody(larkBody); request.setBody(larkBody);
CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(request); CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(request);
String larkKey = respBody.getRecord().getRecordId(); String larkKey = respBody.getRecord().getRecordId();
relationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjtAccountEnum.getCode(), toTableId, req.getVoucherId())); relationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjtAccountEnum.getCode(),toTableId,req.getVoucherId()));
} catch (Exception e) { }catch (Exception e){
errorList.add(e.getMessage()); errorList.add(e.getMessage());
} }
} }
if (CollectionUtils.isEmpty(errorList)) { if (CollectionUtils.isEmpty(errorList)){
req.setRetry(Boolean.FALSE); req.setRetry(Boolean.FALSE);
} }
if (!org.springframework.util.CollectionUtils.isEmpty(relationList)) { if (!org.springframework.util.CollectionUtils.isEmpty(relationList)) {
erpLarkRelationMapper.batchInsert(relationList); erpLarkRelationMapper.batchInsert(relationList);
} }
if (CollectionUtils.isNotEmpty(errorList)) { if (CollectionUtils.isNotEmpty(errorList)){
throw new RuntimeException(String.join(",", errorList)); throw new RuntimeException(String.join(",",errorList));
} }
@ -246,59 +247,65 @@ public abstract class CJTOperateCallBackAbstract {
LarkTableRequest request = this.buildLarkTableRequest(req); LarkTableRequest request = this.buildLarkTableRequest(req);
CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum(); CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum();
//获取已经存在的明细 //获取已经存在的明细
List<ErpLarkRelation> existRecords = getExistRecords(req); Map<String, ErpLarkRelation> existMap = getExistRecords(req).stream().collect(Collectors.toMap(ErpLarkRelation::getKey, Function.identity(), (K1, k2) -> K1));
if (CollectionUtils.isNotEmpty(existRecords)) { if (existMap != null && existMap.size() > 0){
toTableId = existRecords.get(0).getLarkTable(); List<ErpLarkRelation> collect = existMap.values().stream().collect(Collectors.toList());
toTableId = collect.get(0).getLarkTable();
} }
//因为可能存在修改的情况，所以这里全部删除重新创建
operateDelete(req, existRecords);
List<String> errorList = new ArrayList<>(); List<String> errorList = new ArrayList<>();
for (int i = 0; i < details.size(); i++) { for (int i = 0; i < details.size(); i++) {
JSONObject detail = details.getJSONObject(i); JSONObject detail = details.getJSONObject(i);
String uniqueKey = buildUniqueKey(toTableId, header, detail, cjtAccountEnum); String uniqueKey = buildUniqueKey(toTableId, header, detail,cjtAccountEnum);
Map<String, Object> larkBody = buildLarkBody(header, detail, cjtAccountEnum); Map<String, Object> larkBody = buildLarkBody(header, detail,cjtAccountEnum);
request.setBody(larkBody); request.setBody(larkBody);
try { if (existMap.containsKey(uniqueKey)){
request.setRecord(null); try {
request.setAppTable(toTableId); ErpLarkRelation erpLarkRelation = existMap.get(uniqueKey);
CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(request); request.setRecord(erpLarkRelation.getLarkKey());
String larkKey = respBody.getRecord().getRecordId(); request.setAppTable(erpLarkRelation.getLarkTable());
waitCreateRelationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjtAccountEnum.getCode(), toTableId, req.getVoucherId())); larkTableHelper.updateTableRecord(request);
} catch (Exception e) { }catch (Exception e){
errorList.add(e.getMessage()); errorList.add(e.getMessage());
}
}else {
try {
request.setRecord(null);
request.setAppTable(toTableId);
CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(request);
String larkKey = respBody.getRecord().getRecordId();
waitCreateRelationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjtAccountEnum.getCode(),toTableId,req.getVoucherId()));
}catch (Exception e){
errorList.add(e.getMessage());
}
} }
} }
if (CollectionUtils.isEmpty(errorList)) { if (CollectionUtils.isEmpty(errorList)){
req.setRetry(Boolean.FALSE); req.setRetry(Boolean.FALSE);
} }
if (!org.springframework.util.CollectionUtils.isEmpty(waitCreateRelationList)) { if (!org.springframework.util.CollectionUtils.isEmpty(waitCreateRelationList)) {
erpLarkRelationMapper.batchInsert(waitCreateRelationList); erpLarkRelationMapper.batchInsert(waitCreateRelationList);
} }
if (CollectionUtils.isNotEmpty(errorList)) { if (CollectionUtils.isNotEmpty(errorList)){
throw new RuntimeException(String.join(",", errorList)); throw new RuntimeException(String.join(",",errorList));
} }
} }
protected abstract String getDetailName(); protected abstract String getDetailName();
/** /**
* 构建唯一key * 构建唯一key
*
* @return * @return
*/ */
protected abstract String buildUniqueKey(String toTableId, JSONObject header, JSONObject detail, CjtAccountEnum cjtAccountEnum); protected abstract String buildUniqueKey(String toTableId, JSONObject header, JSONObject detail,CjtAccountEnum cjtAccountEnum);
/** /**
* 构建多维表格请求体的body * 构建多维表格请求体的body
*
* @return * @return
*/ */
protected abstract Map<String, Object> buildLarkBody(JSONObject header, JSONObject detail, CjtAccountEnum cjtAccountEnum); protected abstract Map<String, Object> buildLarkBody(JSONObject header, JSONObject detail,CjtAccountEnum cjtAccountEnum);
//构建飞书行与cjt唯一键的对应关系对象 //构建飞书行与cjt唯一键的对应关系对象
private ErpLarkRelation buildErpLarkRelation(String key, String larkKey, String cjt, String tableId, String cjtId) { private ErpLarkRelation buildErpLarkRelation(String key, String larkKey, String cjt,String tableId,String cjtId) {
ErpLarkRelation erpLarkRelation = new ErpLarkRelation(); ErpLarkRelation erpLarkRelation = new ErpLarkRelation();
erpLarkRelation.setKey(key); erpLarkRelation.setKey(key);
erpLarkRelation.setCjtId(cjtId); erpLarkRelation.setCjtId(cjtId);
@ -313,7 +320,7 @@ public abstract class CJTOperateCallBackAbstract {
return erpLarkRelation; return erpLarkRelation;
} }
protected Object getSpecialKey(JSONObject detail, String key) { protected Object getSpecialKey(JSONObject detail,String key){
JSONArray dynamicPropertyKeys = detail.getJSONArray("DynamicPropertyKeys"); JSONArray dynamicPropertyKeys = detail.getJSONArray("DynamicPropertyKeys");
for (int i = 0; i < dynamicPropertyKeys.size(); i++) { for (int i = 0; i < dynamicPropertyKeys.size(); i++) {
if (key.equals(dynamicPropertyKeys.get(i))) { if (key.equals(dynamicPropertyKeys.get(i))) {
@ -326,24 +333,18 @@ public abstract class CJTOperateCallBackAbstract {
/** /**
* 删除无效记录 * 删除无效记录
*
* @param req * @param req
*/ */
protected void deleteRecord(CJTEdiCallbackRequestVo req) { protected void deleteRecord(CJTEdiCallbackRequestVo req){
LarkTableRequest request = new LarkTableRequest(req.getLarkAppId(), req.getLarkAppSecret(), req.getLarkToAppToken(),null);
Map<String,List<String>> waitDeleteLarkMap = new HashMap<>();
List<ErpLarkRelation> relationList = getExistRecords(req); List<ErpLarkRelation> relationList = getExistRecords(req);
operateDelete(req, relationList);
}
private void operateDelete(CJTEdiCallbackRequestVo req, List<ErpLarkRelation> relationList) {
LarkTableRequest request = new LarkTableRequest(req.getLarkAppId(), req.getLarkAppSecret(), req.getLarkToAppToken(), null);
Map<String, List<String>> waitDeleteLarkMap = new HashMap<>();
List<Long> waitDeleteIdList = new ArrayList<>(); List<Long> waitDeleteIdList = new ArrayList<>();
for (ErpLarkRelation record : relationList) { for (ErpLarkRelation record : relationList) {
String appTable = record.getLarkTable(); String appTable = record.getLarkTable();
List<String> waitDeleteLarkList = waitDeleteLarkMap.getOrDefault(appTable, new ArrayList<>()); List<String> waitDeleteLarkList = waitDeleteLarkMap.getOrDefault(appTable, new ArrayList<>());
waitDeleteLarkList.add(record.getLarkKey()); waitDeleteLarkList.add(record.getLarkKey());
waitDeleteLarkMap.put(appTable, waitDeleteLarkList); waitDeleteLarkMap.put(appTable,waitDeleteLarkList);
waitDeleteIdList.add(record.getId()); waitDeleteIdList.add(record.getId());
} }
if (!waitDeleteLarkMap.isEmpty()) { if (!waitDeleteLarkMap.isEmpty()) {
@ -359,8 +360,7 @@ public abstract class CJTOperateCallBackAbstract {
} }
} }
protected List<ErpLarkRelation> getExistRecords(CJTEdiCallbackRequestVo req){
protected List<ErpLarkRelation> getExistRecords(CJTEdiCallbackRequestVo req) {
CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum(); CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum();
ErpLarkRelation erpLarkRelation = new ErpLarkRelation(); ErpLarkRelation erpLarkRelation = new ErpLarkRelation();
erpLarkRelation.setRemark(cjtAccountEnum.getCode()); erpLarkRelation.setRemark(cjtAccountEnum.getCode());
@ -392,6 +392,7 @@ public abstract class CJTOperateCallBackAbstract {
// String ticket = (String) redisCache.getCacheObject(ticketCacheKey); // String ticket = (String) redisCache.getCacheObject(ticketCacheKey);
// req.setTicket(ticket); // req.setTicket(ticket);
// } // }
private String buildCacheUniqueKey(String key, String appKey) { private String buildCacheUniqueKey(String key, String appKey) {
return String.format("%s:%s", key, appKey); return String.format("%s:%s", key, appKey);
} }
@ -403,10 +404,10 @@ public abstract class CJTOperateCallBackAbstract {
CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum(); CjtAccountEnum cjtAccountEnum = req.getCjtAccountEnum();
String tokenCacheKey = buildCacheUniqueKey(RedisConstants.CJT_TOKEN_CACHE_KEY, cjtAccountEnum.getAppKey()); String tokenCacheKey = buildCacheUniqueKey(RedisConstants.CJT_TOKEN_CACHE_KEY, cjtAccountEnum.getAppKey());
String openToken = (String) redisCache.getCacheObject(tokenCacheKey); String openToken = (String) redisCache.getCacheObject(tokenCacheKey);
if (!StringUtils.isEmpty(openToken)) { if (!StringUtils.isEmpty(openToken)){
req.setOpenToken(openToken); req.setOpenToken(openToken);
return openToken; return openToken;
} else { }else {
throw new RuntimeException("token不存在"); throw new RuntimeException("token不存在");
} }
} }
@ -423,7 +424,6 @@ public abstract class CJTOperateCallBackAbstract {
} }
return responseBody.getData(); return responseBody.getData();
} }
protected String buildErrorBody(LarkCJTRequest req, String errorMessage) { protected String buildErrorBody(LarkCJTRequest req, String errorMessage) {
JSONObject errorInfo = new JSONObject(); JSONObject errorInfo = new JSONObject();
errorInfo.put("url", req.getUrl()); errorInfo.put("url", req.getUrl());

4
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java
Unescape View File

@ -43,8 +43,8 @@ public class ManufactureOrderSyncCallOperate extends CJTOperateCallBackAbstract
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (cjtAccountEnum.getCode().equals(CjtAccountEnum.TWO.getCode())){ if (cjtAccountEnum.getCode().equals(CjtAccountEnum.TWO.getCode())){
sb.append(detail.get("Quantity")).append("_"); sb.append(detail.get("Quantity")).append("_");
sb.append(getSpecialKey(detail, "pubuserdefnvc2")).append("_"); sb.append(getSpecialKey(detail, "pubuserdefnvc3")).append("_");
sb.append(getSpecialKey(detail, "priuserdefnvc1")).append("_"); sb.append(getSpecialKey(detail, "pubuserdefnvc3")).append("_");
}else { }else {
sb.append(detail.get("SourceVoucherCode")).append("_"); sb.append(detail.get("SourceVoucherCode")).append("_");
sb.append(header.get("Code")).append("_"); sb.append(header.get("Code")).append("_");

2
ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMapper.xml
Unescape View File

@ -54,7 +54,7 @@
<select id="queryListByKeyListAndRemark" resultMap="ErpLarkRelationResult"> <select id="queryListByKeyListAndRemark" resultMap="ErpLarkRelationResult">
select `key`, `method`,lark_key select `key`, `method`,lark_key
from erp_lark_relation from erp_lark_relation
where `method` = #{method} and lark_table = #{tableId} and remark = #{remark} and `key` in where `method` = #{method} and remark = #{remark} and `key` in
<foreach collection="keyList" open="(" separator="," close=")" item="item"> <foreach collection="keyList" open="(" separator="," close=")" item="item">
#{item} #{item}
</foreach> </foreach>

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java
Unescape View File

@ -66,7 +66,6 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract {
@Override @Override
protected List<String> getQueryFields() { protected List<String> getQueryFields() {
return Arrays.asList( return Arrays.asList(
"ManufactureOrder.ID",
"ManufactureOrder.VoucherDate", "ManufactureOrder.VoucherDate",
"ManufactureOrder.ManufactureOrderDetails.SourceVoucherCode", "ManufactureOrder.ManufactureOrderDetails.SourceVoucherCode",
"ManufactureOrder.Code", "ManufactureOrder.Code",

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java
Unescape View File

@ -63,7 +63,6 @@ public class PurchaseArrivalOpenSyncJob extends SyncAccountsJobAbstract{
@Override @Override
protected List<String> getQueryFields() { protected List<String> getQueryFields() {
return Arrays.asList( return Arrays.asList(
"PurchaseArrival.ID",
"PurchaseArrival.PurchaseOrderCode", "PurchaseArrival.PurchaseOrderCode",
"PurchaseArrival.Details.Inventory.Code", "PurchaseArrival.Details.Inventory.Code",
"PurchaseArrival.Details.Inventory.Name", "PurchaseArrival.Details.Inventory.Name",

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java
Unescape View File

@ -53,7 +53,6 @@ public class PurchaseOrderSyncJob extends SyncAccountsJobAbstract{
@Override @Override
protected List<String> getQueryFields() { protected List<String> getQueryFields() {
return Arrays.asList( return Arrays.asList(
"PurchaseOrder.ID",
"PurchaseOrder.VoucherDate", "PurchaseOrder.VoucherDate",
"PurchaseOrder.Code", "PurchaseOrder.Code",
"PurchaseOrder.Partner.Name", "PurchaseOrder.Partner.Name",

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java
Unescape View File

@ -69,7 +69,6 @@ public class SaleDeliverySyncJob extends SyncAccountsJobAbstract {
@Override @Override
protected List<String> getQueryFields() { protected List<String> getQueryFields() {
return Arrays.asList( return Arrays.asList(
"SaleDelivery.ID",
"SaleDelivery.Code", "SaleDelivery.Code",
"SaleDelivery.Customer.Name", "SaleDelivery.Customer.Name",
"SaleDelivery.BusinessType.Name", "SaleDelivery.BusinessType.Name",

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java
Unescape View File

@ -60,7 +60,6 @@ public class SaleDispatchSyncJob extends SyncAccountsJobAbstract{
@Override @Override
protected List<String> getQueryFields() { protected List<String> getQueryFields() {
return Arrays.asList( return Arrays.asList(
"RDRecord.Id",
"RDRecord.RDRecordDetails.SourceVoucherCode", "RDRecord.RDRecordDetails.SourceVoucherCode",
"RDRecord.VoucherDate", "RDRecord.VoucherDate",
"RDRecord.Code", "RDRecord.Code",

1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java
Unescape View File

@ -67,7 +67,6 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{
@Override @Override
protected List<String> getQueryFields() { protected List<String> getQueryFields() {
return Arrays.asList( return Arrays.asList(
"SaleOrder.ID",
"SaleOrder.voucherdate", "SaleOrder.voucherdate",
"SaleOrder.code", "SaleOrder.code",
"SaleOrder.createdtime", "SaleOrder.createdtime",

70
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
Unescape View File

@ -15,7 +15,6 @@ import com.ruoyi.flyingbook.domain.LarkCompanyRelation;
import com.ruoyi.flyingbook.domain.LarkTableRelation; import com.ruoyi.flyingbook.domain.LarkTableRelation;
import com.ruoyi.flyingbook.domain.lark.LarkTableRequest; import com.ruoyi.flyingbook.domain.lark.LarkTableRequest;
import com.ruoyi.flyingbook.mapper.ErpLarkRelationMainMapper; import com.ruoyi.flyingbook.mapper.ErpLarkRelationMainMapper;
import com.ruoyi.flyingbook.mapper.ErpLarkRelationMapper;
import com.ruoyi.flyingbook.mapper.LarkCompanyRelationMapper; import com.ruoyi.flyingbook.mapper.LarkCompanyRelationMapper;
import com.ruoyi.flyingbook.mapper.LarkTableRelationMapper; import com.ruoyi.flyingbook.mapper.LarkTableRelationMapper;
import com.ruoyi.quartz.domain.*; import com.ruoyi.quartz.domain.*;
@ -49,7 +48,7 @@ public abstract class SyncAccountsJobAbstract {
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Autowired @Autowired
protected ErpLarkRelationMapper erpLarkRelationMapper; protected ErpLarkRelationMainMapper erpLarkRelationMapper;
@Autowired @Autowired
private LarkCompanyRelationMapper larkCompanyRelationMapper; private LarkCompanyRelationMapper larkCompanyRelationMapper;
@Autowired @Autowired
@ -93,26 +92,25 @@ public abstract class SyncAccountsJobAbstract {
private static final String REQUEST_GENERATE_TOKEN_PATH = REQUEST_ROOT_PATH + "/v1/common/auth/selfBuiltApp/generateToken"; private static final String REQUEST_GENERATE_TOKEN_PATH = REQUEST_ROOT_PATH + "/v1/common/auth/selfBuiltApp/generateToken";
private Boolean asynchronousCheck(LocalDateTime now, String cjt) { private Boolean asynchronousCheck(LocalDateTime now, String cjt) {
int hour = now.getHour();
if ((hour == 1 && CjtAccountEnum.ONE.getCode().equals(cjt))
|| (hour == 3 && CjtAccountEnum.TWO.getCode().equals(cjt))) {
//目前只给畅捷通账号二加工单开补偿
// if ((AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode())
// && CjtAccountEnum.TWO.getCode().equals(cjt)) || (AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode())
// && CjtAccountEnum.ONE.getCode().equals(cjt))) {
String asynchronous = getAsynchronousKey(cjt);
Object cacheObject = redisCache.getCacheObject(asynchronous);
if (cacheObject != null) {
return Boolean.FALSE;
}
redisCache.setCacheObject(asynchronous, asynchronous, 2, TimeUnit.HOURS);
return Boolean.TRUE;
// } else {
// return false;
// }
}
return false; return false;
// int hour = now.getHour();
// if ((hour == 1 && CjtAccountEnum.ONE.getCode().equals(cjt))
// || (hour == 3 && CjtAccountEnum.TWO.getCode().equals(cjt))) {
// //目前只给畅捷通账号二加工单开补偿
//// if ((AppType.SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode())
//// && CjtAccountEnum.TWO.getCode().equals(cjt)) || (AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.getCode().equals(syncLarkAppType().getCode())
//// && CjtAccountEnum.ONE.getCode().equals(cjt))) {
// String asynchronous = getAsynchronousKey(cjt);
// Object cacheObject = redisCache.getCacheObject(asynchronous);
// if (cacheObject != null) {
// return Boolean.FALSE;
// }
// redisCache.setCacheObject(asynchronous, asynchronous, 2, TimeUnit.HOURS);
// return Boolean.TRUE;
//// } else {
//// return false;
//// }
// }
// return false;
} }
private String getAsynchronousKey(String cjt) { private String getAsynchronousKey(String cjt) {
@ -368,6 +366,7 @@ public abstract class SyncAccountsJobAbstract {
List<List<String>> rows = new ArrayList<>(); List<List<String>> rows = new ArrayList<>();
do { do {
try { try {
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
//初始化数据 //初始化数据
if (cjtRequestBody == null) { if (cjtRequestBody == null) {
cjtRequestBody = new CJTRequestBody(page, PAGE_SIZE, getQueryFields(), getQueryCondition(context)); cjtRequestBody = new CJTRequestBody(page, PAGE_SIZE, getQueryFields(), getQueryCondition(context));
@ -391,6 +390,7 @@ public abstract class SyncAccountsJobAbstract {
throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey)); throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey));
} }
} }
dataSourceTransactionManager.commit(transactionStatus);
} catch (Exception e) { } catch (Exception e) {
log.error("{} exception", this.getClassName(), e); log.error("{} exception", this.getClassName(), e);
errorMessage = buildErrorBody(cjtRequest, e.getMessage()); errorMessage = buildErrorBody(cjtRequest, e.getMessage());
@ -415,7 +415,7 @@ public abstract class SyncAccountsJobAbstract {
midList.add(row.get(i)); midList.add(row.get(i));
} }
} }
String uniqueKey = String.join("_", midList).toUpperCase(); String uniqueKey = String.join("_", midList).toUpperCase() + "_" + addRecordRequest.getAppTable();
result.add(uniqueKey); result.add(uniqueKey);
} }
} }
@ -433,8 +433,7 @@ public abstract class SyncAccountsJobAbstract {
if (CollectionUtils.isEmpty(uniqueKeyList)) { if (CollectionUtils.isEmpty(uniqueKeyList)) {
return new HashMap<>(); return new HashMap<>();
} }
//todo yxy 这里记得加上表id return erpLarkRelationMapper.queryListByKeyListAndRemark(uniqueKeyList, getRequestUrl(), cjt)
return erpLarkRelationMapper.queryListByKeyListAndRemark(uniqueKeyList, getRequestUrl(), cjt,addRecordRequest.getAppTable())
.stream().collect(Collectors.toMap(ErpLarkRelation::getKey, ErpLarkRelation::getLarkKey, (k1, k2) -> k1)); .stream().collect(Collectors.toMap(ErpLarkRelation::getKey, ErpLarkRelation::getLarkKey, (k1, k2) -> k1));
} }
@ -475,7 +474,6 @@ public abstract class SyncAccountsJobAbstract {
createTimeKey = "createdtime"; createTimeKey = "createdtime";
} }
String createTime = null; String createTime = null;
String voucherId = null;
for (List<String> row : rows) { for (List<String> row : rows) {
String uniqueKey = null; String uniqueKey = null;
try { try {
@ -484,28 +482,20 @@ public abstract class SyncAccountsJobAbstract {
for (int i = 0; i < row.size(); i++) { for (int i = 0; i < row.size(); i++) {
String rowKey = keyList.get(i); String rowKey = keyList.get(i);
String value = row.get(i); String value = row.get(i);
String lowerCaseRowKey = rowKey.toLowerCase(); if (createTimeKey.equals(rowKey.toLowerCase())){
if (createTimeKey.equals(lowerCaseRowKey)){
createTime = value; createTime = value;
} }
if ("id".equals(lowerCaseRowKey)){
voucherId = value;
}
CJTSyncTypeRelation cjtSyncTypeRelation = queryFieldsMap.get(rowKey);
if (uniqueFields.contains(rowKey)) { if (uniqueFields.contains(rowKey)) {
if (cjtSyncTypeRelation != null && TableFieldTypeEnum.NUMBER.equals(cjtSyncTypeRelation.getType())){ uniqueKeyList.add(value);
uniqueKeyList.add(Double.valueOf(value) + "0");
}else {
uniqueKeyList.add(value);
}
} }
CJTSyncTypeRelation cjtSyncTypeRelation = queryFieldsMap.get(rowKey);
if (cjtSyncTypeRelation == null) { if (cjtSyncTypeRelation == null) {
continue; continue;
} }
String larkLabel = cjtSyncTypeRelation.getLarkFileName(); String larkLabel = cjtSyncTypeRelation.getLarkFileName();
body.put(larkLabel, this.changeValueType(value, cjtSyncTypeRelation)); body.put(larkLabel, this.changeValueType(value, cjtSyncTypeRelation));
} }
uniqueKey = String.join("_", uniqueKeyList).toUpperCase(); uniqueKey = String.join("_", uniqueKeyList).toUpperCase() + "_" + addRecordRequest.getAppTable();
Boolean existFlag = redisCache.setCacheObjectIfAbsent("CJT_JOB_CACHE:"+uniqueKey, "1", 2L, TimeUnit.HOURS); Boolean existFlag = redisCache.setCacheObjectIfAbsent("CJT_JOB_CACHE:"+uniqueKey, "1", 2L, TimeUnit.HOURS);
if (repeatMap.containsKey(uniqueKey) || !existFlag) { if (repeatMap.containsKey(uniqueKey) || !existFlag) {
continue; continue;
@ -517,7 +507,7 @@ public abstract class SyncAccountsJobAbstract {
//在飞书创建一行，并根据创建返回的行id在本地保留一条映射纪律 //在飞书创建一行，并根据创建返回的行id在本地保留一条映射纪律
CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(addRecordRequest); CreateAppTableRecordRespBody respBody = larkTableHelper.addTableRecord(addRecordRequest);
larkKey = respBody.getRecord().getRecordId(); larkKey = respBody.getRecord().getRecordId();
relationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjt, asynchronous,createTime,voucherId,addRecordRequest.getAppTable())); relationList.add(buildErpLarkRelation(uniqueKey, larkKey, cjt, asynchronous,createTime));
} else { } else {
if (!AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.equals(syncLarkAppType())) { if (!AppType.SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE.equals(syncLarkAppType())) {
//根据本地保留映射，确认飞书的更新行，更新后防止影响后续更新，需要将行id进行置空 //根据本地保留映射，确认飞书的更新行，更新后防止影响后续更新，需要将行id进行置空
@ -552,11 +542,9 @@ public abstract class SyncAccountsJobAbstract {
} }
//构建飞书行与cjt唯一键的对应关系对象 //构建飞书行与cjt唯一键的对应关系对象
private ErpLarkRelation buildErpLarkRelation(String key, String larkKey, String cjt, Boolean asynchronous,String createTime,String voucherID,String tableId) { private ErpLarkRelation buildErpLarkRelation(String key, String larkKey, String cjt, Boolean asynchronous,String createTime) {
ErpLarkRelation erpLarkRelation = new ErpLarkRelation(); ErpLarkRelation erpLarkRelation = new ErpLarkRelation();
erpLarkRelation.setKey(key); erpLarkRelation.setKey(key);
erpLarkRelation.setCjtId(voucherID);
erpLarkRelation.setLarkTable(tableId);
erpLarkRelation.setLarkKey(larkKey); erpLarkRelation.setLarkKey(larkKey);
erpLarkRelation.setMethod(getRequestUrl()); erpLarkRelation.setMethod(getRequestUrl());
erpLarkRelation.setFlag(FlagStatus.OK.getCode()); erpLarkRelation.setFlag(FlagStatus.OK.getCode());

Write Preview
Loading…
Cancel
Save