Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
85f16935
提交
85f16935
authored
8月 02, 2024
作者:
李瑞鑫
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
拉取电子磅单数据
上级
dcb76875
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
314 行增加
和
0 行删除
+314
-0
OrderChildImageEnum.java
...n/java/com/clx/performance/enums/OrderChildImageEnum.java
+39
-0
pom.xml
performance-web/pom.xml
+10
-0
OrderChildDao.java
.../src/main/java/com/clx/performance/dao/OrderChildDao.java
+2
-0
OrderChildWeighPictureDao.java
...va/com/clx/performance/dao/OrderChildWeighPictureDao.java
+14
-0
OrderChildDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
+7
-0
OrderChildWeighPictureDaoImpl.java
...x/performance/dao/impl/OrderChildWeighPictureDaoImpl.java
+16
-0
WeighingOderPictureJob.java
.../java/com/clx/performance/job/WeighingOderPictureJob.java
+116
-0
OrderChildWeighPictureMapper.java
.../clx/performance/mapper/OrderChildWeighPictureMapper.java
+12
-0
OrderChildWeighPicture.java
...ava/com/clx/performance/model/OrderChildWeighPicture.java
+62
-0
OrderChildWeighPictureService.java
...lx/performance/service/OrderChildWeighPictureService.java
+9
-0
OrderChildWeighPictureServiceImpl.java
...mance/service/impl/OrderChildWeighPictureServiceImpl.java
+13
-0
OrderChildWeighPictureStruct.java
.../clx/performance/struct/OrderChildWeighPictureStruct.java
+14
-0
没有找到文件。
performance-api/src/main/java/com/clx/performance/enums/OrderChildImageEnum.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
java.util.Arrays
;
import
java.util.Optional
;
public
enum
OrderChildImageEnum
{
;
@Getter
@AllArgsConstructor
public
enum
Type
{
LOAD
(
1
,
"装车图片"
),
UNLOAD
(
2
,
"卸车图片"
),
WEIGHT_IN
(
3
,
"进场图片"
),
WEIGHT_OUT
(
4
,
"出场图片"
),
;
private
final
Integer
code
;
private
final
String
name
;
public
static
Optional
<
Type
>
getByCode
(
Integer
code
)
{
return
Arrays
.
stream
(
values
()).
filter
(
e
->
e
.
code
.
equals
(
code
)).
findFirst
();
}
public
static
String
getMsgByCode
(
int
code
)
{
return
getByCode
(
code
).
map
(
Type:
:
getName
).
orElse
(
null
);
}
}
}
performance-web/pom.xml
浏览文件 @
85f16935
...
@@ -93,6 +93,16 @@
...
@@ -93,6 +93,16 @@
<artifactId>
server-spring-boot-starter
</artifactId>
<artifactId>
server-spring-boot-starter
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
com.msl
</groupId>
<artifactId>
open-starter
</artifactId>
</dependency>
<dependency>
<groupId>
com.smart
</groupId>
<artifactId>
smart-weight-sdk
</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.msl</groupId>-->
<!-- <groupId>com.msl</groupId>-->
<!-- <artifactId>cache-spring-boot-starter</artifactId>-->
<!-- <artifactId>cache-spring-boot-starter</artifactId>-->
...
...
performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @
85f16935
...
@@ -204,4 +204,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
...
@@ -204,4 +204,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
List
<
OrderChild
>
listCompleteByOrderNos
(
List
<
String
>
strings
);
List
<
OrderChild
>
listCompleteByOrderNos
(
List
<
String
>
strings
);
List
<
OrderChild
>
listBeforeUnloadOrderChild
(
LocalDateTime
startTime
,
LocalDateTime
endTime
);
List
<
OrderChild
>
listBeforeUnloadOrderChild
(
LocalDateTime
startTime
,
LocalDateTime
endTime
);
List
<
OrderChild
>
listChidNosByStatus
(
List
<
Integer
>
status
);
}
}
performance-web/src/main/java/com/clx/performance/dao/OrderChildWeighPictureDao.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
dao
;
import
com.clx.performance.mapper.OrderChildWeighPictureMapper
;
import
com.clx.performance.model.OrderChildWeighPicture
;
import
com.msl.common.dao.BaseDao
;
/**
* @author liruixin
* Date 2024-08-02
* Time 15:38
*/
public
interface
OrderChildWeighPictureDao
extends
BaseDao
<
OrderChildWeighPictureMapper
,
OrderChildWeighPicture
,
Integer
>
{
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @
85f16935
...
@@ -684,4 +684,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
...
@@ -684,4 +684,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
.
le
(
OrderChild
::
getCreateTime
,
endTime
)
.
le
(
OrderChild
::
getCreateTime
,
endTime
)
);
);
}
}
@Override
public
List
<
OrderChild
>
listChidNosByStatus
(
List
<
Integer
>
status
)
{
return
list
(
lQrWrapper
()
.
in
(
OrderChild
::
getStatus
,
status
)
);
}
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildWeighPictureDaoImpl.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
dao
.
impl
;
import
com.clx.performance.dao.OrderChildWeighPictureDao
;
import
com.clx.performance.mapper.OrderChildWeighPictureMapper
;
import
com.clx.performance.model.OrderChildWeighPicture
;
import
com.msl.common.dao.impl.BaseDaoImpl
;
import
org.springframework.stereotype.Repository
;
/**
* @author liruixin
* Date 2024-08-02
* Time 15:38
*/
@Repository
public
class
OrderChildWeighPictureDaoImpl
extends
BaseDaoImpl
<
OrderChildWeighPictureMapper
,
OrderChildWeighPicture
,
Integer
>
implements
OrderChildWeighPictureDao
{
}
performance-web/src/main/java/com/clx/performance/job/WeighingOderPictureJob.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
job
;
import
com.clx.open.sdk.callback.OpenCallBackClient
;
import
com.clx.order.enums.SyncPlatformEnum
;
import
com.clx.performance.config.ThirdAppConfig
;
import
com.clx.performance.dao.OrderChildDao
;
import
com.clx.performance.dao.OrderChildWeighPictureDao
;
import
com.clx.performance.enums.OrderChildEnum
;
import
com.clx.performance.model.OrderChild
;
import
com.clx.performance.model.OrderChildWeighPicture
;
import
com.clx.performance.struct.OrderChildWeighPictureStruct
;
import
com.msl.common.job.JobLog
;
import
com.msl.common.open.OpenClient
;
import
com.msl.common.open.RequestConfig
;
import
com.msl.common.result.Result
;
import
com.smart.weight.action.WeighingSignatureAction
;
import
com.smart.weight.dto.WeighingSignatureDto
;
import
com.xxl.job.core.handler.annotation.XxlJob
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.exception.ExceptionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Slf4j
@Component
public
class
WeighingOderPictureJob
{
@Autowired
private
ThirdAppConfig
thirdAppConfig
;
@Autowired
private
OrderChildDao
orderChildDao
;
@Autowired
private
OrderChildWeighPictureStruct
pictureStruct
;
@Autowired
private
OrderChildWeighPictureDao
pictureDao
;
/**
* 定时拉取过磅磅单图片
*/
@XxlJob
(
"weighingOderPicture"
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
weighingOderPicture
()
{
try
{
getWeighingOderPicture
();
}
catch
(
Exception
e
)
{
log
.
warn
(
"定时任务获取磅单图片信息失败,异常原因:{}"
,
ExceptionUtils
.
getStackTrace
(
e
));
JobLog
.
error
(
"定时任务获取磅单图片信息失败,异常原因====================="
,
e
);
}
}
/**
* 定时拉取过磅磅单图片
**/
public
void
getWeighingOderPicture
(){
//运单状态集合
List
<
Integer
>
status
=
new
ArrayList
<>();
status
.
add
(
OrderChildEnum
.
Status
.
UNLOAD
.
getCode
());
status
.
add
(
OrderChildEnum
.
Status
.
UNSETTLE
.
getCode
());
//查询指定运单数据
List
<
OrderChild
>
orderChilds
=
orderChildDao
.
listChidNosByStatus
(
status
);
log
.
info
(
"查询运单数据返回:{}"
,
orderChilds
);
//查询运单下的电子磅单数据
if
(
CollectionUtils
.
isNotEmpty
(
orderChilds
)){
//获取配置信息
OpenCallBackClient
openCallBackClient
=
thirdAppConfig
.
getOpenCallBackClient
(
SyncPlatformEnum
.
Source
.
NEW_OWNER_CLIENT
.
getCode
().
toString
());
//组装配置信息
RequestConfig
config
=
new
RequestConfig
()
.
setAppId
(
openCallBackClient
.
getAppNo
())
.
setAppKey
(
openCallBackClient
.
getSecret
())
.
setGatewayUrl
(
openCallBackClient
.
getUrl
());
//集合对象
List
<
OrderChildWeighPicture
>
pictures
=
new
ArrayList
<>();
for
(
OrderChild
orderChild:
orderChilds
){
//通过运单号码查询电子磅单图片
WeighingSignatureAction
weightAction
=
new
WeighingSignatureAction
();
weightAction
.
setChildNo
(
orderChild
.
getChildNo
());
Result
<
List
<
WeighingSignatureDto
>>
weighSignature
=
OpenClient
.
doAction
(
config
,
weightAction
);
//数据处理
if
(
weighSignature
.
succeed
()){
List
<
WeighingSignatureDto
>
weighSignatures
=
weighSignature
.
getData
();
if
(
CollectionUtils
.
isNotEmpty
(
weighSignatures
))
{
for
(
WeighingSignatureDto
weighingSignatureDto:
weighSignatures
){
pictures
.
add
(
pictureStruct
.
convert
(
weighingSignatureDto
));
//对象转换
}
}
}
//保存电子磅单图片
if
(
CollectionUtils
.
isNotEmpty
(
pictures
)){
List
<
String
>
childNos
=
pictures
.
stream
().
map
(
OrderChildWeighPicture:
:
getChildNo
).
distinct
().
collect
(
Collectors
.
toList
());
pictureDao
.
deleteInField
(
OrderChildWeighPicture:
:
getChildNo
,
childNos
);
pictureDao
.
saveBatchList
(
pictures
);
}
}
}
}
}
performance-web/src/main/java/com/clx/performance/mapper/OrderChildWeighPictureMapper.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.clx.performance.model.OrderChildWeighPicture
;
/**
* @author liruixin
* Date 2024-08-02
* Time 15:38
*/
public
interface
OrderChildWeighPictureMapper
extends
BaseMapper
<
OrderChildWeighPicture
>
{
}
performance-web/src/main/java/com/clx/performance/model/OrderChildWeighPicture.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
model
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.msl.common.config.KeyColumn
;
import
com.msl.common.model.HasKey
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.experimental.Accessors
;
import
java.time.LocalDateTime
;
/**
* @author liruixin
* Date 2024-08-02
* Time 15:38
*/
@Getter
@Setter
@Accessors
(
chain
=
true
)
@TableName
(
"order_child_weigh_picture"
)
public
class
OrderChildWeighPicture
implements
HasKey
<
Integer
>
{
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
@TableField
(
"child_no"
)
@ApiModelProperty
(
"运单编号"
)
private
String
childNo
;
@TableField
(
"type"
)
@ApiModelProperty
(
"图片类型 1进场 2出场"
)
private
Integer
type
;
@TableField
(
"original_img"
)
@ApiModelProperty
(
"原始磅单图"
)
private
String
originalImg
;
@TableField
(
"no_sign_img"
)
@ApiModelProperty
(
"不带签章磅单图"
)
private
String
noSignImg
;
@TableField
(
"sign_img"
)
@ApiModelProperty
(
"带签章磅单图"
)
private
String
signImg
;
@TableField
(
"create_time"
)
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
@TableField
(
"modified_time"
)
@ApiModelProperty
(
"修改时间"
)
private
LocalDateTime
modifiedTime
;
@KeyColumn
(
"id"
)
public
Integer
gainKey
()
{
return
this
.
id
;
}
}
performance-web/src/main/java/com/clx/performance/service/OrderChildWeighPictureService.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
service
;
/**
* @author liruixin
* Date 2024-08-02
* Time 15:38
*/
public
interface
OrderChildWeighPictureService
{
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildWeighPictureServiceImpl.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
service
.
impl
;
import
com.clx.performance.service.OrderChildWeighPictureService
;
import
org.springframework.stereotype.Service
;
/**
* @author liruixin
* Date 2024-08-02
* Time 15:38
*/
@Service
public
class
OrderChildWeighPictureServiceImpl
implements
OrderChildWeighPictureService
{
}
performance-web/src/main/java/com/clx/performance/struct/OrderChildWeighPictureStruct.java
0 → 100644
浏览文件 @
85f16935
package
com
.
clx
.
performance
.
struct
;
import
com.clx.performance.model.OrderChildWeighPicture
;
import
com.msl.common.utils.DateStructUtil
;
import
com.msl.common.utils.DateUtils
;
import
com.smart.weight.dto.WeighingSignatureDto
;
import
org.mapstruct.Mapper
;
@Mapper
(
componentModel
=
"spring"
,
uses
=
DateStructUtil
.
class
,
imports
=
{
DateUtils
.
class
})
public
interface
OrderChildWeighPictureStruct
{
OrderChildWeighPicture
convert
(
WeighingSignatureDto
item
);
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论