删除任务同步相关调整(后续还需调整)

dev2.0
anthonywj 2 years ago
parent 1931ece8a3
commit c3a8c5da54

@ -1,21 +1,41 @@
package com.glxp.api.constant;
/**
* // 任务类型
*/
public interface SocketMsgType {
String DL_ALL_DATA = "DL_ALL_DATA"; //基础数据同步
String DL_NOTICE = "DL_NOTICE"; //通知类消息
/**
*
*/
String TASK_INVOICE_CONFIRM = "TASK_INVOICE_CONFIRM"; //
/**
*
*
*/
String TASK_INVOICE_CONFIRM = "TASK_INVOICE_CONFIRM"; //发票确认
String BASIC_DATA_DELETE = "BASIC_DATA_DELETE"; //
String BASIC_DATA_DELETE = "BASIC_DATA_DELETE"; //耗材字典删除
/**
*
*/
String BASIC_MANAGE_DELETE = "BASIC_MANAGE_DELETE"; //
String BASIC_MANAGE_DELETE = "BASIC_MANAGE_DELETE"; //入援物资维护
/**
*
*/
String BASIC_CORP_MAINTAIN_DELETE = "BASIC_CORP_MAINTAIN_DELETE"; //
String BASIC_CORP_MAINTAIN_DELETE = "BASIC_CORP_MAINTAIN_DELETE"; //供应商字典
/**
*
*/
String BASIC_BUSINESS_TYPE_DELETE = "BASIC_BUSINESS_TYPE_DELETE"; //
String BASIC_BUSINESS_TYPE_DELETE = "BASIC_BUSINESS_TYPE_DELETE"; //单据类型
/**
*
*/
String DEV_TASK_DEL = "DEV_TASK_DEL";
}

@ -0,0 +1,21 @@
package com.glxp.api.constant;
public interface SyncDelType {
/**
*
*/
String BASIC_MAINTAIN = "BASIC_MAINTAIN"; //耗材字典
String BASIC_MANAGE = "BASIC_MANAGE"; //供应商器械信息
String BASIC_CORP_MAINTAIN = "BASIC_CORP_MAINTAIN"; //往来信息维护
String BASIC_BUSINESS_TYPE = "BASIC_BUSINESS_TYPE"; //单据类型设置
/**
*
*/
String DEV_TASK = "DEV_TASK";
}

@ -14,6 +14,7 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
@ -268,7 +269,7 @@ public class BasicBussinessTypeController extends BaseController {
//调用同步删除方法
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest);
basicDataRequest.setKey("BASIC_BUSINESS_TYPE");
basicDataRequest.setKey(SyncDelType.BASIC_BUSINESS_TYPE);
Long userId = getUserId();
spGetHttpClient.deleteBasicData(basicDataRequest,userId+"");

@ -7,6 +7,7 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -351,7 +352,7 @@ public class BasicCorpController extends BaseController {
//调用同步删除的方法
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest);
basicDataRequest.setKey("BASIC_CORP_MAINTAIN");
basicDataRequest.setKey(SyncDelType.BASIC_CORP_MAINTAIN);
Long userId = getUserId();
spGetHttpClient.deleteBasicData(basicDataRequest,userId+"");
return ResultVOUtils.success("删除成功");

@ -10,6 +10,7 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -289,10 +290,9 @@ public class UdiRelevanceController extends BaseController {
//调用同步删除的方法
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest);
basicDataRequest.setKey("BASIC_MAINTAIN");
basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN);
Long userId = getUserId();
spGetHttpClient.deleteBasicData(basicDataRequest,userId+"");
spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
return ResultVOUtils.success("删除成功");
}

@ -9,6 +9,7 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.BasicCorpEntity;
@ -316,7 +317,7 @@ public class UdiRlSupController extends BaseController {
//调用同步删除的方法
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteCompanyFileRequest(deleteCompanyFileRequest);
basicDataRequest.setKey("BASIC_MANAGE");
basicDataRequest.setKey(SyncDelType.BASIC_MANAGE);
Long userId = getUserId();
spGetHttpClient.deleteBasicData(basicDataRequest,userId+"");
return ResultVOUtils.success("成功");

@ -9,10 +9,13 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicExportTypeEnum;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.DeviceStatus;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.basic.BasicDataRequest;
import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
import com.glxp.api.res.inv.DeviceInspectTakeResponse;
import com.glxp.api.res.sync.SpsSyncDeviceTakeResponse;
@ -20,6 +23,7 @@ import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
import com.glxp.api.service.inv.DeviceInspectTaskService;
import com.glxp.api.service.sync.HeartService;
import com.glxp.api.service.sync.SyncDataSetService;
import com.glxp.api.task.SyncHeartService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OkHttpCli;
import com.glxp.api.util.OrderNoTypeBean;
@ -39,7 +43,7 @@ import java.util.List;
*/
@Slf4j
@RestController
public class DeviceInspectTakeController {
public class DeviceInspectTakeController extends BaseController {
@Resource
DeviceInspectTaskService deviceInspectTaskService;
@ -109,14 +113,17 @@ public class DeviceInspectTakeController {
deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity);
deviceInspectTaskDetailService.remove(new QueryWrapper<DeviceInspectTaskDetailEntity>().eq("taskOrderIdFk", deviceInspectTaskEntity.getOrderId()));
UploadDeviceTake(deviceInspectTaskEntity.getId(), 3);
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeviceInspectTaskEntity(deviceInspectTaskEntity);
basicDataRequest.setKey(SyncDelType.DEV_TASK);
Long userId = getUserId();
spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
return ResultVOUtils.success(deviceInspectTaskEntity);
}
@Resource
HeartService heartService;
@Resource
SyncDataSetService syncDataSetService;
SyncHeartService heartService;
void UploadDeviceTake(Long id, Integer type) {
//提交上传到自助
@ -130,16 +137,7 @@ public class DeviceInspectTakeController {
// spsSyncDeviceTakeResponse.setType(type);
// spGetHttpClient.postAllDeviceTake(spsSyncDeviceTakeResponse);
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
ThreadUtil.execAsync(() -> {
try {
heartService.pushData(syncDataSetEntity, null, BasicExportTypeEnum.DEVICE_TASK);
} catch (Exception e) {
log.error(ExceptionUtils.getStackTrace(e));
e.printStackTrace();
}
});
heartService.customPushData(BasicExportTypeEnum.DEVICE_TASK);
}

@ -8,6 +8,7 @@ import com.alibaba.fastjson2.JSON;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicExportTypeEnum;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.sync.BasicExportStatusEntity;
@ -141,18 +142,18 @@ public class SpGetHttpClient {
//日志参数类
DeleteBasicDataRequest deleteBasicDataRequest = new DeleteBasicDataRequest();
deleteBasicDataRequest.setRecordCode("DL"+new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(System.currentTimeMillis()));
deleteBasicDataRequest.setRecordCode("DL" + new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(System.currentTimeMillis()));
deleteBasicDataRequest.setUserId(userId);
String json ="";
switch (basicDataRequest.getKey()){
case "BASIC_MAINTAIN":
String json = "";
switch (basicDataRequest.getKey()) {
case SyncDelType.BASIC_MAINTAIN:
deleteBasicDataRequest.setDataType(basicDataRequest.getKey());
deleteBasicDataRequest.setParam(JSONUtil.toJsonStr(basicDataRequest.getDeleteRequest()) + basicDataRequest.getKey());
deleteBasicDataRequest.setName("耗材字典维护");
basicDataRequest.setDeleteBasicDataRequest(deleteBasicDataRequest);
json = JSONUtil.toJsonStr(basicDataRequest);
break;
case "BASIC_MANAGE":
case SyncDelType.BASIC_MANAGE:
deleteBasicDataRequest.setDataType(basicDataRequest.getKey());
deleteBasicDataRequest.setParam(JSONUtil.toJsonStr(basicDataRequest.getDeleteCompanyFileRequest()) + basicDataRequest.getKey());
deleteBasicDataRequest.setName("供应商器械信息");
@ -160,14 +161,14 @@ public class SpGetHttpClient {
json = JSONUtil.toJsonStr(basicDataRequest);
break;
case "BASIC_CORP_MAINTAIN":
case SyncDelType.BASIC_CORP_MAINTAIN:
deleteBasicDataRequest.setDataType(basicDataRequest.getKey());
deleteBasicDataRequest.setParam(JSONUtil.toJsonStr(basicDataRequest.getDeleteRequest()) + basicDataRequest.getKey());
deleteBasicDataRequest.setName("往来信息维护");
basicDataRequest.setDeleteBasicDataRequest(deleteBasicDataRequest);
json = JSONUtil.toJsonStr(basicDataRequest);
break;
case "BASIC_BUSINESS_TYPE":
case SyncDelType.BASIC_BUSINESS_TYPE:
deleteBasicDataRequest.setDataType(basicDataRequest.getKey());
deleteBasicDataRequest.setParam(JSONUtil.toJsonStr(basicDataRequest.getDeleteRequest()) + basicDataRequest.getKey());
deleteBasicDataRequest.setName("单据类型设置");
@ -175,6 +176,14 @@ public class SpGetHttpClient {
json = JSONUtil.toJsonStr(basicDataRequest);
break;
case SyncDelType.DEV_TASK:
deleteBasicDataRequest.setDataType(basicDataRequest.getKey());
deleteBasicDataRequest.setParam(JSONUtil.toJsonStr(basicDataRequest.getDeviceInspectTaskEntity()) + basicDataRequest.getKey());
deleteBasicDataRequest.setName("设备任务删除");
basicDataRequest.setDeleteBasicDataRequest(deleteBasicDataRequest);
json = JSONUtil.toJsonStr(basicDataRequest);
break;
default:
break;
}
@ -189,13 +198,13 @@ public class SpGetHttpClient {
JSONObject.parseObject(result, new TypeReference<BaseResponse>() {
});
//插入操作日志
insertLog(deleteBasicDataRequest,response,userId);
insertLog(deleteBasicDataRequest, response, userId);
//插入操作数据类型记录表
insertType(deleteBasicDataRequest);
return response;
}
public void insertLog( DeleteBasicDataRequest deleteBasicDataRequest,BaseResponse response,String userId){
public void insertLog(DeleteBasicDataRequest deleteBasicDataRequest, BaseResponse response, String userId) {
SyncEditLogEntity syncEditLogEntity = new SyncEditLogEntity();
syncEditLogEntity.setRecordCode(deleteBasicDataRequest.getRecordCode());
syncEditLogEntity.setOperType(2);
@ -209,7 +218,7 @@ public class SpGetHttpClient {
syncEditLogService.insertLog(syncEditLogEntity);
}
public void insertType(DeleteBasicDataRequest deleteBasicDataRequest){
public void insertType(DeleteBasicDataRequest deleteBasicDataRequest) {
SyncEditTypeEntity syncEditTypeEntity = new SyncEditTypeEntity();
syncEditTypeEntity.setCode(deleteBasicDataRequest.getDataType());
syncEditTypeEntity.setName(deleteBasicDataRequest.getName());
@ -217,7 +226,6 @@ public class SpGetHttpClient {
}
public BaseResponse<IoOrderEntity> getSimpleOrder(ReviewSpmsRequest reviewSpmsRequest, String userId) {
String json = JSONUtil.toJsonStr(reviewSpmsRequest);
List<String> header = (List<String>) Convert.toList(buildHeader());
@ -600,7 +608,7 @@ public class SpGetHttpClient {
//上传设备任务
public BaseResponse<String> postAllDeviceTake(SpsSyncDeviceTakeResponse spsSyncDeviceTakeResponse) {
String json = JSONUtil.toJsonStr(spsSyncDeviceTakeResponse);
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/deviceTakeApi/sps/sync/deviceTake/upload", json, buildHeader());
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/deviceTakeApi/sps/sync/deviceTake/upload", json, buildHeader());
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});

@ -1,17 +1,29 @@
package com.glxp.api.req.basic;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.req.system.DeleteCompanyFileRequest;
import com.glxp.api.req.system.DeleteRequest;
import lombok.Data;
@Data
public class BasicDataRequest {
//耗材字典
private DeleteRequest deleteRequest;
//供应商器械信息
private DeleteCompanyFileRequest deleteCompanyFileRequest;
//日志参数类
private DeleteBasicDataRequest deleteBasicDataRequest;
private String key;
/**
*
*/
private DeleteRequest deleteRequest;
/**
*
*/
private DeleteCompanyFileRequest deleteCompanyFileRequest;
/**
*
*/
private DeleteBasicDataRequest deleteBasicDataRequest;
/**
*
*/
private DeviceInspectTaskEntity deviceInspectTaskEntity;
private String key;
}

@ -1102,7 +1102,6 @@ public class HeartService {
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)

@ -72,7 +72,7 @@ public class SocketMsgService {
//插入日志
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
break;
case SocketMsgType.BASIC_BUSINESS_TYPE_DELETE:
object = JSON.parseObject(String.valueOf(socketMsgEntity.getContent()), Map.class);
basicDataRequest = JSON.parseObject(String.valueOf(socketMsgEntity.getContent()), BasicDataRequest.class);
@ -81,6 +81,14 @@ public class SocketMsgService {
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
case SocketMsgType.DEV_TASK_DEL:
// basicDataRequest = JSON.parseObject(String.valueOf(socketMsgEntity.getContent()), BasicDataRequest.class);
// baseResponse = deleteBussinessType(basicDataRequest.getDeleteRequest());
// insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
// insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
default:
break;
}
@ -147,7 +155,7 @@ public class SocketMsgService {
return ResultVOUtils.success("成功");
}
public BaseResponse deleteBasicUnitMaintain( DeleteRequest deleteRequest) {
public BaseResponse deleteBasicUnitMaintain(DeleteRequest deleteRequest) {
String id = deleteRequest.getId();
@ -159,7 +167,7 @@ public class SocketMsgService {
return ResultVOUtils.success("删除成功");
}
public BaseResponse deleteBussinessType( DeleteRequest deleteRequest) {
public BaseResponse deleteBussinessType(DeleteRequest deleteRequest) {
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

@ -1,5 +1,6 @@
package com.glxp.api.task;
import cn.hutool.core.thread.ThreadUtil;
import com.glxp.api.constant.BasicExportTypeEnum;
import com.glxp.api.dao.system.SyncDataSetDao;
import com.glxp.api.entity.system.SyncDataSetEntity;
@ -57,6 +58,17 @@ public class SyncHeartService {
}
}
public void customPushData(BasicExportTypeEnum basicExportTypeEnum) {
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
ThreadUtil.execAsync(() -> {
try {
heartService.pushData(syncDataSetEntity, null, basicExportTypeEnum);
} catch (Exception e) {
log.error(ExceptionUtils.getStackTrace(e));
}
});
}
public void pushOrder() {
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
if (!syncDataSetEntity.isDownstreamEnable()) {

Loading…
Cancel
Save