diff --git a/lzbi-admin/src/main/resources/application-test.yml b/lzbi-admin/src/main/resources/application-test.yml index 81f14b7..deff539 100644 --- a/lzbi-admin/src/main/resources/application-test.yml +++ b/lzbi-admin/src/main/resources/application-test.yml @@ -147,7 +147,7 @@ wechat: goal-server: # iot平台服务地址 iot: http://10.10.10.56:9010 - magic: http://localhost:9012/magic/api + magic: http://10.10.10.56:9012/magic/api # IOT服务接口 iot-server-api: diff --git a/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java b/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java index bdb8854..a622e49 100644 --- a/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java +++ b/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java @@ -92,13 +92,12 @@ public class TaskWorkParamRead { private final String SOURCE = "work"; public int createParamBill(String inComeDate) { - //String inComeDate="2023-11-29"; DcBusiCoderuleConfigDao ruleIdByBusicode = dcBaseCoderuleDefineService.getRuleIdByBusicode(BUSICODE); DcBaseCoderuleDefineDao ruleDao = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoById(ruleIdByBusicode.getRuleId()); DcBusiParamBillMaster billm = new DcBusiParamBillMaster(); String billNo = codeNoGenerater.getCode(ruleDao); if (StringUtils.isNull(billNo)) { - billNo = "AD_" + String.valueOf(System.currentTimeMillis()); + billNo = "AD_" + System.currentTimeMillis(); } billm.setBillNo(billNo); billm.setCreatedBy("robot"); @@ -109,7 +108,6 @@ public class TaskWorkParamRead { billm.setCheckStatus("1"); List billSub = new ArrayList<>(); DcBusiWorkReadConfig dwrc = new DcBusiWorkReadConfig(); - //dwrc.setAssetCode(assetCode); dwrc.setGoalSource(SOURCE); List dcBusiWorkReadConfigs = dcBusiWorkReadConfigService.selectDcBusiWorkReadConfigList(dwrc); List pcl = dcBusiWorkReadConfigs.parallelStream().filter(o -> StringUtils.isNotEmpty(o.getGoalParamCode())).map(DcBusiWorkReadConfig::getGoalParamCode).collect(Collectors.toList());