|
|
|
|
@ -10,18 +10,23 @@ import cn.hutool.json.JSONArray;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.alibaba.fastjson.TypeReference;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
|
import com.glxp.api.constant.*;
|
|
|
|
|
import com.glxp.api.dao.basic.*;
|
|
|
|
|
import com.glxp.api.dao.inout.*;
|
|
|
|
|
import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper;
|
|
|
|
|
import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
|
|
|
|
|
import com.glxp.api.dao.purchase.*;
|
|
|
|
|
import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
|
|
|
|
|
import com.glxp.api.dto.RelaySyncDto;
|
|
|
|
|
import com.glxp.api.entity.auth.*;
|
|
|
|
|
import com.glxp.api.entity.basic.*;
|
|
|
|
|
import com.glxp.api.entity.inout.*;
|
|
|
|
|
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
|
|
|
|
|
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
|
|
|
|
|
import com.glxp.api.entity.purchase.*;
|
|
|
|
|
import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
|
|
|
|
|
import com.glxp.api.entity.sync.BasicExportStatusEntity;
|
|
|
|
|
@ -37,6 +42,8 @@ import com.glxp.api.service.auth.*;
|
|
|
|
|
import com.glxp.api.service.basic.*;
|
|
|
|
|
import com.glxp.api.service.inout.*;
|
|
|
|
|
import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
|
|
|
|
|
import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
|
|
|
|
|
import com.glxp.api.service.inv.DeviceInspectTaskService;
|
|
|
|
|
import com.glxp.api.service.system.*;
|
|
|
|
|
import com.glxp.api.service.thrsys.*;
|
|
|
|
|
import com.glxp.api.util.CustomUtil;
|
|
|
|
|
@ -233,7 +240,6 @@ public class HeartService {
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void pushData(SyncDataSetEntity info, Date syncTime, BasicExportTypeEnum exportType) {
|
|
|
|
|
|
|
|
|
|
Date now = new Date();
|
|
|
|
|
String taskId = CustomUtil.getId();
|
|
|
|
|
switch (exportType) {
|
|
|
|
|
@ -270,6 +276,12 @@ public class HeartService {
|
|
|
|
|
case IO_ORDER:
|
|
|
|
|
if (needExec())
|
|
|
|
|
break;
|
|
|
|
|
break;
|
|
|
|
|
case DEVICE_TASK:
|
|
|
|
|
if (needExec(info.getDeviceTask())) {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getDeviceTaskData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -1066,6 +1078,68 @@ public class HeartService {
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
DeviceInspectTaskService deviceInspectTaskService;
|
|
|
|
|
@Resource
|
|
|
|
|
DeviceInspectTaskDetailService deviceInspectTaskDetailService;
|
|
|
|
|
@Value("${file_path}")
|
|
|
|
|
private String filePath;
|
|
|
|
|
@Resource
|
|
|
|
|
FileService fileService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param info
|
|
|
|
|
* @param taskId
|
|
|
|
|
* @param now
|
|
|
|
|
* @param syncTime
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private SpsSyncDeviceTaskResponse getDeviceTaskData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
|
|
|
|
|
SpsSyncDeviceTaskResponse dataResponse = null;
|
|
|
|
|
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
|
|
|
|
|
syncTimeMap.put("isNew", true);
|
|
|
|
|
boolean ge = false;
|
|
|
|
|
if (syncTime != null) {
|
|
|
|
|
ge = true;
|
|
|
|
|
}
|
|
|
|
|
StringBuffer remark = new StringBuffer();
|
|
|
|
|
if (needExec(info.getDeviceTask())) {
|
|
|
|
|
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEVICE_TASK);
|
|
|
|
|
List<DeviceInspectTaskEntity> deviceInspectTaskEntities = deviceInspectTaskService.list(Wrappers.lambdaQuery(DeviceInspectTaskEntity.class)
|
|
|
|
|
.le(!ge && (boolean) map.get("isNew"), DeviceInspectTaskEntity::getUpdateTime, now)
|
|
|
|
|
.between(ge, DeviceInspectTaskEntity::getUpdateTime, syncTime, now)
|
|
|
|
|
.between(!ge && !(boolean) map.get("isNew"), DeviceInspectTaskEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(deviceInspectTaskEntities)) {
|
|
|
|
|
dataResponse = new SpsSyncDeviceTaskResponse();
|
|
|
|
|
dataResponse.setDeviceInspectTaskEntities(deviceInspectTaskEntities);
|
|
|
|
|
|
|
|
|
|
remark.append("设备任务：").append(deviceInspectTaskEntities.size()).append("条\n");
|
|
|
|
|
List<DeviceInspectTaskDetailEntity> datas = new ArrayList<>();
|
|
|
|
|
List<String> files = new ArrayList<>();
|
|
|
|
|
for (DeviceInspectTaskEntity deviceInspectTaskEntity : deviceInspectTaskEntities) {
|
|
|
|
|
List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntities = deviceInspectTaskDetailService.list(new QueryWrapper<DeviceInspectTaskDetailEntity>().eq("taskOrderIdFk", deviceInspectTaskEntity.getOrderId()));
|
|
|
|
|
datas.addAll(deviceInspectTaskDetailEntities);
|
|
|
|
|
for (DeviceInspectTaskDetailEntity detailEntity : deviceInspectTaskDetailEntities) {
|
|
|
|
|
if (StrUtil.isNotEmpty(detailEntity.getInspectImage())) {
|
|
|
|
|
files.add(filePath + detailEntity.getInspectImage().replace(",", ""));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fileService.upload(files);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (dataResponse != null) {
|
|
|
|
|
dataResponse.setTaskId(taskId);
|
|
|
|
|
dataResponse.setType(BasicExportTypeEnum.THIRD_DATA.getRemark());
|
|
|
|
|
dataResponse.setSyncRemark(remark.toString());
|
|
|
|
|
}
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 判断是否需要执行 由内向外
|
|
|
|
|
*
|
|
|
|
|
@ -1623,6 +1697,10 @@ public class HeartService {
|
|
|
|
|
case DOCUMENT_TYPE_DATA:
|
|
|
|
|
this.insertDocumentTypeData(bean.getFileContent());
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DEVICE_TASK:
|
|
|
|
|
this.insertDevTaskData(bean.getFileContent());
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
String taskId = bean.getTaskId();
|
|
|
|
|
if (StrUtil.isNotBlank(taskId)) {
|
|
|
|
|
@ -1716,8 +1794,6 @@ public class HeartService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
FileService fileService;
|
|
|
|
|
private final IdcService idcService;
|
|
|
|
|
|
|
|
|
|
private final IoCodeLostMapper ioCodeLostMapper;
|
|
|
|
|
@ -1778,6 +1854,35 @@ public class HeartService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
DeviceInspectTaskMapper deviceInspectTaskMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
DeviceInspectTaskDetailMapper deviceInspectTaskDetailMapper;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 插入设备任务更新数据
|
|
|
|
|
*/
|
|
|
|
|
@Transactional(propagation = Propagation.NESTED)
|
|
|
|
|
public void insertDevTaskData(String content) {
|
|
|
|
|
cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
|
|
|
|
|
List<DeviceInspectTaskEntity> deviceInspectTaskEntities = JSONUtil.toList(jsonObject.getJSONArray(DeviceInspectTaskEntity.class.getSimpleName()), DeviceInspectTaskEntity.class);
|
|
|
|
|
List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntities = JSONUtil.toList(jsonObject.getJSONArray(DeviceInspectTaskDetailEntity.class.getSimpleName()), DeviceInspectTaskDetailEntity.class);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(deviceInspectTaskEntities)) {
|
|
|
|
|
for (DeviceInspectTaskEntity deviceInspectTaskEntity : deviceInspectTaskEntities) {
|
|
|
|
|
deviceInspectTaskEntity.setUpdateTime(null);
|
|
|
|
|
}
|
|
|
|
|
deviceInspectTaskMapper.replaceBatchs(deviceInspectTaskEntities);
|
|
|
|
|
}
|
|
|
|
|
if (CollectionUtil.isNotEmpty(deviceInspectTaskDetailEntities)) {
|
|
|
|
|
deviceInspectTaskDetailMapper.replaceBatchs(deviceInspectTaskDetailEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<String> syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class);
|
|
|
|
|
if (CollUtil.isNotEmpty(syncFiles)) {
|
|
|
|
|
fileService.download(syncFiles);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 从UDI自助平台拉取基础数据
|
|
|
|
|
*/
|
|
|
|
|
|
郑明梁
2 years ago