修改bug

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QuerySupplierReq.java

@@ -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

@@ -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

+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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 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

@@ -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