Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempLineWarnController.java

@@ -38,4 +38,12 @@ public class TempLineWarnController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "货单新增", notes = "<br>By:艾庆国")
+    @PostMapping("/orderGoodsAdd")
+    public Result orderGoodsAdd(String orderGoodsNo) {
+
+        lineWarnMqService.orderGoodsAdd(orderGoodsNo);
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/linewarn/LineWarnRangeDaoImpl.java

@@ -2,8 +2,8 @@ package com.clx.performance.dao.impl.linewarn;
 
 import com.clx.performance.dao.linewarn.LineWarnRangeDao;
 import com.clx.performance.enums.linewarn.LineWarnRangEnum;
-import com.clx.performance.mapper.linewarn.LineWarnRangMapper;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.mapper.linewarn.LineWarnRangeMapper;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -11,24 +11,24 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public class LineWarnRangeDaoImpl extends BaseDaoImpl<LineWarnRangMapper, LineWarnRang, Integer> implements LineWarnRangeDao {
+public class LineWarnRangeDaoImpl extends BaseDaoImpl<LineWarnRangeMapper, LineWarnRange, Integer> implements LineWarnRangeDao {
 
 
     @Override
-    public List<LineWarnRang> ListByWarnConfigId(Integer warnConfigId) {
+    public List<LineWarnRange> ListByWarnConfigId(Integer warnConfigId) {
         return list(lQrWrapper()
-                        .eq(LineWarnRang::getWarnConfigId, warnConfigId)
-                        .eq(LineWarnRang::getStatus, LineWarnRangEnum.Status.ENABLE.getCode())
-                        .orderByDesc(LineWarnRang::getId)
+                        .eq(LineWarnRange::getWarnConfigId, warnConfigId)
+                        .eq(LineWarnRange::getStatus, LineWarnRangEnum.Status.ENABLE.getCode())
+                        .orderByDesc(LineWarnRange::getId)
                 );
     }
 
     @Override
-    public boolean updateDisable(LineWarnRang item) {
+    public boolean updateDisable(LineWarnRange item) {
         return update(lUdWrapper()
-                .eq(LineWarnRang::getWarnConfigId, item.getWarnConfigId())
-                .eq(StringUtils.isNotBlank(item.getOrderGoodsNo()), LineWarnRang::getOrderGoodsNo, item.getOrderGoodsNo())
-                .set(LineWarnRang::getStatus, LineWarnRangEnum.Status.DISABLE.getCode())
+                .eq(LineWarnRange::getWarnConfigId, item.getWarnConfigId())
+                .eq(StringUtils.isNotBlank(item.getOrderGoodsNo()), LineWarnRange::getOrderGoodsNo, item.getOrderGoodsNo())
+                .set(LineWarnRange::getStatus, LineWarnRangEnum.Status.DISABLE.getCode())
         );
     }
 }

performance-web/src/main/java/com/clx/performance/dao/linewarn/LineWarnRangeDao.java

 package com.clx.performance.dao.linewarn;
 
-import com.clx.performance.mapper.linewarn.LineWarnRangMapper;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.mapper.linewarn.LineWarnRangeMapper;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;
 
-public interface LineWarnRangeDao extends BaseDao<LineWarnRangMapper, LineWarnRang, Integer> {
-    List<LineWarnRang> ListByWarnConfigId(Integer warnConfigId);
+public interface LineWarnRangeDao extends BaseDao<LineWarnRangeMapper, LineWarnRange, Integer> {
+    List<LineWarnRange> ListByWarnConfigId(Integer warnConfigId);
 
-    boolean updateDisable(LineWarnRang item);
+    boolean updateDisable(LineWarnRange item);
 }

performance-web/src/main/java/com/clx/performance/listener/RabbitOrderGoodsStatusOnHandler.java

@@ -5,6 +5,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.IntegralMqService;
+import com.clx.performance.service.linewarn.LineWarnMqService;
 import com.msl.common.base.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -25,6 +26,8 @@ public class RabbitOrderGoodsStatusOnHandler {
 
     @Autowired
     private IntegralMqService integralMqService;
+    @Autowired
+    private LineWarnMqService lineWarnMqService;
 
     @RabbitListener(queues = RabbitKeyConstants.ORDER_GOODS_ON_DEAD_QUEUE)
     public void onMessage(String message) {
@@ -42,6 +45,9 @@ public class RabbitOrderGoodsStatusOnHandler {
             log.info("处理货单状态由已挂单变为挂单中监听器执行,从状态{}-----变更为{}", orderGoods.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.PAYING.getName());
             orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.PAYING.getCode());
 
+            // 发送mq
+            lineWarnMqService.orderGoodsAdd(orderGoods.getOrderGoodsNo());
+
             // 添加积分货单
             try {
                 integralMqService.orderGoodsAdd(orderGoods.getOrderGoodsNo(),

performance-web/src/main/java/com/clx/performance/mapper/linewarn/LineWarnRangMapper.java → performance-web/src/main/java/com/clx/performance/mapper/linewarn/LineWarnRangeMapper.java

 package com.clx.performance.mapper.linewarn;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface LineWarnRangMapper extends BaseMapper<LineWarnRang> {
+public interface LineWarnRangeMapper extends BaseMapper<LineWarnRange> {
 
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/vehiclewarn/VehicleWarnRangMapper.java

@@ -3,11 +3,8 @@ package com.clx.performance.mapper.vehiclewarn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
 import com.clx.performance.model.vehiclewarn.VehicleWarnRang;
-import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnRangeParam;
-import com.clx.performance.sqlProvider.vehiclewarn.VehicleWarnInfoSqlProvider;
 import com.clx.performance.sqlProvider.vehiclewarn.VehicleWarnRangeSqlProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +12,7 @@ import org.apache.ibatis.annotations.SelectProvider;
 
 @Mapper
 public interface VehicleWarnRangMapper extends BaseMapper<VehicleWarnRang> {
-    String TABLE = "vehicle_warn_range";
+    String TABLE = "vehicle_warn_rang";
 
     /**
      * @see VehicleWarnRangeSqlProvider#pageByParam(Page, PageVehicleWarnRangeParam)

performance-web/src/main/java/com/clx/performance/model/linewarn/LineWarnRang.java → performance-web/src/main/java/com/clx/performance/model/linewarn/LineWarnRange.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Setter
 @NoArgsConstructor
 @TableName(autoResultMap = true)
-public class LineWarnRang implements HasKey<Integer> {
+public class LineWarnRange implements HasKey<Integer> {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;                             //id

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnInfoServiceImpl.java

@@ -13,7 +13,7 @@ import com.clx.performance.enums.linewarn.LineWarnLogEnum;
 import com.clx.performance.enums.linewarn.LineWarnRangEnum;
 import com.clx.performance.model.linewarn.LineWarnInfo;
 import com.clx.performance.model.linewarn.LineWarnLog;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import com.clx.performance.param.pc.linewarn.LineWarnInfoResolveUpdateParam;
 import com.clx.performance.param.pc.linewarn.LineWarnInfoSuspendUpdateParam;
 import com.clx.performance.param.pc.linewarn.PageLineWarnInfoParam;
@@ -72,18 +72,18 @@ public class LineWarnInfoServiceImpl implements LineWarnInfoService {
         lineWarnLog.setCreateBy(loginUserInfo.getUserName());
         lineWarnLogDao.saveEntity(lineWarnLog);
 
-        LineWarnRang lineWarnRang = new LineWarnRang();
-        lineWarnRang.setWarnConfigId(lineWarnInfo.getWarnConfigId());
-        lineWarnRang.setWarnName(lineWarnInfo.getWarnName());
-        lineWarnRang.setOrderGoodsNo(lineWarnInfo.getOrderGoodsNo());
-        lineWarnRang.setWarnEndTime(endTime);
-        lineWarnRang.setStatus(LineWarnRangEnum.Status.ENABLE.getCode());
-        lineWarnRang.setCreateBy(loginUserInfo.getUserName());
+        LineWarnRange lineWarnRange = new LineWarnRange();
+        lineWarnRange.setWarnConfigId(lineWarnInfo.getWarnConfigId());
+        lineWarnRange.setWarnName(lineWarnInfo.getWarnName());
+        lineWarnRange.setOrderGoodsNo(lineWarnInfo.getOrderGoodsNo());
+        lineWarnRange.setWarnEndTime(endTime);
+        lineWarnRange.setStatus(LineWarnRangEnum.Status.ENABLE.getCode());
+        lineWarnRange.setCreateBy(loginUserInfo.getUserName());
 
         // 禁用旧数据
-        lineWarnRangeDao.updateDisable(lineWarnRang);
+        lineWarnRangeDao.updateDisable(lineWarnRange);
         // 新增新数据
-        lineWarnRangeDao.saveEntity(lineWarnRang);
+        lineWarnRangeDao.saveEntity(lineWarnRange);
     }
 
     @Transactional(rollbackFor = Exception.class)

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java

@@ -27,6 +27,7 @@ import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.param.mq.vehiclewarn.VehicleWarnChildAddMqParam;
 import com.clx.performance.param.mq.vehiclewarn.VehicleWarnTruckWarnMqParam;
 import com.clx.performance.param.mq.vehiclewarn.VehicleWarnTruckWarnNoticeMqParam;
+import com.clx.performance.service.linewarn.LineWarnMqService;
 import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.clx.performance.service.vehiclewarn.*;
 import com.clx.performance.utils.LocalDateTimeUtils;
@@ -79,6 +80,8 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
     private VehicleWarnDelayWarnService vehicleWarnDelayWarnService;
     @Autowired
     private TruckTraceMqHandlerService truckTraceMqHandlerService;
+    @Autowired
+    private LineWarnMqService lineWarnMqService;
 
     @Override
     public void orderChildAdd(VehicleWarnChildAddMqParam mq) {
@@ -332,6 +335,9 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao
                 .findById(mq.getInfoId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
+        // 发送mq（运单异常）
+        lineWarnMqService.orderChildWarn(vehicleWarnInfo.getOrderGoodsNo(), vehicleWarnInfo.getChildNo());
+
         List<String> mobileList = new ArrayList<>();
 
         // 过滤需要通知的人员

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnUserServiceImpl.java

@@ -92,7 +92,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
                 .map(item->item.getWarnType()).collect(Collectors.toList());
 
         vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
-        vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
+        vehicleWarnUser.setLineWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
         vehicleWarnUserDao.updateWarnType(vehicleWarnUser);
 
     }

performance-web/src/main/java/com/clx/performance/sqlProvider/linewarn/LineWarnInfoSqlProvider.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 
 public class LineWarnInfoSqlProvider {
 
-    private static final String TABLE = "vehicle_warn_info";
+    private static final String TABLE = "line_warn_info";
 
     public String pageByParam(@Param("page") Page page, @Param("param") PageLineWarnInfoParam param) {
 

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnRangeSqlProvider.java

@@ -10,7 +10,7 @@ import java.util.Objects;
 
 public class VehicleWarnRangeSqlProvider {
 
-    private static final String TABLE = "vehicle_warn_range";
+    private static final String TABLE = "vehicle_warn_rang";
 
     public String pageByParam(@Param("page") Page page, @Param("param") PageVehicleWarnRangeParam param) {
 

performance-web/src/main/java/com/clx/performance/struct/OrderGoodsStruct.java

@@ -7,6 +7,7 @@ import com.clx.performance.vo.pc.linewarn.LineWarnTraceVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 import java.util.List;
 
@@ -18,6 +19,8 @@ public interface OrderGoodsStruct {
 
     List<OrderGoodsFeignVO> convertList(List<OrderGoods> orderGoods);
 
-    LineWarnTraceVO convertLineWarnTraceVO(OrderGoods orderGoods);
+    @Mapping(target = "sendAddress", source = "sendAddressShorter")
+    @Mapping(target = "receiveAddress", source = "receiveAddressShorter")
+    LineWarnTraceVO convertLineWarnTraceVO(OrderGoods item);
 
 }