Commit 1ed9f46a by lijingjing

添加推送日志;

parent 5fdeba93
...@@ -19,52 +19,52 @@ public class ErpRequest { ...@@ -19,52 +19,52 @@ public class ErpRequest {
private static final Logger logger = LoggerFactory.getLogger(ErpRequest.class); private static final Logger logger = LoggerFactory.getLogger(ErpRequest.class);
public static ErpRespResult sendPost(String url, Map<String, ?> params, HttpHeaders headers) { public static ErpRespResult sendPost(String url, Map<String, ?> params, HttpHeaders headers) {
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ [url, params, headers]"); logger.info("==== ErpRequest ==== sendPost ====> [url, params, headers]");
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ url:{}", url); logger.info("==== ErpRequest ==== sendPost ====> url:{}", url);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ params:{}", JacksonUtils.toJSONString(params)); logger.info("==== ErpRequest ==== sendPost ====> params:{}", JacksonUtils.toJSONString(params));
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ headers:{}", JacksonUtils.toJSONString(headers)); logger.info("==== ErpRequest ==== sendPost ====> headers:{}", JacksonUtils.toJSONString(headers));
try { try {
String resultStr = RestTemplateUtils.sendPost(url, params, headers); String resultStr = RestTemplateUtils.sendPost(url, params, headers);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ resultStr: {}", resultStr); logger.info("==== ErpRequest ==== sendPost ====> resultStr: {}", resultStr);
if (StringUtils.isBlank(resultStr)) { if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ DPS响应结果为空!"); logger.error("==== ErpRequest ==== sendPost ====> ERP响应结果为空!");
return ErpRespResult.failure("DPS响应结果为空!"); return ErpRespResult.failure("ERP响应结果为空!");
} }
ErpRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<ErpRespResult>() { 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)) { if (Objects.isNull(result)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求DPS接口失败:{}", JacksonUtils.toJSONString(result)); logger.error("==== ErpRequest ==== sendPost ====> 请求ERP接口失败:{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求DPS接口失败!"); return ErpRespResult.failure("请求ERP接口失败!");
} }
return result; return result;
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求DPS接口异常:", e); logger.error("==== ErpRequest ==== sendPost ====> 请求ERP接口异常:", e);
return ErpRespResult.failure("请求DPS接口异常!"); return ErpRespResult.failure("请求ERP接口异常!");
} }
} }
public static <T> ErpRespResult<T> sendGet(String url, Map<String, ?> params, TypeReference<ErpRespResult<T>> typeReference) { 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, params, typeReference]");
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ url:{}", url); logger.info("==== ErpRequest ==== sendGet ====> url:{}", url);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ params:{}", JacksonUtils.toJSONString(params)); logger.info("==== ErpRequest ==== sendGet ====> params:{}", JacksonUtils.toJSONString(params));
try { try {
String resultStr = RestTemplateUtils.sendGet(url, params); String resultStr = RestTemplateUtils.sendGet(url, params);
if (StringUtils.isBlank(resultStr)) { if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ DPS响应结果为空!"); logger.error("==== ErpRequest ==== sendGet ====> ERP响应结果为空!");
return ErpRespResult.failure("DPS响应结果为空!"); return ErpRespResult.failure("ERP响应结果为空!");
} }
ErpRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference); ErpRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference);
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ resultStr: {}", resultStr); logger.info("==== ErpRequest ==== sendGet ====> resultStr: {}", resultStr);
if (Objects.isNull(result)) { if (Objects.isNull(result)) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ 请求DPS接口失败:{}", JacksonUtils.toJSONString(result)); logger.error("==== ErpRequest ==== sendGet ====> 请求ERP接口失败:{}", JacksonUtils.toJSONString(result));
return ErpRespResult.failure("请求DPS接口失败!"); return ErpRespResult.failure("请求ERP接口失败!");
} }
logger.info("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ result: {}", JacksonUtils.toJSONString(result)); logger.info("==== ErpRequest ==== sendGet ====> result: {}", JacksonUtils.toJSONString(result));
return result; return result;
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ ErpRequest ✦✦✦✦ sendGet ✦✦✦✈ 请求DPS接口异常:", e); logger.error("==== ErpRequest ==== sendGet ====> 请求ERP接口异常:", e);
return ErpRespResult.failure("请求DPS接口异常!"); return ErpRespResult.failure("请求ERP接口异常!");
} }
} }
} }
...@@ -17,50 +17,50 @@ public class WmsRequest { ...@@ -17,50 +17,50 @@ public class WmsRequest {
private static final Logger logger = LoggerFactory.getLogger(WmsRequest.class); private static final Logger logger = LoggerFactory.getLogger(WmsRequest.class);
public static <T> T sendPost(String url, Map<String, ?> params, TypeReference<WmsRespResult<T>> typeReference) { 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,params,typeReference]");
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ url: {}", url); logger.info("==== WmsRequest ==== sendPost ====> url: {}", url);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ params: {}", JacksonUtils.toJSONString(params)); logger.info("==== WmsRequest ==== sendPost ====> params: {}", JacksonUtils.toJSONString(params));
try { try {
String resultStr = RestTemplateUtils.sendPost(url, params); String resultStr = RestTemplateUtils.sendPost(url, params);
if (StringUtils.isBlank(resultStr)) { if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ WMS响应结果为空!"); logger.error("==== WmsRequest ==== sendPost ====> WMS响应结果为空!");
return null; return null;
} }
WmsRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference); 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()) { if (!result.success()) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口失败:{}", JacksonUtils.toJSONString(result)); logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口失败:{}", JacksonUtils.toJSONString(result));
return null; return null;
} }
T data = result.getData(); 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; return data;
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口异常:", e); logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口异常:", e);
} }
return null; return null;
} }
public static WmsRespResult sendPost(String url, Map<String, ?> params) { public static WmsRespResult sendPost(String url, Map<String, ?> params) {
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ [url,params]"); logger.info("==== WmsRequest ==== sendPost ====> [url,params]");
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ url: {}", url); logger.info("==== WmsRequest ==== sendPost ====> url: {}", url);
logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ params: {}", JacksonUtils.toJSONString(params)); logger.info("==== WmsRequest ==== sendPost ====> params: {}", JacksonUtils.toJSONString(params));
try { try {
String resultStr = RestTemplateUtils.sendPost(url, params); String resultStr = RestTemplateUtils.sendPost(url, params);
if (StringUtils.isBlank(resultStr)) { if (StringUtils.isBlank(resultStr)) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ WMS响应结果为空!"); logger.error("==== WmsRequest ==== sendPost ====> WMS响应结果为空!");
return WmsRespResult.failure("WMS响应结果为空!"); return WmsRespResult.failure("WMS响应结果为空!");
} }
WmsRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<WmsRespResult>() { 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()) { 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 WmsRespResult.failure(result.getDescription());
} }
return result; return result;
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendPost ✦✦✦✈ 请求WMS接口异常:", e); logger.error("==== WmsRequest ==== sendPost ====> 请求WMS接口异常:", e);
return WmsRespResult.failure("请求WMS接口异常"); return WmsRespResult.failure("请求WMS接口异常");
} }
} }
......
...@@ -29,6 +29,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -29,6 +29,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -734,8 +735,8 @@ public class EntrustSampleItemController extends ServiceController { ...@@ -734,8 +735,8 @@ public class EntrustSampleItemController extends ServiceController {
@ApiOperation(value = "模拟测试发送数据到ERP", notes = "模拟测试发送数据到ERP") @ApiOperation(value = "模拟测试发送数据到ERP", notes = "模拟测试发送数据到ERP")
@PostMapping("/send_erp_data") @PostMapping("/send_erp_data")
@Login(action = Action.Skip) @Login(action = Action.Skip)
public RestResult<Boolean> sendErpData(@RequestBody List<Long> entrustIds) { public RestResult<Boolean> sendErpData(@RequestParam Long entrustId) {
return success(entrustSampleItemService.sendErpData(entrustIds)); return success(entrustSampleItemService.sendErpData(Collections.singletonList(entrustId)));
} }
@ApiOperation(value = "根据检测项目ID退回原始记录", notes = "根据检测项目ID退回原始记录") @ApiOperation(value = "根据检测项目ID退回原始记录", notes = "根据检测项目ID退回原始记录")
......
...@@ -346,25 +346,25 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe ...@@ -346,25 +346,25 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
protected void generateCompareItems(Long[] ids, Account account) { protected void generateCompareItems(Long[] ids, Account account) {
if (ArrayUtils.isEmpty(ids)) { if (ArrayUtils.isEmpty(ids)) {
logger.error("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ 报告IDS数据为空!"); logger.error("==== EntrustReportServiceImpl ==== generateCompareItems ====> 报告IDS数据为空!");
return; return;
} }
List<EntrustReportRelSample> relSamples = entrustReportRelSampleService.list(Condition.create().in("report_id", ids)); List<EntrustReportRelSample> relSamples = entrustReportRelSampleService.list(Condition.create().in("report_id", ids));
if (CollectionUtils.isEmpty(relSamples)) { if (CollectionUtils.isEmpty(relSamples)) {
logger.error("No rel samples found"); logger.error("No rel samples found");
logger.error("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ rel samples not found!"); logger.error("==== EntrustReportServiceImpl ==== generateCompareItems ====> rel samples not found!");
return; return;
} }
List<Long> sampleIds = relSamples.stream().map(EntrustReportRelSample::getSampleId).distinct().collect(Collectors.toList()); List<Long> sampleIds = relSamples.stream().map(EntrustReportRelSample::getSampleId).distinct().collect(Collectors.toList());
EntrustSample sample = entrustSampleService.getById(sampleIds.get(0)); EntrustSample sample = entrustSampleService.getById(sampleIds.get(0));
String sampleName = sample.getName(); String sampleName = sample.getName();
logger.info("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ [sampleName]: {}", sampleName); logger.info("==== EntrustReportServiceImpl ==== generateCompareItems ====> [sampleName]: {}", sampleName);
if (!(Objects.equals(sampleName, "原铝") || Objects.equals(sampleName, "铝成品"))) { if (!(Objects.equals(sampleName, "原铝") || Objects.equals(sampleName, "铝成品"))) {
logger.info("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ 非【原铝,铝成品】样品,不予处理!"); logger.info("==== EntrustReportServiceImpl ==== generateCompareItems ====> 非【原铝,铝成品】样品,不予处理!");
return; return;
} }
logger.info("✦✦✦✦ EntrustReportServiceImpl ✦✦✦✦ generateCompareItems ✦✦✦✈ 开始比对检测项目数据!"); logger.info("==== EntrustReportServiceImpl ==== generateCompareItems ====> 开始比对检测项目数据!");
SlotQueryDTO slotQuery = new SlotQueryDTO(); SlotQueryDTO slotQuery = new SlotQueryDTO();
slotQuery.setSampleIds(sampleIds); slotQuery.setSampleIds(sampleIds);
// 每次提交编制报告时,添加对比记录 // 每次提交编制报告时,添加对比记录
......
...@@ -2444,9 +2444,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -2444,9 +2444,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
@Override @Override
public void postWmsEntrustData(List<Entrust> entrustList) { public void postWmsEntrustData(List<Entrust> entrustList) {
logger.info("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ postWmsEntrustData ✦✦✦✈ 准备推送委托数据至WMS系统!"); logger.info("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 准备推送委托数据至WMS系统!");
if (CollectionUtils.isEmpty(entrustList)) { if (CollectionUtils.isEmpty(entrustList)) {
logger.error("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ postWmsEntrustData ✦✦✦✈ 委托信息为空,取消推送!"); logger.error("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 委托信息为空,取消推送!");
return; return;
} }
// 查询委托ids // 查询委托ids
...@@ -2457,7 +2457,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -2457,7 +2457,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
.in("entrust_ids", entrustIds)); .in("entrust_ids", entrustIds));
// 是否为空,为空返回不发送 // 是否为空,为空返回不发送
if (CollectionUtils.isEmpty(sampleList)) { if (CollectionUtils.isEmpty(sampleList)) {
logger.error("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ postWmsEntrustData ✦✦✦✈ 样品信息为空,取消发送!"); logger.error("==== EntrustSampleServiceImpl ==== postWmsEntrustData ====> 样品信息为空,取消发送!");
return; return;
} }
// 以委托id分组的Map数据供发送使用 // 以委托id分组的Map数据供发送使用
...@@ -2479,7 +2479,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -2479,7 +2479,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
} }
private void doSendWmsEntrustData(String code, EntrustSample sample) { 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); String url = serviceProperties.buildWmsUrl(HttpConst.WMS_SYNC_WTBH);
// 设置请求参数 // 设置请求参数
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
...@@ -2489,7 +2489,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -2489,7 +2489,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
map.put("CreateDate", new Date()); map.put("CreateDate", new Date());
WmsRespResult result = WmsRequest.sendPost(url, map); WmsRespResult result = WmsRequest.sendPost(url, map);
if (Objects.nonNull(result)) { if (Objects.nonNull(result)) {
logger.info("✦✦✦✦ EntrustSampleServiceImpl ✦✦✦✦ doSendWmsEntrustData ✦✦✦✈ 委托信息推送WMS数据成功!"); logger.info("==== EntrustSampleServiceImpl ==== doSendWmsEntrustData ====> 委托信息推送WMS数据成功!");
return; return;
} }
} }
......
...@@ -319,24 +319,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> ...@@ -319,24 +319,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
} }
if (Objects.equals(category, "碳素侧原料原辅料") || Objects.equals(category, "铝侧原料原辅料")) { 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 abbr = params.get("abbr");
String inspectionCode = qualityInspectionCodeService.getCodeAbsentCreate(account); String inspectionCode = qualityInspectionCodeService.getCodeAbsentCreate(account);
String queryKey = abbr + DateUtils.dateTransfer(new Date(), "yyMMdd") + inspectionCode; 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); sampleCode = entrustSampleService.getNewCode(queryKey, "first_code", 3);
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [sampleCode]: {}", sampleCode); logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [sampleCode]: {}", sampleCode);
// 二级加密编码:abbr + 流水号 + 其他随机字符 // 二级加密编码:abbr + 流水号 + 其他随机字符
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ secondCode"); logger.info("==== EntrustServiceImpl ==== initSampleCode ====> secondCode");
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [abbr]: {}", abbr); logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [abbr]: {}", abbr);
String sn = sampleCode.substring(sampleCode.length() - 3); 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); String timestamp = (System.currentTimeMillis() + "").substring(2);
logger.info("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ initSampleCode ✦✦✦✈ [timestamp]: {}", timestamp); logger.info("==== EntrustServiceImpl ==== initSampleCode ====> [timestamp]: {}", timestamp);
String randomStr = RandomUtils.getRandomStr(4); String randomStr = RandomUtils.getRandomStr(4);
// 保证二级加密编码不重复 // 保证二级加密编码不重复
secondCode = abbr + sn + timestamp + randomStr; 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> ...@@ -542,7 +542,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
if (CollectionUtils.isEmpty(itemList)) { if (CollectionUtils.isEmpty(itemList)) {
RestAssert.fail(isSubmit, String.format("第【%d】行样品,检测项目为空!", index)); RestAssert.fail(isSubmit, String.format("第【%d】行样品,检测项目为空!", index));
index++; index++;
logger.error("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ saveEntrustDTO ✦✦✦✈ 【{},{}】检测项目数据为空!", sample.getId(), sample.getCode()); logger.error("==== EntrustServiceImpl ==== saveEntrustDTO ====> 【{},{}】检测项目数据为空!", sample.getId(), sample.getCode());
continue; continue;
} }
index++; index++;
...@@ -807,7 +807,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> ...@@ -807,7 +807,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
} }
} else { } else {
RestAssert.fail(isSubmit, String.format("第【%d】行样品,检测项目为空!", index)); RestAssert.fail(isSubmit, String.format("第【%d】行样品,检测项目为空!", index));
logger.error("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ editEntrust ✦✦✦✈ 【{},{}】检测项目数据为空!", sample.getId(), sample.getCode()); logger.error("==== EntrustServiceImpl ==== editEntrust ====> 【{},{}】检测项目数据为空!", sample.getId(), sample.getCode());
} }
index++; index++;
} }
...@@ -1296,7 +1296,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> ...@@ -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)); List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("entrust_sample_id", oldSampleId).eq("deleted", 0));
if (CollectionUtils.isEmpty(itemList)) { if (CollectionUtils.isEmpty(itemList)) {
logger.error("✦✦✦✦ EntrustServiceImpl ✦✦✦✦ cloneEntrust ✦✦✦✈ 【{},{}】检测项目数据为空!", sample.getId(), sample.getCode()); logger.error("==== EntrustServiceImpl ==== cloneEntrust ====> 【{},{}】检测项目数据为空!", sample.getId(), sample.getCode());
continue; continue;
} }
......
...@@ -152,11 +152,11 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap ...@@ -152,11 +152,11 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
@Override @Override
public boolean saveCompareDataBatch(SlotQueryDTO queryDTO, Account account) { 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); 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)) { if (CollectionUtils.isEmpty(comparisonList)) {
logger.error("✦✦✦✦ ItemComparisonServiceImpl ✦✦✦✦ saveCompareDataBatch ✦✦✦✈ 比对的检测项目数据为空!"); logger.error("==== ItemComparisonServiceImpl ==== saveCompareDataBatch ====> 比对的检测项目数据为空!");
return false; return false;
} }
// == // ==
...@@ -165,10 +165,10 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap ...@@ -165,10 +165,10 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
ItemComparison comparison = comparisonList.get(0); ItemComparison comparison = comparisonList.get(0);
queryDTO.setQueryDate(DateUtils.str2Date(comparison.getCompareDate())); queryDTO.setQueryDate(DateUtils.str2Date(comparison.getCompareDate()));
queryDTO.setSampleName(comparison.getSampleName()); 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); 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组信息,用来取Id
Map<String, ItemComparison> comparisonMap = new HashMap<>(4); Map<String, ItemComparison> comparisonMap = new HashMap<>(4);
// 组list,过滤重复数据 // 组list,过滤重复数据
...@@ -189,7 +189,7 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap ...@@ -189,7 +189,7 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
d.setUid(account.getUserId()); 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); return super.saveOrUpdateBatch(comparisonList);
} }
......
...@@ -343,7 +343,7 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta ...@@ -343,7 +343,7 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
return inventoryList.stream().map(d -> d.convert(WmsInventory.class)).collect(Collectors.toList()); return inventoryList.stream().map(d -> d.convert(WmsInventory.class)).collect(Collectors.toList());
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ StatisticsServiceImpl ✦✦✦✦ getInventoryList ✦✦✦✈ 转换数据时异常:", e); logger.error("==== StatisticsServiceImpl ==== getInventoryList ====> 转换数据时异常:", e);
} }
return dataList; return dataList;
} }
......
...@@ -78,9 +78,9 @@ public class WmsStockDeliveryServiceImpl extends BaseServiceImpl<WmsStockDeliver ...@@ -78,9 +78,9 @@ public class WmsStockDeliveryServiceImpl extends BaseServiceImpl<WmsStockDeliver
@Override @Override
public boolean syncStockDelivery(WmsStockDeliveryData data) { public boolean syncStockDelivery(WmsStockDeliveryData data) {
logger.info("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 开始同步出入库记录!"); logger.info("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 开始同步出入库记录!");
if (Objects.isNull(data)) { if (Objects.isNull(data)) {
logger.error("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 出入库信息为空,取消同步!"); logger.error("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 出入库信息为空,取消同步!");
return false; return false;
} }
boolean result = false; boolean result = false;
...@@ -90,9 +90,9 @@ public class WmsStockDeliveryServiceImpl extends BaseServiceImpl<WmsStockDeliver ...@@ -90,9 +90,9 @@ public class WmsStockDeliveryServiceImpl extends BaseServiceImpl<WmsStockDeliver
delivery.setCtime(new Date()); delivery.setCtime(new Date());
delivery.setUid(0L); delivery.setUid(0L);
result = super.save(delivery); result = super.save(delivery);
logger.info("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 数据同步完成:{}", JacksonUtils.toJSONString(delivery)); logger.info("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 数据同步完成:{}", JacksonUtils.toJSONString(delivery));
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ WmsStockDeliveryServiceImpl ✦✦✦✦ syncStockDelivery ✦✦✦✈ 类型转换失败:", e); logger.error("==== WmsStockDeliveryServiceImpl ==== syncStockDelivery ====> 类型转换失败:", e);
} }
return result; return result;
} }
......
...@@ -74,16 +74,16 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc ...@@ -74,16 +74,16 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc
List<WmsStockData> dataList = WmsRequest.sendPost(url, map, new TypeReference<WmsRespResult<List<WmsStockData>>>() { List<WmsStockData> dataList = WmsRequest.sendPost(url, map, new TypeReference<WmsRespResult<List<WmsStockData>>>() {
}); });
if (CollectionUtils.isEmpty(dataList)) { if (CollectionUtils.isEmpty(dataList)) {
logger.error("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncWmsStockData ✦✦✦✈ 出入库数据为空!"); logger.error("==== WmsStockServiceImpl ==== syncWmsStockData ====> 出入库数据为空!");
return; return;
} }
// 同步更新WMS库存数据 // 同步更新WMS库存数据
logger.debug("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncWmsStockData ✦✦✦✈ 开始同步WMS数据!"); logger.debug("==== WmsStockServiceImpl ==== syncWmsStockData ====> 开始同步WMS数据!");
try { try {
List<WmsStock> stockList = convertList(dataList); List<WmsStock> stockList = convertList(dataList);
Optional.ofNullable(stockList).ifPresent(this::saveOrUpdateBatch); Optional.ofNullable(stockList).ifPresent(this::saveOrUpdateBatch);
} catch (Exception e) { } catch (Exception e) {
logger.error("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ syncUpdateWmsStockData ✦✦✦✈ 转换数据失败:", e); logger.error("==== WmsStockServiceImpl ==== syncUpdateWmsStockData ====> 转换数据失败:", e);
} }
} }
...@@ -95,7 +95,7 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc ...@@ -95,7 +95,7 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc
public List<WmsStock> convertList(List<WmsStockData> list) { public List<WmsStock> convertList(List<WmsStockData> list) {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
logger.error("✦✦✦✦ WmsStockServiceImpl ✦✦✦✦ convertList ✦✦✦✈ 获取WMS库存信息为空!"); logger.error("==== WmsStockServiceImpl ==== convertList ====> 获取WMS库存信息为空!");
return Collections.emptyList(); return Collections.emptyList();
} }
List<WmsStock> all = list(); List<WmsStock> all = list();
...@@ -115,7 +115,7 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc ...@@ -115,7 +115,7 @@ public class WmsStockServiceImpl extends BaseServiceImpl<WmsStockMapper, WmsStoc
private String getStockKey(WmsStock stock) { private String getStockKey(WmsStock stock) {
String key = String.format("%s-%s-%s", stock.getContainerCode(), stock.getMaterialCode(), stock.getLocationCode()); 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; 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