diff --git a/src/main/java/com/shxy/i2/bean/YxAttrBean.java b/src/main/java/com/shxy/i2/bean/YxAttrBean.java new file mode 100644 index 0000000..aeb7639 --- /dev/null +++ b/src/main/java/com/shxy/i2/bean/YxAttrBean.java @@ -0,0 +1,9 @@ +package com.shxy.i2.bean; + +import lombok.Data; + +@Data +public class YxAttrBean { + private String key; + private T value; +} diff --git a/src/main/java/com/shxy/i2/constant/Constant.java b/src/main/java/com/shxy/i2/constant/Constant.java index c2328b4..6ebda91 100644 --- a/src/main/java/com/shxy/i2/constant/Constant.java +++ b/src/main/java/com/shxy/i2/constant/Constant.java @@ -2,6 +2,10 @@ package com.shxy.i2.constant; public class Constant { public static String Cacid = "changtai"; + + + public static String YXID = "yxid"; + public static String BYQ_JBFD = "021001"; public static String YSP = "021002"; public static String WS = "021003"; diff --git a/src/main/java/com/shxy/i2/dto/Data_YxlDto.java b/src/main/java/com/shxy/i2/dto/Data_YxlDto.java new file mode 100644 index 0000000..862265c --- /dev/null +++ b/src/main/java/com/shxy/i2/dto/Data_YxlDto.java @@ -0,0 +1,20 @@ +package com.shxy.i2.dto; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class Data_YxlDto { + + Integer sadr; + Date dtime; + Integer ival; + String field; + String sensorCode; + String equipmentId; + String tableName; + String phase; + +} diff --git a/src/main/java/com/shxy/i2/service/XydlI2Service.java b/src/main/java/com/shxy/i2/service/XydlI2Service.java index 77f7f8a..7f75ee2 100644 --- a/src/main/java/com/shxy/i2/service/XydlI2Service.java +++ b/src/main/java/com/shxy/i2/service/XydlI2Service.java @@ -34,4 +34,6 @@ public interface XydlI2Service { void upload_ysp(Client client, HashMap equipMap); void upload_cnj(Client client, HashMap equipMap); + + void upload_yx(Client client, HashMap equipMap); } diff --git a/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java b/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java index 31848e0..0e4080b 100644 --- a/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java +++ b/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java @@ -11,6 +11,7 @@ import com.shxy.i2.bean.SendDataBean; import com.shxy.i2.constant.CommonStatus; import com.shxy.i2.constant.Constant; import com.shxy.i2.dao.*; +import com.shxy.i2.dto.Data_YxlDto; import com.shxy.i2.entity.*; import com.shxy.i2.service.XydlI2Service; import lombok.extern.slf4j.Slf4j; @@ -71,6 +72,13 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Autowired private Data_MicroclimateDao data_microclimateDao; + + @Autowired + private Upload_checkDao upload_checkDao; + + @Autowired + private Data_YxDao data_yxDao; + @Autowired AsyncMethod asyncMethod; @@ -154,7 +162,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); list1.addAll(idlist); // asyncMethod.sendJBFDData(client, list2, xml, Constant.BYQ_JBFD); - asyncMethod.sendJBFDData2(client,maxid, eqmidlist, xml, Constant.BYQ_JBFD); + asyncMethod.sendJBFDData2(client, maxid, eqmidlist, xml, Constant.BYQ_JBFD); idlist = new ArrayList<>(); maxid = BigInteger.valueOf(0); eqmidlist = new ArrayList<>(); @@ -361,7 +369,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); list1.addAll(idlist); // asyncMethod.sendJBFDData(client, list2, xml, Constant.DLQJBFD); - asyncMethod.sendJBFDData2(client,maxid, eqmidlist, xml, Constant.DLQJBFD); + asyncMethod.sendJBFDData2(client, maxid, eqmidlist, xml, Constant.DLQJBFD); maxid = BigInteger.valueOf(0); eqmidlist = new ArrayList<>(); idlist = new ArrayList<>(); @@ -1044,7 +1052,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); list1.addAll(idlist); // asyncMethod.sendJBFDData(client, list2, xml, Constant.YSP); - asyncMethod.sendJBFDData2(client,maxid, eqmidlist, xml, Constant.YSP); + asyncMethod.sendJBFDData2(client, maxid, eqmidlist, xml, Constant.YSP); maxid = BigInteger.valueOf(0); eqmidlist = new ArrayList<>(); idlist = new ArrayList<>(); @@ -1149,4 +1157,96 @@ public class XydlI2ServiceImpl implements XydlI2Service { log.info("没有查询到microcimate的数据"); } } + + @Override + public void upload_yx(Client client, HashMap equipMap) { + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.YXID); + BigInteger value = upload_check.getValue(); + List list = data_yxDao.selectByPrimaryKey(value); + if (CollectionUtil.isNotEmpty(list)) { + log.info("查询microclimate的数据量：" + list.size()); + for (int index = 0; index < list.size(); index++) { + Data_YxlDto data_yxlDto = list.get(index); + Date dtime = data_yxlDto.getDtime(); + String equipmentid = data_yxlDto.getEquipmentId(); + String sensorid = data_yxlDto.getSensorCode(); + String tableName = data_yxlDto.getTableName(); + String field = data_yxlDto.getField(); + Integer ival = data_yxlDto.getIval(); + Integer sadr = data_yxlDto.getSadr(); + String phase = data_yxlDto.getPhase(); + + String data_byq_jbfd = "data_byq_jbfd"; + String data_cnj = "data_cnj"; + String data_dcyw = "data_dcyw"; + String data_dlq_jbfd = "data_dlq_jbfd"; + String data_dr_jyjc = "data_dr_jyjc"; + String data_fhdlbx = "data_fhdlbx"; + String data_fhzxq = "data_fhzxq"; + String data_jsyhw_jyjc = "data_jsyhw_jyjc"; + String data_microclimate = "data_microclimate"; + String data_sf6_qtsf = "data_sf6_qtsf"; + String data_sf6_qtyl = "data_sf6_qtyl"; + String data_tx = "data_tx"; + String data_ws = "data_ws"; + String data_ysp = "data_ysp"; + + if (StrUtil.equals(tableName, data_byq_jbfd)) { + if (StrUtil.equals(field, "dischargeCapacity")) { + AttrBean attr = new AttrBean<>(); + attr.setKey("DischargeCapacity"); + attr.setValue(ival); + } + if (StrUtil.equals(field, "dischargePosition")) { + AttrBean attr = new AttrBean<>(); + attr.setKey("DischargePosition"); + attr.setValue(ival); + } + if (StrUtil.equals(field, "pulseCount")) { + AttrBean attr = new AttrBean<>(); + attr.setKey("PulseCount"); + attr.setValue(ival); + } + + + if (StrUtil.equals(field, "dischargeWaveform")) { + AttrBean attr = new AttrBean<>(); + attr.setKey("DischargeWaveform"); + attr.setValue(ival); + } + } else if (StrUtil.equals(tableName, data_cnj)) { + + } else if (StrUtil.equals(tableName, data_dcyw)) { + + } else if (StrUtil.equals(tableName, data_dlq_jbfd)) { + + } else if (StrUtil.equals(tableName, data_dr_jyjc)) { + + } else if (StrUtil.equals(tableName, data_fhdlbx)) { + + } else if (StrUtil.equals(tableName, data_fhzxq)) { + + } else if (StrUtil.equals(tableName, data_jsyhw_jyjc)) { + + } else if (StrUtil.equals(tableName, data_microclimate)) { + + } else if (StrUtil.equals(tableName, data_sf6_qtsf)) { + + } else if (StrUtil.equals(tableName, data_sf6_qtyl)) { + + } else if (StrUtil.equals(tableName, data_tx)) { + + } else if (StrUtil.equals(tableName, data_ws)) { + + } else if (StrUtil.equals(tableName, data_ysp)) { + + } + + + } + } + + } + + } diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index 1d20e50..80327d0 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -68,105 +68,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +