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

畅捷通报表
continuous-integration/drone/push Build is passing Details

Browse Source
畅捷通报表
YXY 1 year ago
parent 4b74756d9c
commit 75dd0d70e1
5 changed files with 114 additions and 55 deletions
Show Stats Download Patch File Download Diff File

6
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkTempRelationMapper.java
Unescape View File

@ -62,9 +62,11 @@ public interface ErpLarkTempRelationMapper
*/
public int deleteErpLarkTempRelationByIds(Long[] ids);
public int updateByMethod(@Param("method") String method, @Param("flag") Long flag);
public Long selectMaxId(@Param("method") String method, @Param("flag") Long flag,@Param("key") String key);
public int deleteByMethod(@Param("method") String method,@Param("flag") Long flag);
public int updateByMethod(@Param("method") String method, @Param("flag") Long flag,@Param("id") Long id,@Param("key") String key);
public int deleteByMethod(@Param("method") String method,@Param("flag") Long flag,@Param("id") Long id,@Param("key") String key);
public int batchInsert(@Param("erpLarkTempRelationList") List<ErpLarkTempRelation> erpLarkTempRelationList);

115
ruoyi-flyingbook/src/main/resources/mapper/ErpLarkTempRelationMapper.xml
Unescape View File

@ -1,42 +1,55 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.flyingbook.mapper.ErpLarkTempRelationMapper">
<resultMap type="com.ruoyi.flyingbook.domain.ErpLarkTempRelation" id="ErpLarkTempRelationResult">
<result property="id" column="id" />
<result property="key" column="key" />
<result property="larkKey" column="lark_key" />
<result property="method" column="method" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="flag" column="flag" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="key" column="key"/>
<result property="larkKey" column="lark_key"/>
<result property="method" column="method"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="flag" column="flag"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectErpLarkTempRelationVo">
select id, key, lark_key, method, create_by, create_time, update_by, update_time, flag, remark from erp_lark_temp_relation
select id,
`key`,
lark_key,
method,
create_by,
create_time,
update_by,
update_time,
flag,
remark
from erp_lark_temp_relation
</sql>
<select id="selectErpLarkTempRelationList" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation" resultMap="ErpLarkTempRelationResult">
<select id="selectErpLarkTempRelationList" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation"
resultMap="ErpLarkTempRelationResult">
<include refid="selectErpLarkTempRelationVo"/>
<where>
<if test="key != null and key != ''"> and key = #{key}</if>
<if test="larkKey != null and larkKey != ''"> and lark_key = #{larkKey}</if>
<if test="method != null and method != ''"> and method = #{method}</if>
<if test="flag != null "> and flag = #{flag}</if>
<where>
<if test="key != null and key != ''">and `key` = #{key}</if>
<if test="larkKey != null and larkKey != ''">and lark_key = #{larkKey}</if>
<if test="method != null and method != ''">and method = #{method}</if>
<if test="flag != null ">and flag = #{flag}</if>
</where>
order by id
</select>
<select id="selectErpLarkTempRelationById" parameterType="Long" resultMap="ErpLarkTempRelationResult">
<include refid="selectErpLarkTempRelationVo"/>
where id = #{id}
</select>
<insert id="insertErpLarkTempRelation" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation" useGeneratedKeys="true" keyProperty="id">
<insert id="insertErpLarkTempRelation" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation"
useGeneratedKeys="true" keyProperty="id">
insert into erp_lark_temp_relation
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="key != null">key,</if>
@ -48,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="flag != null">flag,</if>
<if test="remark != null">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="key != null">#{key},</if>
<if test="larkKey != null">#{larkKey},</if>
@ -59,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="flag != null">#{flag},</if>
<if test="remark != null">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateErpLarkTempRelation" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation">
@ -79,37 +92,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteErpLarkTempRelationById" parameterType="Long">
delete from erp_lark_temp_relation where id = #{id}
delete
from erp_lark_temp_relation
where id = #{id}
</delete>
<delete id="deleteErpLarkTempRelationByIds" parameterType="String">
delete from erp_lark_temp_relation where id in
delete from erp_lark_temp_relation where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectMaxId" parameterType="com.ruoyi.flyingbook.domain.ErpLarkRelation" resultType="java.lang.Long">
select id
from erp_lark_temp_relation
where `method` = #{method} and flag = #{flag} and `key` = #{key}
order by id desc
limit 1
</select>
<update id="updateByMethod" parameterType="com.ruoyi.flyingbook.domain.ErpLarkRelation">
update erp_lark_relation
update erp_lark_temp_relation
set flag = #{flag}
where method = #{method}
where method = #{method} and `key` = #{key}
and #{id} >= id
</update>
<update id="deleteByMethod" parameterType="com.ruoyi.flyingbook.domain.ErpLarkRelation">
delete from erp_lark_relation
where method = #{method} and flag = #{flag}
delete
from erp_lark_temp_relation
where method = #{method}
and flag = #{flag}
and `key` = #{key}
and #{id} >= id
</update>
<insert id="batchInsert" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation" useGeneratedKeys="true" keyProperty="id">
insert into erp_lark_temp_relation(lark_key,`method`,create_by,create_time,flag)
values <foreach collection="erpLarkTempRelationList" item="item" separator=",">
(
#{item.larkKey},
#{item.method},
#{item.createBy},
#{item.createTime},
#{item.flag}
)
</foreach>
<insert id="batchInsert" parameterType="com.ruoyi.flyingbook.domain.ErpLarkTempRelation" useGeneratedKeys="true"
keyProperty="id">
insert into erp_lark_temp_relation(`key`,lark_key,`method`,create_by,create_time,flag)
values
<foreach collection="erpLarkTempRelationList" item="item" separator=",">
(
#{item.key},
#{item.larkKey},
#{item.method},
#{item.createBy},
#{item.createTime},
#{item.flag}
)
</foreach>
</insert>
</mapper>

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/CJTJobContext.java
Unescape View File

@ -50,4 +50,6 @@ public class CJTJobContext implements Serializable {
private LarkCompanyRelation companyRelation;
private LarkTableRelation tableRelation;
private Long erpLarkTempRelationMaxId;
}

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/CJTRequest.java
Unescape View File

@ -39,6 +39,8 @@ public class CJTRequest implements Serializable {
*/
private JSONObject jsonBody;
private String taskSessionId;
/**
* 获取列信息
*/

44
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncReportJob.java
Unescape View File

@ -20,10 +20,11 @@ import com.ruoyi.flyingbook.mapper.LarkCompanyRelationMapper;
import com.ruoyi.flyingbook.mapper.LarkTableRelationMapper;
import com.ruoyi.quartz.domain.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.concurrent.TimeUnit;
@ -37,6 +38,7 @@ import static com.ruoyi.quartz.helper.OkHttpHelper.post;
* @create 2023-07-17 20:29
*/
@Slf4j
@Component("syncReportJob")
public class SyncReportJob {
@Autowired
@ -174,7 +176,7 @@ public class SyncReportJob {
protected void sync(CJTJobContext context) {
List<String> errorMessageList = new ArrayList<>();
JSONObject cjtRequestReport = new JSONObject();
CJTRequestReportBody cjtRequestBody = new CJTRequestReportBody(0, PAGE_SIZE, getReportName(), getQueryFields());
CJTRequestReportBody cjtRequestBody = new CJTRequestReportBody(1, PAGE_SIZE, getReportName(), getQueryFields());
cjtRequestReport.put("request", cjtRequestBody);
CJTRequest cjtRequest = buildCJTRequest(context, cjtRequestReport);
@ -191,6 +193,7 @@ public class SyncReportJob {
log.error("{} exception", this.getClassName(), e);
pageList.add(cjtRequestBody.getPageIndex());
} finally {
cjtRequestBody.setTaskSessionID(cjtRequest.getTaskSessionId());
cjtRequestBody.addPage();
}
} while (flag);
@ -208,11 +211,21 @@ public class SyncReportJob {
}
private void preSync(CJTJobContext context) {
erpLarkTempRelationMapper.updateByMethod(getReportName(), FlagStatus.DELETED.getCode());
CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(context.getCjt());
if (cjtAccountEnum == null){
return;
}
Long maxId = erpLarkTempRelationMapper.selectMaxId(getReportName(), FlagStatus.OK.getCode(),cjtAccountEnum.getAppKey());
context.setErpLarkTempRelationMaxId(maxId);
erpLarkTempRelationMapper.updateByMethod(getReportName(), FlagStatus.DELETED.getCode(),maxId,cjtAccountEnum.getAppKey());
}
private void finish(CJTJobContext context) {
try {
CjtAccountEnum cjtAccountEnum = CjtAccountEnum.getByCode(context.getCjt());
if (cjtAccountEnum == null){
return;
}
LarkCompanyRelation companyRelation = context.getCompanyRelation();
LarkTableRelation tableRelation = context.getTableRelation();
LarkTableRequest request = new LarkTableRequest(companyRelation.getAppId(), companyRelation.getSecret(), tableRelation.getToAppToken(), tableRelation.getToTableId());
@ -233,7 +246,7 @@ public class SyncReportJob {
larkKeyList = new ArrayList<>();
}
}
erpLarkTempRelationMapper.deleteByMethod(getReportName(), FlagStatus.DELETED.getCode());
erpLarkTempRelationMapper.deleteByMethod(getReportName(), FlagStatus.DELETED.getCode(),context.getErpLarkTempRelationMaxId(),cjtAccountEnum.getAppKey());
} catch (Exception e) {
log.info("Sync report job finish error", e);
}
@ -243,6 +256,9 @@ public class SyncReportJob {
cjtRequest.setOpenToken(generateToken(context));
//请求接口并序列化数据
CJTResponseReportBodyDetail bodyDetail = request(cjtRequest);
if (bodyDetail == null){
return Boolean.FALSE;
}
//实际返回数据
List<CJTResponseReportBodyDetailRow> rows = bodyDetail.getRows();
if (CollectionUtils.isNotEmpty(rows)) {
@ -253,15 +269,15 @@ public class SyncReportJob {
throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey));
}
}
return CollectionUtils.isNotEmpty(rows);
return CollectionUtils.isNotEmpty(rows) && StringUtils.isNotBlank(cjtRequest.getTaskSessionId());
}
protected Map<String, Object> buildLarkBody(CJTResponseReportBodyDetailRow rowDetail) {
Map<String, Object> body = new HashMap<>();
body.put("仓库", rowDetail.getWarehouse());
body.put("存货编码", rowDetail.getInventoryCode());
body.put("现存量", rowDetail.getBaseQuantity());
body.put("可用量", rowDetail.getCanuseBaseQuantity());
body.put("现存量", StringUtils.isNotBlank(rowDetail.getBaseQuantity()) ? Double.valueOf(rowDetail.getBaseQuantity()) : 0D);
body.put("可用量", StringUtils.isNotBlank(rowDetail.getCanuseBaseQuantity()) ? Double.valueOf(rowDetail.getCanuseBaseQuantity()) : 0D);
return body;
}
@ -286,7 +302,7 @@ public class SyncReportJob {
//在飞书创建一行，并根据创建返回的行id在本地保留一条映射纪律
BatchCreateAppTableRecordRespBody resp = larkTableHelper.addTableRecordBatch(addRecordRequest);
for (AppTableRecord record : resp.getRecords()) {
buildTempList(waitCreateList,record.getRecordId());
buildTempList(waitCreateList,record.getRecordId(),cjt);
}
if (CollectionUtils.isNotEmpty(waitCreateList)){
erpLarkTempRelationMapper.batchInsert(waitCreateList);
@ -298,13 +314,18 @@ public class SyncReportJob {
return errorKey;
}
private void buildTempList(List<ErpLarkTempRelation> waitCreateList,String recordId){
private void buildTempList(List<ErpLarkTempRelation> waitCreateList,String recordId, String cjt){
CjtAccountEnum byCode = CjtAccountEnum.getByCode(cjt);
if (byCode == null){
return;
}
ErpLarkTempRelation erpLarkTempRelation = new ErpLarkTempRelation();
erpLarkTempRelation.setCreateTime(new Date());
erpLarkTempRelation.setCreateBy("System");
erpLarkTempRelation.setMethod(getReportName());
erpLarkTempRelation.setFlag(FlagStatus.OK.getCode());
erpLarkTempRelation.setLarkKey(recordId);
erpLarkTempRelation.setKey(byCode.getAppKey());
waitCreateList.add(erpLarkTempRelation);
}
@ -401,10 +422,11 @@ public class SyncReportJob {
protected CJTResponseReportBodyDetail request(CJTRequest req) {
String post = post(req);
CJTResponseReportBody responseBody = JSONObject.parseObject(post, CJTResponseReportBody.class);
if (!"0".equals(responseBody.getStatus())) {
if (responseBody.getStatus() != 0) {
log.error("{} exception", this.getClassName(), responseBody.getErrorMessage());
throw new RuntimeException(buildErrorBody(req, Arrays.asList(responseBody.getErrorMessage())));
}
req.setTaskSessionId(responseBody.getTaskSessionID());
return responseBody.getDataSource();
}

Write Preview
Loading…
Cancel
Save