bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓储推送到智慧工程逻辑优化

This commit is contained in:
15856 2024-10-16 17:25:09 +08:00
parent b8846e1502
commit 31e099131b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -1452,7 +1452,7 @@ public class TmTaskServiceImpl implements TmTaskService {
intelVO.setManufacturer(0); intelVO.setManufacturer(0);
intelVO.setOperateType("0"); //0:默认新增 1:修改以前推送的数据 intelVO.setOperateType("0"); //0:默认新增 1:修改以前推送的数据
//intelVO.setSource(2); //1:智慧工程系统 2:第三方数据 //intelVO.setSource(2); //1:智慧工程系统 2:第三方数据
intelVO.setStatus("15".equals(task.getMaStatus()) ? 0 : 1); //0:有效 1:无效 intelVO.setStatus("16".equals(subTask.getMaStatus()) ? 0 : 1); //0:有效 1:无效
intelVO.setSpecificationType("123"); intelVO.setSpecificationType("123");
intelVO.setValidityDate(DateUtils.getDate()); intelVO.setValidityDate(DateUtils.getDate());
//每个设备不同点的设置 //每个设备不同点的设置
@ -1472,7 +1472,7 @@ public class TmTaskServiceImpl implements TmTaskService {
private String resultDataHandler(String data) throws Exception { private String resultDataHandler(String data) throws Exception {
JSONObject object = JSONObject.parseObject(data); JSONObject object = JSONObject.parseObject(data);
System.err.println(data); System.err.println(data);
String code = object.getString("code"); Integer code = Integer.valueOf(object.getString("code"));
Integer status = BigDecimal.ZERO.intValue(); Integer status = BigDecimal.ZERO.intValue();
if (status.equals(code)) { if (status.equals(code)) {
String dataResultString = object.getString("result"); String dataResultString = object.getString("result");

1
sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -1183,6 +1183,7 @@
mam.out_fac_code as outFacCode, mam.out_fac_code as outFacCode,
mam.this_check_time as thisCheckTime, mam.this_check_time as thisCheckTime,
mam.create_time as createTime, mam.create_time as createTime,
mam.ma_status as maStatus,
mt.type_id, mt.type_id,
mt3.type_name as typeName, mt3.type_name as typeName,
mt1.intelligent_code as intelligentCode mt1.intelligent_code as intelligentCode