Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jyzb_platformV2
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
赵剑炜
jyzb_platformV2
Commits
a4aef99f
Commit
a4aef99f
authored
Mar 06, 2024
by
李小惠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
73e7636e
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
168 行增加
和
6 行删除
+168
-6
log_error.log
app-log/log_error.log
+90
-0
log_total.log
app-log/log_total.log
+0
-0
QuerySupplierReq.java
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QuerySupplierReq.java
+3
-0
UpdateWarehouseDevReq.java
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseDevReq.java
+7
-1
ConfigExceptionEnum.java
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ConfigExceptionEnum.java
+27
-0
DeviceConfigController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
+1
-1
BusFormServiceImpl.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
+2
-0
OrderMainServiceImpl.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
+1
-2
PolicemanServiceImpl.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
+20
-0
SupplierServiceImpl.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
+9
-1
WarehouseDevServiceImpl.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseDevServiceImpl.java
+7
-0
application-prod.yml
jyzb-boot/src/main/resources/application-prod.yml
+1
-1
没有找到文件。
app-log/log_error.log
View file @
a4aef99f
...
...
@@ -2285,3 +2285,93 @@ java.io.IOException: 远程主机强迫关闭了一个现有的连接。
2024-03-06 16:18:46.454 ERROR 15204 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 16:18:55.896 ERROR 15204 --- [http-nio-10030-exec-9] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 16:36:45.932 ERROR 15204 --- [http-nio-10030-exec-4] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 16:41:28.718 ERROR 15456 --- [main] easy-es : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
2024-03-06 16:41:40.183 ERROR 15456 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 16:54:07.470 ERROR 15456 --- [http-nio-10030-exec-5] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 16:54:27.690 ERROR 15456 --- [http-nio-10030-exec-4] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 16:54:27.752 ERROR 15456 --- [http-nio-10030-exec-9] c.j.j.b.c.handle.GlobalExceptionHandler : 业务异常,错误信息为:该警员已经在审核流中或已经调岗完成,请勿重复操作
2024-03-06 16:54:33.401 ERROR 15456 --- [http-nio-10030-exec-3] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 16:54:33.461 ERROR 15456 --- [http-nio-10030-exec-2] c.j.j.b.c.handle.GlobalExceptionHandler : 业务异常,错误信息为:该警员已经在审核流中或已经调岗完成,请勿重复操作
2024-03-06 16:54:40.858 ERROR 15456 --- [http-nio-10030-exec-10] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 16:54:40.919 ERROR 15456 --- [http-nio-10030-exec-5] c.j.j.b.c.handle.GlobalExceptionHandler : 业务异常,错误信息为:该警员已经在审核流中或已经调岗完成,请勿重复操作
2024-03-06 16:54:47.758 ERROR 15456 --- [http-nio-10030-exec-1] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 17:00:24.282 ERROR 15456 --- [http-nio-10030-exec-3] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 17:00:54.311 ERROR 15456 --- [TTW-6-3] c.j.i.server.handle.BizProtocolHandler : 协议异常(WebSocket(Server)) - 客户端编号: 192.168.3.66 - 错误信息: 远程主机强迫关闭了一个现有的连接。 - 处理方式:创建监听器[ExceptionEventListener]监听异常事件(ExceptionEvent)
java.io.IOException: 远程主机强迫关闭了一个现有的连接。
at sun.nio.ch.SocketDispatcher.read0(Native Method)
at sun.nio.ch.SocketDispatcher.read(SocketDispatcher.java:43)
at sun.nio.ch.IOUtil.readIntoNativeBuffer(IOUtil.java:223)
at sun.nio.ch.IOUtil.read(IOUtil.java:192)
at sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:378)
at io.netty.buffer.PooledByteBuf.setBytes(PooledByteBuf.java:258)
at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1132)
at io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:350)
at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:151)
at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:722)
at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:658)
at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:584)
at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:496)
at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986)
at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74)
at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30)
at java.lang.Thread.run(Thread.java:748)
2024-03-06 17:01:55.370 ERROR 15456 --- [TTW-6-4] c.j.i.server.handle.BizProtocolHandler : 协议异常(WebSocket(Server)) - 客户端编号: null - 错误信息: 远程主机强迫关闭了一个现有的连接。 - 处理方式:创建监听器[ExceptionEventListener]监听异常事件(ExceptionEvent)
java.io.IOException: 远程主机强迫关闭了一个现有的连接。
at sun.nio.ch.SocketDispatcher.read0(Native Method)
at sun.nio.ch.SocketDispatcher.read(SocketDispatcher.java:43)
at sun.nio.ch.IOUtil.readIntoNativeBuffer(IOUtil.java:223)
at sun.nio.ch.IOUtil.read(IOUtil.java:192)
at sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:378)
at io.netty.buffer.PooledByteBuf.setBytes(PooledByteBuf.java:258)
at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1132)
at io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:350)
at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:151)
at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:722)
at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:658)
at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:584)
at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:496)
at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986)
at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74)
at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30)
at java.lang.Thread.run(Thread.java:748)
2024-03-06 17:09:44.092 ERROR 16768 --- [main] easy-es : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
2024-03-06 17:09:56.846 ERROR 16768 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 17:10:31.346 ERROR 16768 --- [http-nio-10030-exec-3] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 17:14:35.352 ERROR 16768 --- [http-nio-10030-exec-4] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 17:23:46.115 ERROR 16768 --- [TTW-6-1] c.j.i.server.handle.BizProtocolHandler : 协议异常(WebSocket(Server)) - 客户端编号: 192.168.3.66 - 错误信息: 远程主机强迫关闭了一个现有的连接。 - 处理方式:创建监听器[ExceptionEventListener]监听异常事件(ExceptionEvent)
java.io.IOException: 远程主机强迫关闭了一个现有的连接。
at sun.nio.ch.SocketDispatcher.read0(Native Method)
at sun.nio.ch.SocketDispatcher.read(SocketDispatcher.java:43)
at sun.nio.ch.IOUtil.readIntoNativeBuffer(IOUtil.java:223)
at sun.nio.ch.IOUtil.read(IOUtil.java:192)
at sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:378)
at io.netty.buffer.PooledByteBuf.setBytes(PooledByteBuf.java:258)
at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1132)
at io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:350)
at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:151)
at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:722)
at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:658)
at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:584)
at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:496)
at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986)
at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74)
at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30)
at java.lang.Thread.run(Thread.java:748)
2024-03-06 18:31:15.297 ERROR 16768 --- [http-nio-10030-exec-4] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 18:32:32.773 ERROR 16768 --- [http-nio-10030-exec-4] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败,请检查header和param中是否传递了用户token
2024-03-06 18:33:43.011 ERROR 16768 --- [http-nio-10030-exec-9] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 18:35:44.092 ERROR 16768 --- [http-nio-10030-exec-9] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 18:43:51.367 ERROR 16768 --- [http-nio-10030-exec-10] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 18:45:33.912 ERROR 16768 --- [http-nio-10030-exec-5] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 18:50:44.231 ERROR 16768 --- [http-nio-10030-exec-8] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 18:52:58.251 ERROR 16768 --- [http-nio-10030-exec-6] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 18:55:27.066 ERROR 16768 --- [http-nio-10030-exec-8] c.j.j.b.c.handle.GlobalExceptionHandler : 业务异常,错误信息为:yw330282000000 用户不存在
2024-03-06 18:55:33.914 ERROR 16768 --- [http-nio-10030-exec-6] c.j.j.b.c.handle.GlobalExceptionHandler : 业务异常,错误信息为:yw330283000000 用户不存在
2024-03-06 21:51:45.890 ERROR 16768 --- [http-nio-10030-exec-2] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
2024-03-06 21:54:36.040 ERROR 16768 --- [http-nio-10030-exec-7] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
app-log/log_total.log
View file @
a4aef99f
This source diff could not be displayed because it is too large. You can
view the blob
instead.
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QuerySupplierReq.java
View file @
a4aef99f
...
...
@@ -29,4 +29,7 @@ public class QuerySupplierReq extends BaseRequest {
//判断是否需要全部的厂商商信息还是只需要名字去重的厂商名称,如果是去重的,这里给true
private
Boolean
flag
;
private
String
Column
;
private
String
order
;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseDevReq.java
View file @
a4aef99f
...
...
@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.req;
import
com.junmp.v2.common.bean.request.ValidationApi
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.util.Date
;
...
...
@@ -14,26 +15,30 @@ public class UpdateWarehouseDevReq {
/**
* 仓库id
*/
@NotBlank
(
message
=
"仓库不能为空"
,
groups
=
{
ValidationApi
.
add
.
class
})
private
String
warehouseId
;
/**
* 组织机构id
*/
@NotNull
(
message
=
"组织机构id不能为空"
,
groups
=
{
ValidationApi
.
list
.
class
})
@NotNull
(
message
=
"组织机构id不能为空"
,
groups
=
{
ValidationApi
.
list
.
class
,
ValidationApi
.
add
.
class
})
private
Long
orgId
;
/**
* Ip地址
*/
@NotBlank
(
message
=
"ip地址不能为空"
,
groups
=
{
ValidationApi
.
add
.
class
})
private
String
devIp
;
/**
* 端口
*/
@NotBlank
(
message
=
"端口不能为空"
,
groups
=
{
ValidationApi
.
add
.
class
})
private
String
devPort
;
/**
* 名称
*/
@NotBlank
(
message
=
"设备名称不能为空"
,
groups
=
{
ValidationApi
.
add
.
class
})
private
String
devName
;
/**
...
...
@@ -80,6 +85,7 @@ public class UpdateWarehouseDevReq {
private
Boolean
flag
;
//设备类型(0除湿机,1温湿度计)
@NotNull
(
message
=
"设备类型不能为空"
,
groups
=
{
ValidationApi
.
add
.
class
})
private
Integer
devType
;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ConfigExceptionEnum.java
0 → 100644
View file @
a4aef99f
package
com
.
junmp
.
jyzb
.
api
.
exception
.
enums
;
import
com.junmp.v2.common.constant.CommonConstant
;
import
com.junmp.v2.common.exception.IExceptionEnum
;
import
lombok.Getter
;
@Getter
public
enum
ConfigExceptionEnum
implements
IExceptionEnum
{
WAREHOUSE_DEV_NAME_EXIST
(
CommonConstant
.
DEFAULT_USER_ERROR_CODE
,
"设备名称已存在,请重新修改名称后提交"
)
;
/**
* 错误编码
*/
private
final
Integer
code
;
/**
* 提示用户信息
*/
private
final
String
message
;
ConfigExceptionEnum
(
Integer
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
View file @
a4aef99f
...
...
@@ -77,7 +77,7 @@ public class DeviceConfigController {
//新增除湿机配置
@PostMapping
(
path
=
"/addWarehouseDev"
,
name
=
"新增除湿机配置#logType=30"
)
@ApiOperation
(
"新增除湿机配置"
)
public
ApiRes
<
String
>
addWarehouseDev
(
@RequestBody
UpdateWarehouseDevReq
req
){
public
ApiRes
<
String
>
addWarehouseDev
(
@RequestBody
@Validated
(
ValidationApi
.
add
.
class
)
UpdateWarehouseDevReq
req
){
return
ApiRes
.
success
(
warehouseDevService
.
addWarehouseDev
(
req
));
}
//修改除湿机配置
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
View file @
a4aef99f
...
...
@@ -36,6 +36,7 @@ import com.junmp.v2.db.api.factory.PageFactory;
import
com.junmp.v2.db.api.factory.PageResultFactory
;
import
com.junmp.v2.db.api.page.PageResult
;
import
com.junmp.v2.message.api.MessageApi
;
import
com.junmp.v2.message.api.bean.req.MessageReq
;
import
com.junmp.v2.message.api.bean.req.MessageSendReq
;
import
com.junmp.v2.sys.user.service.SysUserOrgService
;
import
org.flowable.engine.TaskService
;
...
...
@@ -220,6 +221,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
msgs
.
forEach
(
msg
->
{
messageApi
.
sendMessage
(
msg
);
}
);
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
View file @
a4aef99f
...
...
@@ -1137,7 +1137,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
LambdaUpdateWrapper
<
Inventory
>
wp1
=
Wrappers
.<
Inventory
>
lambdaUpdate
();
wp1
.
set
(
Inventory:
:
getState
,
req
.
getBussinessType
())
.
set
(
Inventory:
:
getLocationState
,
req
.
getOrderType
());
LambdaUpdateWrapper
<
WarehouseInventory
>
wp2
=
Wrappers
.<
WarehouseInventory
>
lambdaUpdate
();
wp2
.
set
(
WarehouseInventory:
:
getLocationState
,
req
.
getOrderType
());
for
(
int
i
=
0
;
i
<
updateInvList
.
size
();
i
++)
{
...
...
@@ -1209,7 +1208,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
}
//将redis中的出入库记录一起存入数据库表中(根据orderMainId获取数据)
//开始时间戳为2000年1月1日 00:00:00
List
<
Object
>
dataByTimestampRange
=
outInRecordRedisCache
.
getDataByTimestampRange
(
orderMain
.
getId
());
List
<
Object
>
dataByTimestampRange
=
outInRecordRedisCache
.
getDataByTimestampRange
(
"orderMainId:"
+
orderMain
.
getId
());
redisCache
.
remove
(
orderMain
.
getId
());
//取了之后再进行将东西添加到出入库记录
//将人工记账的数据一起存入logList;
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
View file @
a4aef99f
...
...
@@ -25,6 +25,7 @@ import com.junmp.jyzb.api.bean.query.PolicemanReq;
import
com.junmp.jyzb.api.bean.query.QueryReassignmentReq
;
import
com.junmp.jyzb.api.bean.req.*
;
import
com.junmp.jyzb.api.exception.enums.*
;
import
com.junmp.jyzb.cache.MsgRedisCache
;
import
com.junmp.jyzb.entity.*
;
import
com.junmp.jyzb.mapper.*
;
import
com.junmp.jyzb.service.*
;
...
...
@@ -47,6 +48,8 @@ import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
import
com.junmp.v2.file.api.constant.FileConstant
;
import
com.junmp.v2.file.biz.entity.SysFileInfo
;
import
com.junmp.v2.file.biz.service.SysFileInfoService
;
import
com.junmp.v2.message.api.MessageApi
;
import
com.junmp.v2.message.api.bean.req.MessageSendReq
;
import
com.junmp.v2.sys.api.bean.user.SysUserDto
;
import
com.junmp.v2.sys.api.bean.user.req.SysUserReq
;
import
com.junmp.v2.sys.api.bean.user.req.UserOrgReq
;
...
...
@@ -149,6 +152,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
private
SysDictItemService
sysDictItemService
;
@Autowired
private
RabbitMQSendMsg
MQ
;
@Resource
private
MessageApi
messageApi
;
@Resource
private
MsgRedisCache
redisCache
;
@Resource
private
InventorySummaryMapper
inventorySummaryMapper
;
...
...
@@ -1758,6 +1766,18 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
reassignment
.
setCurrentAssign
(
assigns
);
reassignmentService
.
updateById
(
reassignment
);
}
String
objJson
=
redisCache
.
get
(
reassignment
.
getProcessId
());
redisCache
.
remove
(
reassignment
.
getProcessId
());
List
<
MessageSendReq
>
msgs
=
JSONObject
.
parseArray
(
objJson
,
MessageSendReq
.
class
);
if
(
CollectionUtil
.
isNotEmpty
(
msgs
)){
msgs
.
forEach
(
msg
->
{
messageApi
.
sendMessage
(
msg
);
}
);
}
return
reassignment
.
getId
();
}
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
View file @
a4aef99f
...
...
@@ -22,6 +22,7 @@ import com.junmp.v2.common.util.BeanPlusUtil;
import
com.junmp.v2.db.api.factory.PageFactory
;
import
com.junmp.v2.db.api.factory.PageResultFactory
;
import
com.junmp.v2.db.api.page.PageResult
;
import
liquibase.pro.packaged.O
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
...
...
@@ -214,7 +215,14 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
//contacts联系人
wrapper
.
like
(
ObjectUtil
.
isNotEmpty
(
req
.
getContacts
()),
Supplier:
:
getContacts
,
req
.
getContacts
());
//根据创建时间降序
wrapper
.
orderByDesc
(
Supplier:
:
getCreateTime
);
if
(
ObjectUtil
.
isNotNull
(
req
.
getColumn
())){
wrapper
.
orderBy
(
ObjectUtil
.
isNotNull
(
req
.
getColumn
()),(
ObjectUtil
.
isNotNull
(
req
.
getOrder
())
&&
req
.
getOrder
().
equals
(
"asc"
)),
Supplier:
:
getName
);
}
else
{
wrapper
.
orderByDesc
(
Supplier:
:
getCreateTime
);
}
return
wrapper
;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseDevServiceImpl.java
View file @
a4aef99f
package
com
.
junmp
.
jyzb
.
service
.
impl
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto
;
import
com.junmp.jyzb.api.bean.dto.MQDto
;
import
com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq
;
import
com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum
;
import
com.junmp.jyzb.api.exception.enums.ConfigExceptionEnum
;
import
com.junmp.jyzb.entity.WarehouseDev
;
import
com.junmp.jyzb.service.WarehouseDevService
;
import
com.junmp.jyzb.mapper.WarehouseDevMapper
;
...
...
@@ -40,6 +43,10 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War
@Override
public
String
addWarehouseDev
(
UpdateWarehouseDevReq
req
)
{
List
<
WarehouseDev
>
list
=
list
(
new
LambdaQueryWrapper
<
WarehouseDev
>().
eq
(
WarehouseDev:
:
getDevName
,
req
.
getDevName
()));
if
(
CollectionUtil
.
isNotEmpty
(
list
))
{
throw
new
ServiceException
(
ConfigExceptionEnum
.
WAREHOUSE_DEV_NAME_EXIST
);
}
WarehouseDev
warehouseDev
=
new
WarehouseDev
();
BeanPlusUtil
.
copyProperties
(
req
,
warehouseDev
);
warehouseDev
.
setCreateTime
(
DateTimeUtil
.
getCurrentDateTime
());
...
...
jyzb-boot/src/main/resources/application-prod.yml
View file @
a4aef99f
...
...
@@ -36,7 +36,7 @@ knife4j:
spring
:
datasource
:
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://192.168.1.128:3306/db_jyzb
_test
?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
url
:
jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username
:
root
password
:
123456
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论