Skip to content

P
patzn-cloud-service-hmhj
Commit 1ed9f46a by lijingjing
Options

添加推送日志；

parent 5fdeba93
Showing with 114 additions and 120 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/common/ErpRequest.java
......@@ -19,52 +19,52 @@ public class ErpRequest {
private static final Logger logger = LoggerFactory.getLogger(ErpRequest.class);
public static ErpRespResult sendPost(String url, Map<String, ?> params, HttpHeaders headers) {
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ [url, params, headers]");
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ url:{}", url);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ params:{}", JacksonUtils.toJSONString(params));
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ headers:{}", JacksonUtils.toJSONString(headers));
logger.info("==== ErpRequest ==== sendPost ====> [url, params, headers]");
logger.info("==== ErpRequest ==== sendPost ====> url:{}", url);
logger.info("==== ErpRequest ==== sendPost ====> params:{}", JacksonUtils.toJSONString(params));
logger.info("==== ErpRequest ==== sendPost ====> headers:{}", JacksonUtils.toJSONString(headers));
try {
String resultStr = RestTemplateUtils.sendPost(url, params, headers);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ resultStr: {}", resultStr);
logger.info("==== ErpRequest ==== sendPost ====> resultStr: {}", resultStr);
if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ DPS响应结果为空!");
return ErpRespResult.failure("DPS响应结果为空!");
logger.error("==== ErpRequest ==== sendPost ====> ERP响应结果为空!");
return ErpRespResult.failure("ERP响应结果为空!");
}
ErpRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<ErpRespResult>() {
});
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ result: {}", JacksonUtils.toJSONString(result));
logger.info("==== ErpRequest ==== sendPost ====> result: {}", JacksonUtils.toJSONString(result));
if (Objects.isNull(result)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求DPS接口失败：{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求DPS接口失败!");
logger.error("==== ErpRequest ==== sendPost ====> 请求ERP接口失败：{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求ERP接口失败!");
}
return result;
} catch (Exception e) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求DPS接口异常：", e);
return ErpRespResult.failure("请求DPS接口异常!");
logger.error("==== ErpRequest ==== sendPost ====> 请求ERP接口异常：", e);
return ErpRespResult.failure("请求ERP接口异常!");
}
}
public static <T> ErpRespResult<T> sendGet(String url, Map<String, ?> params, TypeReference<ErpRespResult<T>> typeReference) {
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ [url, params, typeReference]");
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ url:{}", url);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ params:{}", JacksonUtils.toJSONString(params));
logger.info("==== ErpRequest ==== sendGet ====> [url, params, typeReference]");
logger.info("==== ErpRequest ==== sendGet ====> url:{}", url);
logger.info("==== ErpRequest ==== sendGet ====> params:{}", JacksonUtils.toJSONString(params));
try {
String resultStr = RestTemplateUtils.sendGet(url, params);
if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ DPS响应结果为空!");
return ErpRespResult.failure("DPS响应结果为空!");
logger.error("==== ErpRequest ==== sendGet ====> ERP响应结果为空!");
return ErpRespResult.failure("ERP响应结果为空!");
}
ErpRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ resultStr: {}", resultStr);
logger.info("==== ErpRequest ==== sendGet ====> resultStr: {}", resultStr);
if (Objects.isNull(result)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ 请求DPS接口失败：{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求DPS接口失败!");
logger.error("==== ErpRequest ==== sendGet ====> 请求ERP接口失败：{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求ERP接口失败!");
}
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ result: {}", JacksonUtils.toJSONString(result));
logger.info("==== ErpRequest ==== sendGet ====> result: {}", JacksonUtils.toJSONString(result));
return result;
} catch (Exception e) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ 请求DPS接口异常：", e);
return ErpRespResult.failure("请求DPS接口异常!");
logger.error("==== ErpRequest ==== sendGet ====> 请求ERP接口异常：", e);
return ErpRespResult.failure("请求ERP接口异常!");
}
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/common/WmsRequest.java
......@@ -17,50 +17,50 @@ public class WmsRequest {
private static final Logger logger = LoggerFactory.getLogger(WmsRequest.class);
public static <T> T sendPost(String url, Map<String, ?> params, TypeReference<WmsRespResult<T>> typeReference) {
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ [url,params,typeReference]");
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ url: {}", url);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ params: {}", JacksonUtils.toJSONString(params));
logger.info("==== WmsRequest ==== sendPost ====> [url,params,typeReference]");
logger.info("==== WmsRequest ==== sendPost ====> url: {}", url);
logger.info("==== WmsRequest ==== sendPost ====> params: {}", JacksonUtils.toJSONString(params));
try {
String resultStr = RestTemplateUtils.sendPost(url, params);
if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ WMS响应结果为空!");
logger.error("==== WmsRequest ==== sendPost ====> WMS响应结果为空!");
return null;
}
WmsRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ result: {}",JacksonUtils.toJSONString(result));
logger.info("==== WmsRequest ==== sendPost ====> result: {}",JacksonUtils.toJSONString(result));
if (!result.success()) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口失败：{}", JacksonUtils.toJSONString(result));
logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口失败：{}", JacksonUtils.toJSONString(result));
return null;
}
T data = result.getData();
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ [url, params]: {}", JacksonUtils.toJSONString(data.toString()));
logger.info("==== WmsRequest ==== sendPost ====> [url, params]: {}", JacksonUtils.toJSONString(data.toString()));
return data;
} catch (Exception e) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口异常：", e);
logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口异常：", e);
}
return null;
}
public static WmsRespResult sendPost(String url, Map<String, ?> params) {
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ [url,params]");
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ url: {}", url);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ params: {}", JacksonUtils.toJSONString(params));
logger.info("==== WmsRequest ==== sendPost ====> [url,params]");
logger.info("==== WmsRequest ==== sendPost ====> url: {}", url);
logger.info("==== WmsRequest ==== sendPost ====> params: {}", JacksonUtils.toJSONString(params));
try {
String resultStr = RestTemplateUtils.sendPost(url, params);
if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ WMS响应结果为空!");
logger.error("==== WmsRequest ==== sendPost ====> WMS响应结果为空!");
return WmsRespResult.failure("WMS响应结果为空!");
}
WmsRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<WmsRespResult>() {
});
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ result: {}",JacksonUtils.toJSONString(result));
logger.info("==== WmsRequest ==== sendPost ====> result: {}",JacksonUtils.toJSONString(result));
if (!result.success()) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口失败：{}", JacksonUtils.toJSONString(result));
logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口失败：{}", JacksonUtils.toJSONString(result));
return WmsRespResult.failure(result.getDescription());
}
return result;
} catch (Exception e) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口异常：", e);
logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口异常：", e);
return WmsRespResult.failure("请求WMS接口异常");
}
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemController.java
......@@ -29,6 +29,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.Map;
......@@ -734,8 +735,8 @@ public class EntrustSampleItemController extends ServiceController {
@ApiOperation(value = "模拟测试发送数据到ERP", notes = "模拟测试发送数据到ERP")
@PostMapping("/send_erp_data")
@Login(action = Action.Skip)
public RestResult<Boolean> sendErpData(@RequestBody List<Long> entrustIds) {
return success(entrustSampleItemService.sendErpData(entrustIds));
public RestResult<Boolean> sendErpData(@RequestParam Long entrustId) {
return success(entrustSampleItemService.sendErpData(Collections.singletonList(entrustId)));
}
@ApiOperation(value = "根据检测项目ID退回原始记录", notes = "根据检测项目ID退回原始记录")
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java
......@@ -346,25 +346,25 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
@Transactional(rollbackFor = Exception.class)
protected void generateCompareItems(Long[] ids, Account account) {
if (ArrayUtils.isEmpty(ids)) {
logger.error("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ 报告IDS数据为空！");
logger.error("==== EntrustReportServiceImpl ==== generateCompareItems ====> 报告IDS数据为空！");
return;
}
List<EntrustReportRelSample> relSamples = entrustReportRelSampleService.list(Condition.create().in("report_id", ids));
if (CollectionUtils.isEmpty(relSamples)) {
logger.error("No rel samples found");
logger.error("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ rel samples not found！");
logger.error("==== EntrustReportServiceImpl ==== generateCompareItems ====> rel samples not found！");
return;
}
List<Long> sampleIds = relSamples.stream().map(EntrustReportRelSample::getSampleId).distinct().collect(Collectors.toList());
EntrustSample sample = entrustSampleService.getById(sampleIds.get(0));
String sampleName = sample.getName();
logger.info("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ [sampleName]: {}", sampleName);
logger.info("==== EntrustReportServiceImpl ==== generateCompareItems ====> [sampleName]: {}", sampleName);
if (!(Objects.equals(sampleName, "原铝") || Objects.equals(sampleName, "铝成品"))) {
logger.info("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ 非【原铝,铝成品】样品，不予处理！");
logger.info("==== EntrustReportServiceImpl ==== generateCompareItems ====> 非【原铝,铝成品】样品，不予处理！");
return;
}
logger.info("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ 开始比对检测项目数据！");
logger.info("==== EntrustReportServiceImpl ==== generateCompareItems ====> 开始比对检测项目数据！");
SlotQueryDTO slotQuery = new SlotQueryDTO();
slotQuery.setSampleIds(sampleIds);
// 每次提交编制报告时，添加对比记录
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
......@@ -1470,11 +1470,11 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
* @param sampleBrandMap
*/
private void sendTestDataToErp(List<Long> ids, Map<Long, String> sampleBrandMap) {
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ [ids]: {}", StringUtils.join(ids, ","));
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ [sampleBrandMap]: {}", JacksonUtils.toJSONString(sampleBrandMap));
logger.info("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> [ids]: {}", StringUtils.join(ids, ","));
logger.info("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> [sampleBrandMap]: {}", JacksonUtils.toJSONString(sampleBrandMap));
List<EntrustSample> sampleList = entrustSampleService.getBatchIds(ids);
if (CollectionUtils.isEmpty(sampleList)) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ sampleList为空,不予发送！");
logger.error("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> sampleList为空,不予发送！");
return;
}
// 获取编号集
......@@ -1483,11 +1483,11 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
//
EntrustSample sample = sampleList.get(0);
String sampleName = sample.getName();
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ [样品名称]: {}", sampleName);
logger.info("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> [样品名称]: {}", sampleName);
// 只针对原铝和铝成品,原铝重取只是对原铝的补充
final String ylname = "原铝", cqname = "原铝重取", cpname = "铝成品";
if (!(Objects.equals(ylname, sampleName) || Objects.equals(cqname, sampleName) || Objects.equals(cpname, sampleName))) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ 非原铝或铝成品，不予发送！");
logger.error("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> 非原铝或铝成品，不予发送！");
return;
}
......@@ -1504,7 +1504,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
// 当为原铝时，判断是否存在重取，如果存在重取，需要在重取时触发,也就是下个条件下触发，如果不存在重取，那么直接发
// == 若存在，那么需要在重取阶段处理（重取样品，报告发送再处理）
if (itemComparisonService.isExistCompareData(sampleCodeList)) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ 存在需要重取的样品，需要重取时再发送!");
logger.error("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> 存在需要重取的样品，需要重取时再发送!");
return;
}
dataList = entrustSampleItemIndexService.listSampleItemIndex(null, ids);
......@@ -1528,7 +1528,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
// 基本上不可能为空的
if (CollectionUtils.isEmpty(entrustIds)) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ 根据样品编号获取委托id失败！");
logger.error("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> 根据样品编号获取委托id失败！");
return;
}
// 根据委托去查询，也只能根据委托去查询
......@@ -1569,10 +1569,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
logger.error("DATA_ITEM: {}", t);
});
try {
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ 开始准备发送ERP数据！");
logger.info("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> 开始准备发送ERP数据！");
doSendErpData(dataList);
} catch (Exception e) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendTestDataToErp ✦✦✦✈ 发送ERP数据时异常：", e);
logger.error("==== EntrustSampleItemServiceImpl ==== sendTestDataToErp ====> 发送ERP数据时异常：", e);
}
}
......@@ -1595,62 +1595,54 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
private void doSendErpData(List<Map<String, Object>> dataList) {
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ doSendErpData ✦✦✦✈ 开始发送数据！");
logger.info("==== EntrustSampleItemServiceImpl ==== doSendErpData ====> 开始发送数据！");
HttpHeaders headers = new HttpHeaders();
headers.add("token", getErpToken());
headers.add("Content-Type", HttpConst.CONTENT_TYPE);
headers.add("Accept-Encoding", HttpConst.ACCEPT_ENCODING);
headers.setContentType(MediaType.APPLICATION_JSON);
List<Map<String, Object>> failureList = new ArrayList<>();
for (Map<String, Object> data : dataList) {
/*
String json = JSONObject.toJSONString(data);
log("要发送的样品数据为：" + json);
String result = OkHttpUtils.sendByPostJson(serviceProperties.buildErpUrl("SaveData"), getErpToken(), json);
log("发送结果:" + result);
if (StringUtils.isNotBlank(result)) {
JSONObject jsonObject = JSON.parseObject(result);
log("发送JSON响应结果====");
// ==
String flag = jsonObject.getString("flag"), message = jsonObject.getString("message"),
code = jsonObject.getString("code"), msg = jsonObject.getString("msg");
Boolean success = jsonObject.getBoolean("success");
log("响应结果：flag=" + flag);
log("响应结果：message=" + message);
log("响应结果：code=" + code);
log("响应结果：msg=" + msg);
// 若成功 ，则更新标识
if (Objects.equals(flag, "1") || (Objects.equals(code, "1") && success)) {
log("响应成功，更新本地库是否发送标识！");
entrustSampleService.update(new EntrustSample().setSendErp(1), Condition.create().eq("code", data.get("sample_code")));
} else {
log("响应失败！，错误为：" + msg);
doExecuteSendErpData(headers, data, 0, failureList);
}
logger.error("==== EntrustSampleItemServiceImpl ==== doSendErpData ====> 推送ERP失败数据：failureList");
logger.error("==== EntrustSampleItemServiceImpl ==== doSendErpData ====> failureList：{}", JacksonUtils.toJSONString(failureList));
if (CollectionUtils.isNotEmpty(failureList)) {
for (Map<String, Object> failData : failureList) {
logger.error("==== EntrustSampleItemServiceImpl ==== doSendErpData ====> 重新推送ERP数据：{}", JacksonUtils.toJSONString(failData));
doExecuteSendErpData(headers, failData, 1, null);
}
}
}
}*/
private void doExecuteSendErpData(HttpHeaders headers, Map<String, Object> data, int type, List<Map<String, Object>> failureList) {
String prompt = (type > 0 ? "==== 失败重新推送 " : "") + "==== EntrustSampleItemServiceImpl ==== doSendErpData ====>{}: {}";
ErpRespResult result = ErpRequest.sendPost(serviceProperties.buildErpUrl("SaveData"), data, headers);
if (!result.success()) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ doSendErpData ✦✦✦✈ ：{}", JacksonUtils.toJSONString(result));
logger.error(prompt, "result", JacksonUtils.toJSONString(result));
if (null != failureList) {
logger.error(prompt, "failureData", JacksonUtils.toJSONString(data));
failureList.add(data);
}
} else {
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ doSendErpData ✦✦✦✈ 推送DPS数据成功，更新样品推送状态！");
logger.info(prompt, "msg", "推送ERP数据成功，更新样品推送状态！");
entrustSampleService.update(new EntrustSample().setSendErp(1), Condition.create().eq("code", data.get("sample_code")));
}
}
}
private String getErpToken() {
String url = serviceProperties.buildWmsUrl("Login");
String url = serviceProperties.buildErpUrl("Login");
String token = "";
ErpRespResult<String> result = ErpRequest.sendGet(url, null, new TypeReference<ErpRespResult<String>>() {
});
if (result.success()) {
token = result.getMessage();
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ getErpToken ✦✦✦✈ [token]: {}", token);
logger.info("==== EntrustSampleItemServiceImpl ==== getErpToken ====> token: {}", token);
} else {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ getErpToken ✦✦✦✈ token获取失败！：{}", JacksonUtils.toJSONString(result));
logger.error("==== EntrustSampleItemServiceImpl ==== getErpToken ====> token获取失败: {}", JacksonUtils.toJSONString(result));
// 若为空，使用默认token
token = serviceProperties.getErpToken();
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ getErpToken ✦✦✦✈ 使用默认[token]:{}", token);
logger.error("==== EntrustSampleItemServiceImpl ==== getErpToken ====> 使用默认token:{}", token);
}
return token;
}
......@@ -1786,15 +1778,16 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
public Boolean sendErpData(List<Long> entrustIds) {
RestAssert.fail(CollectionUtils.isEmpty(entrustIds), "请选择要发送数据的委托！");
Entrust entrust = entrustService.getById(entrustIds.get(0));
RestAssert.fail(Objects.isNull(entrust), "要发送的委托信息查询为空!");
RestAssert.fail(!Arrays.asList("原铝", "铝成品").contains(entrust.getSampleName()), "非原铝或铝成品不予发送！");
List<Map<String, Object>> mapList = entrustSampleItemIndexService.listSampleItemIndex(entrustIds, null);
RestAssert.fail(CollectionUtils.isEmpty(mapList), "数据为空，取消发送！");
try {
logger.info("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendErpData ✦✦✦✈ 准备发送数据！");
logger.info("==== EntrustSampleItemServiceImpl ==== sendErpData ====> 准备发送数据！");
doSendErpData(mapList);
return true;
} catch (Exception e) {
logger.error("✦✦✦✦ EntrustSampleItemServiceImpl ✦✦✦✦ sendErpData ✦✦✦✈ 发送数据时异常：", e);
logger.error("==== EntrustSampleItemServiceImpl ==== sendErpData ====> 发送数据时异常：", e);
RestAssert.fail("请求失败，请稍后重试！");
}
return false;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
......@@ -2444,9 +2444,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
@Override
public void postWmsEntrustData(List<Entrust> entrustList) {
logger.info("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ postWmsEntrustData ✦✦✦✈ 准备推送委托数据至WMS系统！");
logger.info("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 准备推送委托数据至WMS系统！");
if (CollectionUtils.isEmpty(entrustList)) {
logger.error("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ postWmsEntrustData ✦✦✦✈ 委托信息为空，取消推送！");
logger.error("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 委托信息为空，取消推送！");
return;
}
// 查询委托ids
......@@ -2457,7 +2457,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
.in("entrust_ids", entrustIds));
// 是否为空，为空返回不发送
if (CollectionUtils.isEmpty(sampleList)) {
logger.error("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ postWmsEntrustData ✦✦✦✈ 样品信息为空，取消发送！");
logger.error("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 样品信息为空，取消发送！");
return;
}
// 以委托id分组的Map数据供发送使用
......@@ -2479,7 +2479,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
}
private void doSendWmsEntrustData(String code, EntrustSample sample) {
logger.info("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ doSendWmsEntrustData ✦✦✦✈ 开始推送委托数据至WMS系统！");
logger.info("==== EntrustSampleServiceImpl ==== doSendWmsEntrustData ====> 开始推送委托数据至WMS系统！");
String url = serviceProperties.buildWmsUrl(HttpConst.WMS_SYNC_WTBH);
// 设置请求参数
Map<String, Object> map = new HashMap<>();
......@@ -2489,7 +2489,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
map.put("CreateDate", new Date());
WmsRespResult result = WmsRequest.sendPost(url, map);
if (Objects.nonNull(result)) {
logger.info("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ doSendWmsEntrustData ✦✦✦✈ 委托信息推送WMS数据成功!");
logger.info("==== EntrustSampleServiceImpl ==== doSendWmsEntrustData ====> 委托信息推送WMS数据成功!");
return;
}
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
......@@ -319,24 +319,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
if (Objects.equals(category, "碳素侧原料原辅料") || Objects.equals(category, "铝侧原料原辅料")) {
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [category]: {}", category);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [category]: {}", category);
String abbr = params.get("abbr");
String inspectionCode = qualityInspectionCodeService.getCodeAbsentCreate(account);
String queryKey = abbr + DateUtils.dateTransfer(new Date(), "yyMMdd") + inspectionCode;
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [abbr, inspectionCode, queryKey]: {},{},{}", abbr, inspectionCode, queryKey);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [abbr, inspectionCode, queryKey]: {},{},{}", abbr, inspectionCode, queryKey);
sampleCode = entrustSampleService.getNewCode(queryKey, "first_code", 3);
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [sampleCode]: {}", sampleCode);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [sampleCode]: {}", sampleCode);
// 二级加密编码：abbr + 流水号 + 其他随机字符
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ secondCode");
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [abbr]: {}", abbr);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> secondCode");
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [abbr]: {}", abbr);
String sn = sampleCode.substring(sampleCode.length() - 3);
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [sn]: {}", sn);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [sn]: {}", sn);
String timestamp = (System.currentTimeMillis() + "").substring(2);
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [timestamp]: {}", timestamp);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [timestamp]: {}", timestamp);
String randomStr = RandomUtils.getRandomStr(4);
// 保证二级加密编码不重复
secondCode = abbr + sn + timestamp + randomStr;
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [secondCode]: {}", secondCode);
logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [secondCode]: {}", secondCode);
}
// 电解质散样样品编号处理
......@@ -542,7 +542,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
if (CollectionUtils.isEmpty(itemList)) {
RestAssert.fail(isSubmit, String.format("第【%d】行样品，检测项目为空!", index));
index++;
logger.error("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ saveEntrustDTO ✦✦✦✈ 【{},{}】检测项目数据为空！", sample.getId(), sample.getCode());
logger.error("==== EntrustServiceImpl ==== saveEntrustDTO ====> 【{},{}】检测项目数据为空！", sample.getId(), sample.getCode());
continue;
}
index++;
......@@ -807,7 +807,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
} else {
RestAssert.fail(isSubmit, String.format("第【%d】行样品，检测项目为空!", index));
logger.error("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ editEntrust ✦✦✦✈ 【{}，{}】检测项目数据为空!", sample.getId(), sample.getCode());
logger.error("==== EntrustServiceImpl ==== editEntrust ====> 【{}，{}】检测项目数据为空!", sample.getId(), sample.getCode());
}
index++;
}
......@@ -1296,7 +1296,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
//
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("entrust_sample_id", oldSampleId).eq("deleted", 0));
if (CollectionUtils.isEmpty(itemList)) {
logger.error("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ cloneEntrust ✦✦✦✈ 【{}，{}】检测项目数据为空!", sample.getId(), sample.getCode());
logger.error("==== EntrustServiceImpl ==== cloneEntrust ====> 【{}，{}】检测项目数据为空!", sample.getId(), sample.getCode());
continue;
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ItemComparisonServiceImpl.java
......@@ -152,11 +152,11 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
@Override
public boolean saveCompareDataBatch(SlotQueryDTO queryDTO, Account account) {
logger.info("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ [queryDTO]: {}", JacksonUtils.toJSONString(queryDTO));
logger.info("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> [queryDTO]: {}", JacksonUtils.toJSONString(queryDTO));
List<ItemComparison> comparisonList = listCompareItems(queryDTO);
logger.info("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ [comparisonList]: {}", JacksonUtils.toJSONString(comparisonList));
logger.info("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> [comparisonList]: {}", JacksonUtils.toJSONString(comparisonList));
if (CollectionUtils.isEmpty(comparisonList)) {
logger.error("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ 比对的检测项目数据为空！");
logger.error("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> 比对的检测项目数据为空！");
return false;
}
// ==
......@@ -165,10 +165,10 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
ItemComparison comparison = comparisonList.get(0);
queryDTO.setQueryDate(DateUtils.str2Date(comparison.getCompareDate()));
queryDTO.setSampleName(comparison.getSampleName());
logger.info("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ [ItemComparison.queryDTO]: {}", JacksonUtils.toJSONString(queryDTO));
logger.info("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> [ItemComparison.queryDTO]: {}", JacksonUtils.toJSONString(queryDTO));
// 根据时间查询是否有存在的数据
List<ItemComparison> itemComparisonList = baseMapper.selectDataPage(new Page(1, Integer.MAX_VALUE), queryDTO);
logger.info("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ [itemComparisonList]: {}", JacksonUtils.toJSONString(itemComparisonList));
logger.info("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> [itemComparisonList]: {}", JacksonUtils.toJSONString(itemComparisonList));
// 老数据Map组信息，用来取Id
Map<String, ItemComparison> comparisonMap = new HashMap<>(4);
// 组list,过滤重复数据
......@@ -189,7 +189,7 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
d.setUid(account.getUserId());
}
});
logger.info("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ data handler: {}", JacksonUtils.toJSONString(comparisonList));
logger.info("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> data handler: {}", JacksonUtils.toJSONString(comparisonList));
}
return super.saveOrUpdateBatch(comparisonList);
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/StatisticsServiceImpl.java
......@@ -343,7 +343,7 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
return inventoryList.stream().map(d -> d.convert(WmsInventory.class)).collect(Collectors.toList());
}
} catch (Exception e) {
logger.error("✦✦✦✦ StatisticsServiceImpl ✦✦✦✦ getInventoryList ✦✦✦✈ 转换数据时异常：", e);
logger.error("==== StatisticsServiceImpl ==== getInventoryList ====> 转换数据时异常：", e);
}
return dataList;
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/WmsStockDeliveryServiceImpl.java
......@@ -78,9 +78,9 @@ public class WmsStockDeliveryServiceImpl extends BaseServiceImpl<WmsStockDeliver
@Override
public boolean syncStockDelivery(WmsStockDeliveryData data) {
logger.info("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 开始同步出入库记录！");
logger.info("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 开始同步出入库记录！");
if (Objects.isNull(data)) {
logger.error("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 出入库信息为空，取消同步！");
logger.error("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 出入库信息为空，取消同步！");
return false;
}
boolean result = false;
......@@ -90,9 +90,9 @@ public class WmsStockDeliveryServiceImpl extends BaseServiceImpl<WmsStockDeliver
delivery.setCtime(new Date());
delivery.setUid(0L);
result = super.save(delivery);
logger.info("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 数据同步完成：{}", JacksonUtils.toJSONString(delivery));
logger.info("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 数据同步完成：{}", JacksonUtils.toJSONString(delivery));
} catch (Exception e) {
logger.error("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 类型转换失败：", e);
logger.error("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 类型转换失败：", e);
}
return result;
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/WmsStockServiceImpl.java
......@@ -74,16 +74,16 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc
List<WmsStockData> dataList = WmsRequest.sendPost(url, map, new TypeReference<WmsRespResult<List<WmsStockData>>>() {
});
if (CollectionUtils.isEmpty(dataList)) {
logger.error("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncWmsStockData ✦✦✦✈ 出入库数据为空!");
logger.error("==== WmsStockServiceImpl ==== syncWmsStockData ====> 出入库数据为空!");
return;
}
// 同步更新WMS库存数据
logger.debug("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncWmsStockData ✦✦✦✈ 开始同步WMS数据！");
logger.debug("==== WmsStockServiceImpl ==== syncWmsStockData ====> 开始同步WMS数据！");
try {
List<WmsStock> stockList = convertList(dataList);
Optional.ofNullable(stockList).ifPresent(this::saveOrUpdateBatch);
} catch (Exception e) {
logger.error("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncUpdateWmsStockData ✦✦✦✈ 转换数据失败：", e);
logger.error("==== WmsStockServiceImpl ==== syncUpdateWmsStockData ====> 转换数据失败：", e);
}
}
......@@ -95,7 +95,7 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc
public List<WmsStock> convertList(List<WmsStockData> list) {
if (CollectionUtils.isEmpty(list)) {
logger.error("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ convertList ✦✦✦✈ 获取WMS库存信息为空！");
logger.error("==== WmsStockServiceImpl ==== convertList ====> 获取WMS库存信息为空！");
return Collections.emptyList();
}
List<WmsStock> all = list();
......@@ -115,7 +115,7 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc
private String getStockKey(WmsStock stock) {
String key = String.format("%s-%s-%s", stock.getContainerCode(), stock.getMaterialCode(), stock.getLocationCode());
logger.info("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncKey ✦✦✦✈ [key]: {}", key);
logger.info("==== WmsStockServiceImpl ==== syncKey ====> [key]: {}", key);
return key;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment