yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
d85ab96ea0 5252eaaca8
commit
a98aaa4ff5
6 changed files with 87 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
  2. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
  3. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  4. 81
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  5. 32
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
  6. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
View File

@ -5,7 +5,7 @@
select *
from base_vehicle_state
where busSid = #{busSid}
and busState != '602'
and (busState is null or busState != '602')
order by id desc limit 1
</select>

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
View File

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery;
import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
@ -114,4 +115,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
List<String> selectSid(@Param("contractId") String contractId,@Param("sid") String sid);
List<String> selectBySid(@Param("contractNo") String contractId, @Param("list") List<String> vinNoLists);
BaseVehicleState selectByBusVinSid(String sid);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
View File

@ -155,4 +155,8 @@
#{item}
</foreach>
</select>
<select id="selectByBusVinSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
select * from anrui_base.base_vehicle_state where busSid = #{sid} and busState != '602' order by id desc limit 1
</select>
</mapper>

81
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -42,6 +42,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
@ -812,15 +813,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
baseMapper.updateStateBySid(3, bv.getBusinessSid());
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
ExecutorService pool = new ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
Future future0 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid());
vinSidList.removeAll(Collections.singleton(null));
@ -834,15 +833,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());
ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
if (!orderDetailsVoResultBean.getSuccess()) {
@ -1004,14 +994,32 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appBusHandoverPrepareVehicleDto.setVinSid(details.getVinSid());
//根据合同编号和车辆sid查询
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), details.getVinSid());
BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(), busSalesOrderVehicle.getSid());
/*BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(), busSalesOrderVehicle.getSid());
appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription());
appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());
appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());*/
BaseVehicleState baseVehicleState = baseMapper.selectByBusVinSid(busSalesOrderVehicle.getSid());
if(baseVehicleState != null){
if(StringUtils.isNotBlank(baseVehicleState.getCarryVehicleState()) && "1".equals(baseVehicleState.getCarryVehicleState())){
//欠款提车
appBusHandoverPrepareVehicleDto.setSubscription("欠款提车");
appBusHandoverPrepareVehicleDto.setSubscriptionKey("0001");
}else{
if(StringUtils.isNotBlank(baseVehicleState.getFinState()) && "1".equals(baseVehicleState.getFinState())){
appBusHandoverPrepareVehicleDto.setSubscription("正常交款");
appBusHandoverPrepareVehicleDto.setSubscriptionKey("0002");
}
}
}
dtos.add(appBusHandoverPrepareVehicleDto);
}
}
dto.setAppBusHandoverPrepareVehicleDtos(dtos);
busHandoverPrepareService.addHandoverPrepare(dto);
log.info("推送待交车准备数据结束啦~~~~~~~~~~~~~~~~~~~~~~~~==============================");
}
/**
@ -2014,6 +2022,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
baseMapper.insert(busDeliveredApply);
sid = busDeliveredApply.getSid();
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(vv -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
baseVehicleStateDto.setBusSid(vv);
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
} else {
//根据出库申请sid查询出库申请是否存在
BusDeliveredApply busDeliveredApply = fetchBySid(sid);
@ -2058,6 +2079,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
busDeliveredApply.setDistributorNameTwo(intermediary2.getIntermediaryName());
}
//==============================================================
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
List<BaseVehicleStateDto> finalStateDtoList1 = stateDtoList;
vinSidList.stream().forEach(vv -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey());
baseVehicleStateDto.setBusSid(vv);
finalStateDtoList1.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
//=================================================================
//删除
busDeliveredApplyDetailsService.deleteByApplySid(sid);
busDeliveredUseMessageService.deleteByApplySid(sid);
@ -2162,6 +2198,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails);
}
baseMapper.updateById(busDeliveredApply);
stateDtoList = new ArrayList<>();
vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
List<BaseVehicleStateDto> finalStateDtoList = stateDtoList;
vinSidList.stream().forEach(vv -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
baseVehicleStateDto.setBusSid(vv);
finalStateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}
return rb.success().setData(sid);
}

32
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
View File

@ -168,29 +168,17 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
}
}
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
baseVehicleStateDto.setBusSid(v);
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
baseVehicleStateDto.setBusSid(v);
stateDtoList.add(baseVehicleStateDto);
});
} catch (Exception e) {
e.printStackTrace();
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -6622,7 +6622,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
if(busSalesOrder == null){
return rb.setMsg("该合同号的订单不存在");
}
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSalesOrder.getSid());
return resultBean;
}

Write Preview
Loading…
Cancel
Save