cac
/
I2client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I2代码遥信修改

Browse Source
master
liuguijing 2 years ago
parent 9cda928880
commit 9cc4881bd3
6 changed files with 254 additions and 102 deletions
Show Stats Download Patch File Download Diff File

9
src/main/java/com/shxy/i2/bean/YxAttrBean.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.shxy.i2.bean;
import lombok.Data;
@Data
public class YxAttrBean<T> {
private String key;
private T value;
}

4
src/main/java/com/shxy/i2/constant/Constant.java
Unescape Escape View File

@ -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";

20
src/main/java/com/shxy/i2/dto/Data_YxlDto.java
Unescape Escape View File

@ -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;
}

2
src/main/java/com/shxy/i2/service/XydlI2Service.java
Unescape Escape View File

@ -34,4 +34,6 @@ public interface XydlI2Service {
void upload_ysp(Client client, HashMap<Integer, Niec_Sensors> equipMap);
void upload_cnj(Client client, HashMap<Integer, Niec_Sensors> equipMap);
void upload_yx(Client client, HashMap<Integer, Niec_Sensors> equipMap);
}

106
src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java
Unescape Escape View File

@ -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<Integer, Niec_Sensors> equipMap) {
Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.YXID);
BigInteger value = upload_check.getValue();
List<Data_YxlDto> 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<Integer> attr = new AttrBean<>();
attr.setKey("DischargeCapacity");
attr.setValue(ival);
}
if (StrUtil.equals(field, "dischargePosition")) {
AttrBean<Integer> attr = new AttrBean<>();
attr.setKey("DischargePosition");
attr.setValue(ival);
}
if (StrUtil.equals(field, "pulseCount")) {
AttrBean<Integer> attr = new AttrBean<>();
attr.setKey("PulseCount");
attr.setValue(ival);
}
if (StrUtil.equals(field, "dischargeWaveform")) {
AttrBean<Integer> 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)) {
}
}
}
}
}

215
src/main/resources/generatorConfig.xml
Unescape Escape View File

@ -68,105 +68,122 @@
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_byq_jbfd"-->
<!-- domainObjectName="Data_Byq_Jbfd"-->
<!-- mapperName="Data_Byq_JbfdDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_cnj"-->
<!-- domainObjectName="Data_Cnj"-->
<!-- mapperName="Data_CnjDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_dcyw"-->
<!-- domainObjectName="Data_Dcyw"-->
<!-- mapperName="Data_DcywDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_dlq_jbfd"-->
<!-- domainObjectName="Data_Dlq_Jbfd"-->
<!-- mapperName="Data_Dlq_JbfdDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_dr_jyjc"-->
<!-- domainObjectName="Data_Dr_Jyjc"-->
<!-- mapperName="Data_Dr_JyjcDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_fhdlbx"-->
<!-- domainObjectName="Data_Fhdlbx"-->
<!-- mapperName="Data_FhdlbxDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_fhzxq"-->
<!-- domainObjectName="Data_Fhzxq"-->
<!-- mapperName="data_FhzxqDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_jsyhw_jyjc"-->
<!-- domainObjectName="Data_Jsyhw_Jyjc"-->
<!-- mapperName="Data_Jsyhw_JyjcDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_sf6_qtsf"-->
<!-- domainObjectName="Data_SF6_Qtsf"-->
<!-- mapperName="Data_SF6_QtsfDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_tx"-->
<!-- domainObjectName="Data_Tx"-->
<!-- mapperName="Data_TxDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_ws"-->
<!-- domainObjectName="Data_Ws"-->
<!-- mapperName="Data_WsDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_ysp"-->
<!-- domainObjectName="Data_Ysp"-->
<!-- mapperName="Data_YspDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="data_microclimate"
domainObjectName="Data_Microclimate"
mapperName="Data_MicroclimateDao"
<!-- <table tableName="data_byq_jbfd"-->
<!-- domainObjectName="Data_Byq_Jbfd"-->
<!-- mapperName="Data_Byq_JbfdDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_cnj"-->
<!-- domainObjectName="Data_Cnj"-->
<!-- mapperName="Data_CnjDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_dcyw"-->
<!-- domainObjectName="Data_Dcyw"-->
<!-- mapperName="Data_DcywDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_dlq_jbfd"-->
<!-- domainObjectName="Data_Dlq_Jbfd"-->
<!-- mapperName="Data_Dlq_JbfdDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_dr_jyjc"-->
<!-- domainObjectName="Data_Dr_Jyjc"-->
<!-- mapperName="Data_Dr_JyjcDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_fhdlbx"-->
<!-- domainObjectName="Data_Fhdlbx"-->
<!-- mapperName="Data_FhdlbxDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_fhzxq"-->
<!-- domainObjectName="Data_Fhzxq"-->
<!-- mapperName="data_FhzxqDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_jsyhw_jyjc"-->
<!-- domainObjectName="Data_Jsyhw_Jyjc"-->
<!-- mapperName="Data_Jsyhw_JyjcDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_sf6_qtsf"-->
<!-- domainObjectName="Data_SF6_Qtsf"-->
<!-- mapperName="Data_SF6_QtsfDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_tx"-->
<!-- domainObjectName="Data_Tx"-->
<!-- mapperName="Data_TxDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_ws"-->
<!-- domainObjectName="Data_Ws"-->
<!-- mapperName="Data_WsDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_ysp"-->
<!-- domainObjectName="Data_Ysp"-->
<!-- mapperName="Data_YspDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="data_microclimate"-->
<!-- domainObjectName="Data_Microclimate"-->
<!-- mapperName="Data_MicroclimateDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="upload_check"-->
<!-- domainObjectName="Upload_check"-->
<!-- mapperName="Upload_checkDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="data_yx"
domainObjectName="Data_Yx"
mapperName="Data_YxDao"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
<!-- <property name="useActualColumnNames" value="false"/>-->

Write Preview
Loading…
Cancel
Save