Commit a4aef99f by 李小惠

修改bug

parent 73e7636e
...@@ -2285,3 +2285,93 @@ java.io.IOException: 远程主机强迫关闭了一个现有的连接。 ...@@ -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: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: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: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)
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -29,4 +29,7 @@ public class QuerySupplierReq extends BaseRequest { ...@@ -29,4 +29,7 @@ public class QuerySupplierReq extends BaseRequest {
//判断是否需要全部的厂商商信息还是只需要名字去重的厂商名称,如果是去重的,这里给true //判断是否需要全部的厂商商信息还是只需要名字去重的厂商名称,如果是去重的,这里给true
private Boolean flag; private Boolean flag;
private String Column;
private String order;
} }
...@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.req; ...@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.req;
import com.junmp.v2.common.bean.request.ValidationApi; import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
...@@ -14,26 +15,30 @@ public class UpdateWarehouseDevReq { ...@@ -14,26 +15,30 @@ public class UpdateWarehouseDevReq {
/** /**
* 仓库id * 仓库id
*/ */
@NotBlank(message = "仓库不能为空",groups = {ValidationApi.add.class})
private String warehouseId; private String warehouseId;
/** /**
* 组织机构id * 组织机构id
*/ */
@NotNull(message = "组织机构id不能为空",groups = {ValidationApi.list.class}) @NotNull(message = "组织机构id不能为空",groups = {ValidationApi.list.class, ValidationApi.add.class})
private Long orgId; private Long orgId;
/** /**
* Ip地址 * Ip地址
*/ */
@NotBlank(message = "ip地址不能为空",groups = {ValidationApi.add.class})
private String devIp; private String devIp;
/** /**
* 端口 * 端口
*/ */
@NotBlank(message = "端口不能为空",groups = {ValidationApi.add.class})
private String devPort; private String devPort;
/** /**
* 名称 * 名称
*/ */
@NotBlank(message = "设备名称不能为空",groups = {ValidationApi.add.class})
private String devName; private String devName;
/** /**
...@@ -80,6 +85,7 @@ public class UpdateWarehouseDevReq { ...@@ -80,6 +85,7 @@ public class UpdateWarehouseDevReq {
private Boolean flag; private Boolean flag;
//设备类型(0除湿机,1温湿度计) //设备类型(0除湿机,1温湿度计)
@NotNull(message = "设备类型不能为空",groups = {ValidationApi.add.class})
private Integer devType; private Integer devType;
} }
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;
}
}
...@@ -77,7 +77,7 @@ public class DeviceConfigController { ...@@ -77,7 +77,7 @@ public class DeviceConfigController {
//新增除湿机配置 //新增除湿机配置
@PostMapping(path="/addWarehouseDev",name="新增除湿机配置#logType=30") @PostMapping(path="/addWarehouseDev",name="新增除湿机配置#logType=30")
@ApiOperation("新增除湿机配置") @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)); return ApiRes.success(warehouseDevService.addWarehouseDev(req));
} }
//修改除湿机配置 //修改除湿机配置
......
...@@ -36,6 +36,7 @@ import com.junmp.v2.db.api.factory.PageFactory; ...@@ -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.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import com.junmp.v2.message.api.MessageApi; 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.message.api.bean.req.MessageSendReq;
import com.junmp.v2.sys.user.service.SysUserOrgService; import com.junmp.v2.sys.user.service.SysUserOrgService;
import org.flowable.engine.TaskService; import org.flowable.engine.TaskService;
...@@ -220,6 +221,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -220,6 +221,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
msgs.forEach(msg-> msgs.forEach(msg->
{ {
messageApi.sendMessage(msg); messageApi.sendMessage(msg);
} }
); );
......
...@@ -1137,7 +1137,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain ...@@ -1137,7 +1137,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
LambdaUpdateWrapper<Inventory> wp1 = Wrappers.<Inventory>lambdaUpdate(); LambdaUpdateWrapper<Inventory> wp1 = Wrappers.<Inventory>lambdaUpdate();
wp1.set(Inventory::getState, req.getBussinessType()) wp1.set(Inventory::getState, req.getBussinessType())
.set(Inventory::getLocationState, req.getOrderType()); .set(Inventory::getLocationState, req.getOrderType());
LambdaUpdateWrapper<WarehouseInventory> wp2 = Wrappers.<WarehouseInventory>lambdaUpdate(); LambdaUpdateWrapper<WarehouseInventory> wp2 = Wrappers.<WarehouseInventory>lambdaUpdate();
wp2.set(WarehouseInventory::getLocationState, req.getOrderType()); wp2.set(WarehouseInventory::getLocationState, req.getOrderType());
for (int i = 0; i < updateInvList.size(); i++) { for (int i = 0; i < updateInvList.size(); i++) {
...@@ -1209,7 +1208,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain ...@@ -1209,7 +1208,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
} }
//将redis中的出入库记录一起存入数据库表中(根据orderMainId获取数据) //将redis中的出入库记录一起存入数据库表中(根据orderMainId获取数据)
//开始时间戳为2000年1月1日 00:00:00 //开始时间戳为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()); redisCache.remove(orderMain.getId());
//取了之后再进行将东西添加到出入库记录 //取了之后再进行将东西添加到出入库记录
//将人工记账的数据一起存入logList; //将人工记账的数据一起存入logList;
......
...@@ -25,6 +25,7 @@ import com.junmp.jyzb.api.bean.query.PolicemanReq; ...@@ -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.query.QueryReassignmentReq;
import com.junmp.jyzb.api.bean.req.*; import com.junmp.jyzb.api.bean.req.*;
import com.junmp.jyzb.api.exception.enums.*; import com.junmp.jyzb.api.exception.enums.*;
import com.junmp.jyzb.cache.MsgRedisCache;
import com.junmp.jyzb.entity.*; import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*; import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.*; import com.junmp.jyzb.service.*;
...@@ -47,6 +48,8 @@ import com.junmp.v2.file.api.bean.res.SysFileInfoResp; ...@@ -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.api.constant.FileConstant;
import com.junmp.v2.file.biz.entity.SysFileInfo; import com.junmp.v2.file.biz.entity.SysFileInfo;
import com.junmp.v2.file.biz.service.SysFileInfoService; 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.SysUserDto;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq; import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.api.bean.user.req.UserOrgReq; import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
...@@ -149,6 +152,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -149,6 +152,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
private SysDictItemService sysDictItemService; private SysDictItemService sysDictItemService;
@Autowired @Autowired
private RabbitMQSendMsg MQ; private RabbitMQSendMsg MQ;
@Resource
private MessageApi messageApi;
@Resource
private MsgRedisCache redisCache;
@Resource @Resource
private InventorySummaryMapper inventorySummaryMapper; private InventorySummaryMapper inventorySummaryMapper;
...@@ -1758,6 +1766,18 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -1758,6 +1766,18 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
reassignment.setCurrentAssign(assigns); reassignment.setCurrentAssign(assigns);
reassignmentService.updateById(reassignment); 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(); return reassignment.getId();
} }
......
...@@ -22,6 +22,7 @@ import com.junmp.v2.common.util.BeanPlusUtil; ...@@ -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.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory; import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import liquibase.pro.packaged.O;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -214,7 +215,14 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i ...@@ -214,7 +215,14 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
//contacts联系人 //contacts联系人
wrapper.like(ObjectUtil.isNotEmpty(req.getContacts()), Supplier::getContacts, req.getContacts()); 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; return wrapper;
} }
} }
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto; import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto;
import com.junmp.jyzb.api.bean.dto.MQDto; import com.junmp.jyzb.api.bean.dto.MQDto;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq; import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum; 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.entity.WarehouseDev;
import com.junmp.jyzb.service.WarehouseDevService; import com.junmp.jyzb.service.WarehouseDevService;
import com.junmp.jyzb.mapper.WarehouseDevMapper; import com.junmp.jyzb.mapper.WarehouseDevMapper;
...@@ -40,6 +43,10 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War ...@@ -40,6 +43,10 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War
@Override @Override
public String addWarehouseDev(UpdateWarehouseDevReq req) { 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(); WarehouseDev warehouseDev = new WarehouseDev();
BeanPlusUtil.copyProperties(req,warehouseDev); BeanPlusUtil.copyProperties(req,warehouseDev);
warehouseDev.setCreateTime(DateTimeUtil.getCurrentDateTime()); warehouseDev.setCreateTime(DateTimeUtil.getCurrentDateTime());
......
...@@ -36,7 +36,7 @@ knife4j: ...@@ -36,7 +36,7 @@ knife4j:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver 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 username: root
password: 123456 password: 123456
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论