Skip to content

D
device-back
提交 9d1cc644 authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

fix(区块链模块): 修复配发，退回，入库问题

修复了入库接收人为null，修复了配发，退回验证为假
上级 b13a83b5
隐藏空白字符变更
内嵌 并排
正在显示 包含 119 行增加 和 45 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -24,6 +24,7 @@ import com.tykj.dev.device.file.entity.FileRet;
import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.user.cache.UserCache;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.BlockBusinessEnum;
......@@ -33,6 +34,7 @@ import com.tykj.dev.misc.utils.DateUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.ResultUtil;
import com.tykj.dev.misc.utils.StringSplitUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
......@@ -40,6 +42,7 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.persistence.Transient;
import java.lang.reflect.Field;
import java.util.HashMap;
......@@ -53,6 +56,7 @@ import java.util.stream.Collectors;
* @author dengdiyi
*/
@Service
@Slf4j
public class AllotBackBillServiceImpl implements AllotBackBillService {
@Autowired
......@@ -76,12 +80,16 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
@Autowired
private TaskService taskService;
@Resource
private UserCache userCache;
@Override
public AllotBackBill addEntity(AllotBackBill allotBackBill) {
AllotBackBill allotBackBill1 = allotBackBillDao.save(allotBackBill);
//异步上链
//延迟2s防止同时写入
sendText(allotBackBill1.getId());
sendText(allotBackBill1.getId());
log.info("新增[退回]上链");
return allotBackBill1;
}
......@@ -105,6 +113,7 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
//根据recordId追加上链
// CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(allotBackBill),allotBackBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
sendText(allotBackBill1.getId());
log.info("更新[退回]上链");
return allotBackBill1;
}
......@@ -215,13 +224,24 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
private String operatorName(AllotBackBill allotBill) {
StringBuffer buf = new StringBuffer();
buf.append(allotBill.getSenderUserA())
// buf.append(allotBill.getSenderUserA())
// .append(",")
// .append(allotBill.getSenderUserB())
// .append(",")
// .append(allotBill.getReceiveUserA())
// .append(",")
// .append(allotBill.getReceiveUserB());
Integer sendUseraId = allotBill.getSendUseraId();
Integer sendUserbId = allotBill.getSendUserbId();
Integer receiveUseraId = allotBill.getReceiveUseraId();
Integer receiveUserbId = allotBill.getReceiveUserbId();
buf.append(sendUseraId != null?userCache.findById(sendUseraId).getName():"无")
.append(",")
.append(allotBill.getSenderUserB())
.append(sendUserbId != null ?userCache.findById(sendUserbId).getName():"无")
.append(",")
.append(allotBill.getReceiveUserA())
.append(receiveUseraId != null ?userCache.findById(receiveUseraId).getName():"无")
.append(",")
.append(allotBill.getReceiveUserB());
.append(receiveUserbId != null ?userCache.findById(receiveUserbId).getName():"无");
return buf.toString();
}
......
dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -27,6 +27,7 @@ import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.task.subject.bto.TaskLogBto;
import com.tykj.dev.device.task.subject.vo.TaskFileRet;
import com.tykj.dev.device.user.cache.UserCache;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.BlockBusinessEnum;
......@@ -81,6 +82,9 @@ public class AllotBillServiceImpl implements AllotBillService {
@Resource
private TaskLogService taskLogService;
@Resource
private UserCache userCache;
@Override
public AllotBill addEntity(AllotBill allotBillEntity) {
AllotBill allotBill = allotBillDao.save(allotBillEntity);
......@@ -292,13 +296,24 @@ public class AllotBillServiceImpl implements AllotBillService {
private String operatorName(AllotBill allotBill) {
StringBuffer buf = new StringBuffer();
buf.append(allotBill.getSenderUserA())
// buf.append(allotBill.getSenderUserA())
// .append(",")
// .append(allotBill.getSenderUserB())
// .append(",")
// .append(allotBill.getReceiveUserA())
// .append(",")
// .append(allotBill.getReceiveUserB());
Integer sendUseraId = allotBill.getSendUseraId();
Integer sendUserbId = allotBill.getSendUserbId();
Integer receiveUseraId = allotBill.getReceiveUseraId();
Integer receiveUserbId = allotBill.getReceiveUserbId();
buf.append(sendUseraId != null?userCache.findById(sendUseraId).getName():"无")
.append(",")
.append(allotBill.getSenderUserB())
.append(sendUserbId != null ?userCache.findById(sendUserbId).getName():"无")
.append(",")
.append(allotBill.getReceiveUserA())
.append(receiveUseraId != null ?userCache.findById(receiveUseraId).getName():"无")
.append(",")
.append(allotBill.getReceiveUserB());
.append(receiveUserbId != null ?userCache.findById(receiveUserbId).getName():"无");
return buf.toString();
}
......
dev-apply/src/main/java/com/tykj/dev/device/apply/service/impl/DeviceApplyBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -367,14 +367,11 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
}
private String operatorName(DeviceApplyBill deviceApplyBill) {
String agent = deviceApplyBill.getAgent();
StringBuffer buf = new StringBuffer();
buf.append(deviceApplyBill.getApplyUser())
.append(",");
String agent = deviceApplyBill.getAgent();
if (agent != null){
buf.append(agent);
}
.append(",")
.append(agent != null ? agent:"无");
return buf.toString();
}
......
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -230,14 +230,18 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
*/
private String operatorName(RepairBackBill repairBackBill) {
Integer startUseraId = repairBackBill.getStartUseraId();
Integer startUserbId = repairBackBill.getStartUserbId();
Integer receiveUseraId = repairBackBill.getReceiveUseraId();
Integer receiveUserbId = repairBackBill.getReceiveUserbId();
StringBuffer buf = new StringBuffer();
buf.append(userCache.findById(repairBackBill.getStartUseraId()).getName())
buf.append(startUseraId != null ?userCache.findById(startUseraId).getName():"无")
.append(",")
.append(userCache.findById(repairBackBill.getStartUserbId()).getName())
.append(startUserbId != null ?userCache.findById(startUserbId).getName():"无")
.append(",")
.append(userCache.findById(repairBackBill.getReceiveUseraId()).getName())
.append(receiveUseraId !=null ?userCache.findById(receiveUseraId).getName():"无")
.append(",")
.append(userCache.findById(repairBackBill.getReceiveUserbId()).getName());
.append(receiveUserbId != null ?userCache.findById(receiveUserbId).getName():"无");
return buf.toString();
}
......
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairSendBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -24,6 +24,7 @@ import com.tykj.dev.device.repair.subject.domin.RepairBill;
import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
import com.tykj.dev.device.repair.subject.vo.RepairBillSelectVo;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.user.cache.UserCache;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.misc.base.BlockBusinessEnum;
import com.tykj.dev.misc.base.BusinessEnum;
......@@ -76,6 +77,9 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
@Resource
private RepairBillService repairBillService;
@Resource
private UserCache userCache;
@Override
public RepairSendBill addEntity(RepairSendBill deviceRepairSendBillEntity) {
RepairSendBill repairSendBill = deviceRepairSendBillDao.save(deviceRepairSendBillEntity);
......@@ -235,16 +239,28 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
*/
private String operatorName(RepairSendBill repairSendBill) {
// StringBuffer buf = new StringBuffer();
// buf.append(repairSendBill.getStartUserA())
// .append(",")
// .append(repairSendBill.getStartUserB())
// .append(",")
// .append(repairSendBill.getRepairUserA())
// .append(",")
// .append(repairSendBill.getRepairUserB());
// return buf.toString();
Integer startUseraId = repairSendBill.getStartUseraId();
Integer startUserbId = repairSendBill.getStartUserbId();
Integer repairUseraId = repairSendBill.getRepairUseraId();
Integer repairUserbId = repairSendBill.getRepairUserbId();
StringBuffer buf = new StringBuffer();
buf.append(repairSendBill.getStartUserA())
buf.append(startUseraId != null ?userCache.findById(startUseraId).getName():"无")
.append(",")
.append(repairSendBill.getStartUserB())
.append(startUserbId != null ?userCache.findById(startUserbId).getName():"无")
.append(",")
.append(repairSendBill.getRepairUserA())
.append(repairUseraId !=null ?userCache.findById(repairUseraId).getName():"无")
.append(",")
.append(repairSendBill.getRepairUserB());
.append(repairUserbId != null ?userCache.findById(repairUserbId).getName():"无");
return buf.toString();
}
......
dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/config/HistoryDeviceBillRun.java
浏览文件 @ 9d1cc644
......@@ -36,12 +36,12 @@ public class HistoryDeviceBillRun {
private Map<Integer, List<HistoryDeviceBill>> map =new HashMap<>();
// @PostConstruct
// private void initHistoryDeviceBill(){
// log.info("历史自查存储数据表开始同步....");
// this.map = deviceBillDao.findAll().stream().collect(Collectors.groupingBy(HistoryDeviceBill::getBillId));
// log.info("历史自查存储数据表同步成功....");
// }
@PostConstruct
private void initHistoryDeviceBill(){
log.info("历史自查存储数据表开始同步....");
this.map = deviceBillDao.findAll().stream().collect(Collectors.groupingBy(HistoryDeviceBill::getBillId));
log.info("历史自查存储数据表同步成功....");
}
}
dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java
浏览文件 @ 9d1cc644
......@@ -613,6 +613,7 @@ public class SelfCheckController {
executor.execute(()->deviceLogService.addAllLog(deviceLogDtos));
log.info("[自查模块]:发起自查");
myWebSocket.sendMessage1();
selfCheckBillService.update(selfExaminationBillEntity1);
return ResultUtil.success(selfExaminationBillEntity1);
}
......
dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/service/impl/SelfCheckBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -34,6 +34,7 @@ import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
import com.tykj.dev.device.task.subject.vo.TaskUserVo;
import com.tykj.dev.device.user.cache.UserCache;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.BlockBusinessEnum;
......@@ -109,6 +110,9 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
@Resource
UserPublicService userPublicService;
@Resource
private UserCache userCache;
@Override
public SelfCheckBill addEntity(SelfCheckBill selfExaminationBillEntity) {
SelfCheckBill selfCheckBill = selfExaminationBillDao.save(selfExaminationBillEntity);
......@@ -420,22 +424,25 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
SelfCheckBill selfCheckBill1 = JSON.parseObject(bcRecord.getData().getContent(), SelfCheckBill.class);
BlockTraceabilityParsing blockTraceabilityParsing = bcRecord.getData().toBlockTraceabilityParsing();
StringBuffer stringBuffer=new StringBuffer();
stringBuffer.append(StringSplitUtil.stringListToString(selfCheckBill.getDeviceLibraries().stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList())))
.append(",")
.append(StringSplitUtil.stringListToString(selfCheckBill.getHistoryDeviceBills().stream().map(HistoryDeviceBill::getSeqNumber).collect(Collectors.toList())));
List<String> seqList = getSeqList(selfCheckBill);
List<String> seqList1 = getSeqList(selfCheckBill1);
StringBuffer stringBuffer1=new StringBuffer();
stringBuffer1.append(StringSplitUtil.stringListToString(selfCheckBill1.getDeviceLibraries().stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList())))
.append(",")
.append(StringSplitUtil.stringListToString(selfCheckBill1.getHistoryDeviceBills().stream().map(HistoryDeviceBill::getSeqNumber).collect(Collectors.toList())));
// StringBuffer stringBuffer=new StringBuffer();
// stringBuffer.append(StringSplitUtil.stringListToString(selfCheckBill.getDeviceLibraries().stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList())))
// .append(",")
// .append(StringSplitUtil.stringListToString(selfCheckBill.getHistoryDeviceBills().stream().map(HistoryDeviceBill::getSeqNumber).collect(Collectors.toList())));
//
// StringBuffer stringBuffer1=new StringBuffer();
// stringBuffer1.append(StringSplitUtil.stringListToString(selfCheckBill1.getDeviceLibraries().stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList())))
// .append(",")
// .append(StringSplitUtil.stringListToString(selfCheckBill1.getHistoryDeviceBills().stream().map(HistoryDeviceBill::getSeqNumber).collect(Collectors.toList())));
blockTraceabilityParsing.setBusinessTraceabilityParsingData(TraceabilityParsingData.builder()
.billTypeName("自查") //业务名称
// .applyNumber(allotBill.getApplyNumber()) //申请文号
// .replayNumber(allotBill.getReplayNumber()) //批复文号
.fileMd5(selfCheckBill.getFileMd5())
.carrierIds(stringBuffer.toString())//序列号信息
.carrierIds(String.join(",",seqList))//序列号信息
.unitName(selfCheckBill.getCheckUnit())//发起单位
.operationTime(DateUtil.getLocalDateTime(selfCheckBill.getCreateTime()))//发起时间
.operatorUserName(operatorName(selfCheckBill)) //相关人员
......@@ -445,7 +452,7 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
blockTraceabilityParsing.setBlockTraceabilityParsingData(TraceabilityParsingData.builder()
.billTypeName("自查")
.fileMd5(selfCheckBill1.getFileMd5())
.carrierIds(stringBuffer1.toString())//序列号信息
.carrierIds(String.join(",",seqList1))//序列号信息
.unitName(selfCheckBill1.getCheckUnit())//发起单位
.operationTime(DateUtil.getLocalDateTime(selfCheckBill1.getCreateTime()))//发起时间
.operatorUserName(operatorName(selfCheckBill1)) //相关人员
......@@ -455,6 +462,19 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
return blockTraceabilityParsing;
}
private List<String> getSeqList(SelfCheckBill selfCheckBill) {
List<String> allIds = new ArrayList<>();
List<String> notInIds = selfCheckBill.getDeviceLibraries().stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList());
List<String> inIds = selfCheckBill.getHistoryDeviceBills().stream().map(HistoryDeviceBill::getSeqNumber).collect(Collectors.toList());
if (notInIds.size() >0){
allIds.addAll(notInIds);
}
if (inIds.size() >0){
allIds.addAll(inIds);
}
return allIds;
}
@Override
public void historyUpperChain() {
//历史数据 循环查询数据上链
......@@ -466,10 +486,10 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
private String operatorName(SelfCheckBill selfCheckBill) {
StringBuffer buf = new StringBuffer();
Integer userbId = selfCheckBill.getUserbId();
buf.append(selfCheckBill.getCheckUser())
.append(",")
.append(selfCheckBill.getConfirmUser());
.append(userbId != null ? userCache.findById(userbId).getName() :"无");
return buf.toString();
}
......
dev-storage/src/main/java/com/tykj/dev/device/storage/service/impl/StorageBillServiceImpl.java
浏览文件 @ 9d1cc644
......@@ -211,13 +211,14 @@ public class StorageBillServiceImpl implements StorageBillService {
* 拼写相关人员字符
*/
private String operatorName(StorageBill storageBill) {
Integer receiveUseraId = storageBill.getReceiveUseraId();
Integer receiveUserbId = storageBill.getReceiveUserbId();
StringBuffer buf = new StringBuffer();
buf.append(storageBill.getSendUserId())
.append(",")
.append(userCache.findById(storageBill.getReceiveUseraId()).getName())
.append(receiveUseraId != null ?userCache.findById(receiveUseraId).getName():"无")
.append(",")
.append(userCache.findById(storageBill.getReceiveUserbId()).getName());
.append(receiveUserbId != null ?userCache.findById(receiveUserbId).getName():"无");
return buf.toString();
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论