UDI
/
udi-cpt-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

Browse Source
cert
anthonywj 2 years ago
parent 86d333fa4e
commit f585234d5d
12 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File

33
src/main/java/com/glxp/api/controller/trace/TraceOrderController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.trace;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
@ -9,7 +10,9 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.sup.UserCompanyEntity;
import com.glxp.api.entity.trace.TraceOrderEntity;
import com.glxp.api.entity.trace.TraceProductDetailEntity;
import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
import com.glxp.api.req.trace.TraceOrderDetailRequest;
import com.glxp.api.req.trace.TraceOrderRequest;
@ -18,8 +21,11 @@ import com.glxp.api.req.trace.TraceRecordRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.trace.TraceOrderResponse;
import com.glxp.api.res.trace.TraceRecordResponse;
import com.glxp.api.service.sup.UserCompanyService;
import com.glxp.api.service.trace.TraceOrderService;
import com.glxp.api.service.trace.TraceProductDetailService;
import com.glxp.api.service.trace.TraceTaskNoticeService;
import com.glxp.api.service.trace.UdiTraceService;
import com.glxp.api.util.udi.FilterUdiUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -80,6 +86,12 @@ public class TraceOrderController extends BaseController {
@Resource
TraceTaskNoticeService traceTaskNoticeService;
@Resource
UserCompanyService userCompanyService;
@Resource
UdiTraceService udiTraceService;
@Resource
TraceProductDetailService traceProductDetailService;
//客户端单据信息上传接口
@ApiOperation(value = "客户端单据信息上传接口", response = BaseResponse.class)
@ -100,7 +112,26 @@ public class TraceOrderController extends BaseController {
taskNoticeEntity.setStatus(3);
taskNoticeEntity.setUpdateTime(new Date());
traceTaskNoticeService.updateById(taskNoticeEntity);
System.out.println("成功");
// 推送下一家企业
UserCompanyEntity userCompanyEntity = userCompanyService.getById(traceOrderEntity.getCompanyIdFk());
if (StrUtil.isNotEmpty(traceOrderEntity.getToCorpCreditNum()) &&
!traceOrderEntity.getToCorpCreditNum().equals(userCompanyEntity.getCreditNum())) {
UserCompanyEntity toUserCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", traceOrderEntity.getToCorpCreditNum()), false);
TraceTaskNoticeEntity nextNotity = traceTaskNoticeService.findTask(2, traceOrderEntity.getTraceProductIdFk(), toUserCompanyEntity.getId());
if (nextNotity == null) {
TraceProductDetailEntity traceProductDetailEntity = traceProductDetailService.getById(traceOrderEntity.getTraceProductIdFk());
nextNotity = udiTraceService.createTraceNotice(2, traceProductDetailEntity, toUserCompanyEntity.getId());
udiTraceService.pushDelayExpireTask(nextNotity);
udiTraceService.pushMq(nextNotity, toUserCompanyEntity.getId());
} else if (nextNotity.getStatus() == 4) {
//任务超时未处理，重新推送消息
udiTraceService.pushMq(nextNotity, toUserCompanyEntity.getId());
}
}
return ResultVOUtils.success("成功");
}

7
src/main/java/com/glxp/api/controller/trace/TraceRecordController.java
Unescape Escape View File

@ -13,9 +13,11 @@ import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.trace.TraceManuOrderEntity;
import com.glxp.api.entity.trace.TraceOrderEntity;
import com.glxp.api.entity.trace.TraceRecordLogEntity;
import com.glxp.api.req.trace.TraceManuOrderRequest;
import com.glxp.api.req.trace.TraceOrderDetailRequest;
import com.glxp.api.req.trace.TraceRecordRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.trace.TraceManuOrderResponse;
import com.glxp.api.res.trace.TraceOrderResponse;
import com.glxp.api.res.trace.TraceRecordResponse;
import com.glxp.api.res.trace.TraceSearchReponse;
@ -78,7 +80,10 @@ public class TraceRecordController extends BaseController {
TraceOrderDetailRequest traceOrderDetailRequest = new TraceOrderDetailRequest();
traceOrderDetailRequest.setTraceProductIdFk(traceRecordLogEntity.getTraceProductIdFk());
List<TraceOrderResponse> traceOrderEntities = traceOrderService.filterJoin(traceOrderDetailRequest);
List<TraceManuOrderEntity> traceManuOrderEntities = traceManuOrderService.list(new QueryWrapper<TraceManuOrderEntity>().eq("traceProductIdFk", traceRecordLogEntity.getTraceProductIdFk()));
TraceManuOrderRequest traceManuOrderRequest = new TraceManuOrderRequest();
traceManuOrderRequest.setTraceProductIdFk(traceRecordLogEntity.getTraceProductIdFk());
List<TraceManuOrderResponse> traceManuOrderEntities = traceManuOrderService.filterTraces(traceManuOrderRequest);
TraceSearchReponse traceSearchReponse = new TraceSearchReponse();
traceSearchReponse.setTraceOrderEntities(traceOrderEntities);
traceSearchReponse.setTraceManuOrderEntities(traceManuOrderEntities);

2
src/main/java/com/glxp/api/req/trace/TraceManuOrderRequest.java
Unescape Escape View File

@ -102,4 +102,6 @@ public class TraceManuOrderRequest extends ListPageRequest {
*/
@ApiModelProperty(value = "所属企业")
private String companyName;
private Long traceProductIdFk;
}

4
src/main/java/com/glxp/api/req/trace/TraceOrderUploadRequest.java
Unescape Escape View File

@ -130,6 +130,6 @@ public class TraceOrderUploadRequest {
*/
@ApiModelProperty(value = "查询记录号外键")
private String recordCode;
@ApiModelProperty(value = "患者信息")
private String toUserInfo;
}

2
src/main/java/com/glxp/api/res/trace/TraceManuOrderResponse.java
Unescape Escape View File

@ -129,4 +129,6 @@ public class TraceManuOrderResponse {
*/
@ApiModelProperty(value = "备注")
private String remark;
private Long traceProductIdFk;
}

7
src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.res.trace;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -170,4 +171,10 @@ public class TraceOrderResponse {
private String zczbhhzbapzbh;
@ApiModelProperty(value = "查询记录号")
private String recordCode;
public String getToCorp() {
if (StrUtil.isEmpty(toCorp))
return toUserInfo;
return toCorp;
}
}

2
src/main/java/com/glxp/api/res/trace/TraceSearchReponse.java
Unescape Escape View File

@ -18,6 +18,6 @@ public class TraceSearchReponse {
@ApiModelProperty(value = "追溯查询出入库单结果")
List<TraceOrderResponse> traceOrderEntities;
@ApiModelProperty(value = "追溯查询生产订单结果")
List<TraceManuOrderEntity> traceManuOrderEntities;
List<TraceManuOrderResponse> traceManuOrderEntities;
}

6
src/main/java/com/glxp/api/service/trace/RabbitPushService.java
Unescape Escape View File

@ -39,7 +39,9 @@ public class RabbitPushService {
Channel channel = rabbitTemplate.getConnectionFactory().createConnection().createChannel(true);
String queueName = "fanout_" + mqTraceMessage.getCompanyId() + "";
rabbitQueueService.createQueue(queueName);
rabbitTemplate.convertAndSend(FANOUT_EXCHANGE, null, JsonUtils.toJsonString(mqTraceMessage));
String msg = JsonUtils.toJsonString(mqTraceMessage);
log.info(msg);
rabbitTemplate.convertAndSend(FANOUT_EXCHANGE, null, msg);
}
@ -56,7 +58,7 @@ public class RabbitPushService {
public BaseResponse sendDeleyTask(MqTaskDelayMessage mqTaskDelayMessage, Integer delayTime) {
rabbitTemplate.convertAndSend(TopicRabbitConfig.TRACE_DELAY_EXCHANGE, TopicRabbitConfig.delaytrace, mqTaskDelayMessage, message -> {
MessageProperties messageProperties = message.getMessageProperties();
messageProperties.setDelay(delayTime * 60);
messageProperties.setDelay(delayTime * 1);
return message;
});
return ResultVOUtils.success("发送成功");

1
src/main/java/com/glxp/api/service/trace/TraceManuOrderService.java
Unescape Escape View File

@ -28,7 +28,6 @@ public class TraceManuOrderService extends ServiceImpl<TraceManuOrderMapper, Tra
int offset = (traceManuOrderRequest.getPage() - 1) * traceManuOrderRequest.getLimit();
PageHelper.offsetPage(offset, traceManuOrderRequest.getLimit());
}
//System.out.println("11111"+traceManuOrderRequest.getRecordCode());
return traceManuOrderMapper.filterTraces(traceManuOrderRequest);
}

10
src/main/java/com/glxp/api/service/trace/UdiTraceService.java
Unescape Escape View File

@ -161,15 +161,15 @@ public class UdiTraceService {
}
List<String> certNums = toCorpCreditNums.stream().distinct().collect(Collectors.toList());
for (String certNum : certNums) {
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum.trim()));
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(2, traceProductDetailEntity.getId(), userCompanyEntity.getId());
if (taskNoticeEntity == null) {
taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, companyId);
taskNoticeEntity = createTraceNotice(2, traceProductDetailEntity, userCompanyEntity.getId());
pushDelayExpireTask(taskNoticeEntity);
pushMq(taskNoticeEntity, companyId);
pushMq(taskNoticeEntity, userCompanyEntity.getId());
} else if (taskNoticeEntity.getStatus() == 4) {
//任务超时未处理，重新推送消息
pushMq(taskNoticeEntity, companyId);
pushMq(taskNoticeEntity, userCompanyEntity.getId());
}
}
}

4
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 20

17
src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
Unescape Escape View File

@ -1,21 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.trace.TraceManuOrderMapper">
<select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
SELECT *
FROM trace_manu_order
<where>
<if test="recordCode != '' and recordCode != null">
and recordCode = #{recordCode}
</if>
</where>
</select>
<select id="filterTraces1" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
select *
select trace_manu_order.*, uc.companyName
from trace_manu_order
left join user_company uc on trace_manu_order.companyIdFk = uc.id
<where>
<if test="id != '' and id != null">
and id = #{id}
@ -53,6 +43,9 @@
<if test="manufactory != '' and manufactory != null">
and `manufactory` = #{manufactory}
</if>
<if test="traceProductIdFk != '' and traceProductIdFk != null">
and `traceProductIdFk` = #{traceProductIdFk}
</if>
</where>
ORDER BY id DESC
</select>

Write Preview
Loading…
Cancel
Save