From 9431df1a75e3a1493f363c56d32986d3306246b1 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Thu, 21 Dec 2023 11:12:46 +0800 Subject: [PATCH] =?UTF-8?q?I2=E4=BB=A3=E7=A0=81=E9=81=A5=E4=BF=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shxy/i2/Tool/AsyncMethod.java | 77 +++++--- .../java/com/shxy/i2/Tool/GenerateI2Xml.java | 40 ++++ .../java/com/shxy/i2/bean/YxAttrBean.java | 5 + .../shxy/i2/configure/ThreadPoolConfig.java | 2 +- .../java/com/shxy/i2/constant/Constant.java | 16 ++ .../com/shxy/i2/dao/Data_Byq_JbfdDao.java | 1 + .../java/com/shxy/i2/dao/Data_CnjDao.java | 2 + .../java/com/shxy/i2/dao/Data_DcywDao.java | 2 + .../com/shxy/i2/dao/Data_Dlq_JbfdDao.java | 2 + .../java/com/shxy/i2/dao/Data_Dr_JyjcDao.java | 2 + .../java/com/shxy/i2/dao/Data_FhdlbxDao.java | 2 + .../java/com/shxy/i2/dao/Data_FhzxqDao.java | 2 + .../com/shxy/i2/dao/Data_Jsyhw_JyjcDao.java | 2 + .../com/shxy/i2/dao/Data_MicroclimateDao.java | 2 + .../com/shxy/i2/dao/Data_SF6_QtsfDao.java | 2 + .../com/shxy/i2/dao/Data_SF6_QtylDao.java | 2 + src/main/java/com/shxy/i2/dao/Data_TxDao.java | 2 + src/main/java/com/shxy/i2/dao/Data_WsDao.java | 2 + .../java/com/shxy/i2/dao/Data_YspDao.java | 2 + src/main/java/com/shxy/i2/dao/Data_YxDao.java | 5 +- .../java/com/shxy/i2/dao/Upload_checkDao.java | 12 +- .../java/com/shxy/i2/dto/Data_YxlDto.java | 2 + .../java/com/shxy/i2/service/Webservcies.java | 4 +- .../com/shxy/i2/service/XydlI2Service.java | 4 +- .../shxy/i2/serviceimpl/WebServiceImpl.java | 28 +++ .../i2/serviceimpl/XydlI2ServiceImpl.java | 187 ++++++++++++------ .../com/shxy/i2/timeTask/ScheduledTask.java | 17 +- .../resources/mappers/Data_Byq_JbfdDao.xml | 6 + src/main/resources/mappers/Data_CnjDao.xml | 6 + src/main/resources/mappers/Data_DcywDao.xml | 7 + .../resources/mappers/Data_Dlq_JbfdDao.xml | 6 + .../resources/mappers/Data_Dr_JyjcDao.xml | 6 + src/main/resources/mappers/Data_FhdlbxDao.xml | 6 + .../resources/mappers/Data_Jsyhw_JyjcDao.xml | 7 + .../mappers/Data_MicroclimateDao.xml | 6 + .../resources/mappers/Data_SF6_QtsfDao.xml | 6 + .../resources/mappers/Data_SF6_QtylDao.xml | 6 + src/main/resources/mappers/Data_TxDao.xml | 7 + src/main/resources/mappers/Data_WsDao.xml | 6 + src/main/resources/mappers/Data_YspDao.xml | 6 + src/main/resources/mappers/Data_YxDao.xml | 12 +- .../resources/mappers/Upload_checkDao.xml | 8 +- src/main/resources/mappers/data_FhzxqDao.xml | 6 + 43 files changed, 428 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/shxy/i2/Tool/AsyncMethod.java b/src/main/java/com/shxy/i2/Tool/AsyncMethod.java index f85bb4a..f95d65c 100644 --- a/src/main/java/com/shxy/i2/Tool/AsyncMethod.java +++ b/src/main/java/com/shxy/i2/Tool/AsyncMethod.java @@ -8,6 +8,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 lombok.extern.slf4j.Slf4j; import org.apache.cxf.endpoint.Client; import org.springframework.beans.factory.annotation.Autowired; @@ -64,6 +65,9 @@ public class AsyncMethod { @Autowired private Data_CnjDao data_cnjDao; + @Autowired + private Upload_checkDao upload_checkDao; + @Async(value = "asyncServiceExecutor") public void sendData(Client client, List idlist, String xml, String type) throws Exception { @@ -126,12 +130,51 @@ public class AsyncMethod { } +// @Async(value = "asyncServiceExecutor") +// public void sendJBFDData(Client client, ArrayList idlist, String xml, String type) throws Exception { +// Object[] objects = client.invoke("uploadCACData", xml); +// String threadId = Thread.currentThread().getName(); +// log.info("线程序号： " + threadId + "当前时间：" + new Date()); +//// log.info("上传的数据： " + xml); +// if (objects != null && objects.length > 0) { +// String string = String.valueOf(objects[0]); +// log.info("返回的长度 ： " + objects.length + " 返回的对象 ： " + string); +// JSONObject jsonObject = XML.toJSONObject(string); +// if (jsonObject != null) { +// JSONObject response = (JSONObject) jsonObject.get("response"); +// if (response != null) { +// JSONObject result = (JSONObject) response.get("result"); +// if (result != null) { +// Integer code = (Integer) result.get("code"); +// if (code != null && code.intValue() == 0) { +// log.info("上传成功"); +// log.info("修改的id: " + idlist.toString()); +// if (CollectionUtil.isNotEmpty(idlist)) { +// if (StrUtil.equals(type, Constant.BYQ_JBFD)) { +// data_byq_jbfdDao.updateDataList(CommonStatus.UPLOAD.value(), idlist, new Date()); +// } else if (StrUtil.equals(type, Constant.DLQJBFD)) { +// data_dlq_jbfdDao.updateDataList(CommonStatus.UPLOAD.value(), idlist, new Date()); +// } else if (StrUtil.equals(type, Constant.YSP)) { +// data_yspDao.updateDataList(CommonStatus.UPLOAD.value(), idlist, new Date()); +// } +// +// +// } +// } else { +// log.info("上传失败"); +// } +// } +// } +// } +// } +// } + @Async(value = "asyncServiceExecutor") - public void sendJBFDData(Client client, ArrayList idlist, String xml, String type) throws Exception { + public void sendJBFDData2(Client client, BigInteger maxid, ArrayList list1, String xml, String type) throws Exception { Object[] objects = client.invoke("uploadCACData", xml); String threadId = Thread.currentThread().getName(); log.info("线程序号： " + threadId + "当前时间：" + new Date()); -// log.info("上传的数据： " + xml); +// log.info("上传的油色谱数据： " + xml); if (objects != null && objects.length > 0) { String string = String.valueOf(objects[0]); log.info("返回的长度 ： " + objects.length + " 返回的对象 ： " + string); @@ -144,14 +187,14 @@ public class AsyncMethod { Integer code = (Integer) result.get("code"); if (code != null && code.intValue() == 0) { log.info("上传成功"); - log.info("修改的id: " + idlist.toString()); - if (CollectionUtil.isNotEmpty(idlist)) { + log.info("修改的id: " + list1.toString()); + if (CollectionUtil.isNotEmpty(list1)) { if (StrUtil.equals(type, Constant.BYQ_JBFD)) { - data_byq_jbfdDao.updateDataList(CommonStatus.UPLOAD.value(), idlist, new Date()); + data_byq_jbfdDao.updateDataList2(CommonStatus.UPLOAD.value(), maxid, list1, new Date()); } else if (StrUtil.equals(type, Constant.DLQJBFD)) { - data_dlq_jbfdDao.updateDataList(CommonStatus.UPLOAD.value(), idlist, new Date()); + data_dlq_jbfdDao.updateDataList2(CommonStatus.UPLOAD.value(), maxid, list1, new Date()); } else if (StrUtil.equals(type, Constant.YSP)) { - data_yspDao.updateDataList(CommonStatus.UPLOAD.value(), idlist, new Date()); + data_yspDao.updateDataList2(CommonStatus.UPLOAD.value(), maxid, list1, new Date()); } @@ -166,11 +209,10 @@ public class AsyncMethod { } @Async(value = "asyncServiceExecutor") - public void sendJBFDData2(Client client, BigInteger maxid, ArrayList list1, String xml, String type) throws Exception { + public void sendYxData(Client client, BigInteger maxid, String xml) throws Exception { Object[] objects = client.invoke("uploadCACData", xml); - String threadId = Thread.currentThread().getName(); - log.info("线程序号： " + threadId + "当前时间：" + new Date()); -// log.info("上传的数据： " + xml); +// String threadId = Thread.currentThread().getName(); +// log.info("线程序号： " + threadId + "当前时间：" + new Date()); if (objects != null && objects.length > 0) { String string = String.valueOf(objects[0]); log.info("返回的长度 ： " + objects.length + " 返回的对象 ： " + string); @@ -183,17 +225,8 @@ public class AsyncMethod { Integer code = (Integer) result.get("code"); if (code != null && code.intValue() == 0) { log.info("上传成功"); - log.info("修改的id: " + list1.toString()); - if (CollectionUtil.isNotEmpty(list1)) { - if (StrUtil.equals(type, Constant.BYQ_JBFD)) { - data_byq_jbfdDao.updateDataList2(CommonStatus.UPLOAD.value(), maxid,list1, new Date()); - } else if (StrUtil.equals(type, Constant.DLQJBFD)) { - data_dlq_jbfdDao.updateDataList2(CommonStatus.UPLOAD.value(),maxid, list1, new Date()); - } else if (StrUtil.equals(type, Constant.YSP)) { - data_yspDao.updateDataList2(CommonStatus.UPLOAD.value(), maxid, list1, new Date()); - } - - + if (maxid != null && maxid.longValue() > 0) { + upload_checkDao.updateByPrimaryKey(Constant.YXID, maxid, new Date()); } } else { log.info("上传失败"); diff --git a/src/main/java/com/shxy/i2/Tool/GenerateI2Xml.java b/src/main/java/com/shxy/i2/Tool/GenerateI2Xml.java index 9df989e..d194f56 100644 --- a/src/main/java/com/shxy/i2/Tool/GenerateI2Xml.java +++ b/src/main/java/com/shxy/i2/Tool/GenerateI2Xml.java @@ -2,6 +2,7 @@ package com.shxy.i2.Tool; import cn.hutool.core.util.StrUtil; import com.shxy.i2.bean.AttrBean; +import com.shxy.i2.bean.YxAttrBean; import com.shxy.i2.constant.Constant; import java.util.ArrayList; @@ -40,4 +41,43 @@ public class GenerateI2Xml { return cacxml; } + + public static String generateYxCacXml(YxAttrBean attr) { + String cacdata = ""; + String sensorid = attr.getSensorid(); + String equipmentid = attr.getEquipmentid(); + String devicetype = attr.getDevicetype(); + String timestamp = attr.getTimestamp(); + String key = attr.getKey(); + Integer value = attr.getValue(); + String phase = attr.getPhase(); + + String status = "FALSE"; + if (value != null) { + if (value.intValue() == 0) { + status = "FALSE"; + } else { + status = "TRUE"; + } + if (StrUtil.isNotEmpty(sensorid) && StrUtil.isNotEmpty(equipmentid) && StrUtil.isNotEmpty(timestamp) && StrUtil.isNotEmpty(key)) { + cacdata += " "; + cacdata += " "; + cacdata += " "; + cacdata += " "; + cacdata += "" + devicetype + " "; + cacdata += "" + equipmentid + " "; + if (StrUtil.isNotEmpty(timestamp)) { + cacdata += "" + timestamp + " "; + } + cacdata += " "; + cacdata += " "; + cacdata += " "; + cacdata += " "; + cacdata += ""; + cacdata += " "; + cacdata += " "; + } + } + return cacdata; + } } diff --git a/src/main/java/com/shxy/i2/bean/YxAttrBean.java b/src/main/java/com/shxy/i2/bean/YxAttrBean.java index aeb7639..12f44c3 100644 --- a/src/main/java/com/shxy/i2/bean/YxAttrBean.java +++ b/src/main/java/com/shxy/i2/bean/YxAttrBean.java @@ -4,6 +4,11 @@ import lombok.Data; @Data public class YxAttrBean { + private String devicetype; + private String sensorid; + private String equipmentid; + private String timestamp; + private String phase; private String key; private T value; } diff --git a/src/main/java/com/shxy/i2/configure/ThreadPoolConfig.java b/src/main/java/com/shxy/i2/configure/ThreadPoolConfig.java index b88f292..2bdb251 100644 --- a/src/main/java/com/shxy/i2/configure/ThreadPoolConfig.java +++ b/src/main/java/com/shxy/i2/configure/ThreadPoolConfig.java @@ -22,7 +22,7 @@ public class ThreadPoolConfig { public Executor asyncServiceExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); //配置核心线程数 - executor.setCorePoolSize(20); + executor.setCorePoolSize(50); //配置最大线程数 executor.setMaxPoolSize(200); //配置队列大小 diff --git a/src/main/java/com/shxy/i2/constant/Constant.java b/src/main/java/com/shxy/i2/constant/Constant.java index 6ebda91..c7c8b88 100644 --- a/src/main/java/com/shxy/i2/constant/Constant.java +++ b/src/main/java/com/shxy/i2/constant/Constant.java @@ -20,4 +20,20 @@ public class Constant { public static String SF6_QTSF = "024005"; public static String CNJ = "024006"; public static String WQX = "025001"; + + + public static String data_byq_jbfd = "data_byq_jbfd"; + public static String data_cnj = "data_cnj"; + public static String data_dcyw = "data_dcyw"; + public static String data_dlq_jbfd = "data_dlq_jbfd"; + public static String data_dr_jyjc = "data_dr_jyjc"; + public static String data_fhdlbx = "data_fhdlbx"; + public static String data_fhzxq = "data_fhzxq"; + public static String data_jsyhw_jyjc = "data_jsyhw_jyjc"; + public static String data_microclimate = "data_microclimate"; + public static String data_sf6_qtsf = "data_sf6_qtsf"; + public static String data_sf6_qtyl = "data_sf6_qtyl"; + public static String data_tx = "data_tx"; + public static String data_ws = "data_ws"; + public static String data_ysp = "data_ysp"; } diff --git a/src/main/java/com/shxy/i2/dao/Data_Byq_JbfdDao.java b/src/main/java/com/shxy/i2/dao/Data_Byq_JbfdDao.java index e254d2c..0d1bcc6 100644 --- a/src/main/java/com/shxy/i2/dao/Data_Byq_JbfdDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_Byq_JbfdDao.java @@ -22,4 +22,5 @@ public interface Data_Byq_JbfdDao { int updateDataList2(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") ArrayList id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_CnjDao.java b/src/main/java/com/shxy/i2/dao/Data_CnjDao.java index 5e6fe6f..a4af70f 100644 --- a/src/main/java/com/shxy/i2/dao/Data_CnjDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_CnjDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Cnj; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_CnjDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_DcywDao.java b/src/main/java/com/shxy/i2/dao/Data_DcywDao.java index 9da6aa9..19926e3 100644 --- a/src/main/java/com/shxy/i2/dao/Data_DcywDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_DcywDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Dcyw; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_DcywDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_Dlq_JbfdDao.java b/src/main/java/com/shxy/i2/dao/Data_Dlq_JbfdDao.java index 07ec473..4cc6c8d 100644 --- a/src/main/java/com/shxy/i2/dao/Data_Dlq_JbfdDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_Dlq_JbfdDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.bean.SendDataBean; import com.shxy.i2.entity.Data_Dlq_Jbfd; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,5 @@ public interface Data_Dlq_JbfdDao { int updateDataList2(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") ArrayList id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_Dr_JyjcDao.java b/src/main/java/com/shxy/i2/dao/Data_Dr_JyjcDao.java index faad3fe..024543c 100644 --- a/src/main/java/com/shxy/i2/dao/Data_Dr_JyjcDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_Dr_JyjcDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Dr_Jyjc; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_Dr_JyjcDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_FhdlbxDao.java b/src/main/java/com/shxy/i2/dao/Data_FhdlbxDao.java index 2a602b3..2b33ee9 100644 --- a/src/main/java/com/shxy/i2/dao/Data_FhdlbxDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_FhdlbxDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Fhdlbx; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_FhdlbxDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_FhzxqDao.java b/src/main/java/com/shxy/i2/dao/Data_FhzxqDao.java index 551200e..fbde878 100644 --- a/src/main/java/com/shxy/i2/dao/Data_FhzxqDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_FhzxqDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Fhzxq; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_FhzxqDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_Jsyhw_JyjcDao.java b/src/main/java/com/shxy/i2/dao/Data_Jsyhw_JyjcDao.java index 63d2b55..e4e75b6 100644 --- a/src/main/java/com/shxy/i2/dao/Data_Jsyhw_JyjcDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_Jsyhw_JyjcDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Jsyhw_Jyjc; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_Jsyhw_JyjcDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_MicroclimateDao.java b/src/main/java/com/shxy/i2/dao/Data_MicroclimateDao.java index b874b17..5d505d8 100644 --- a/src/main/java/com/shxy/i2/dao/Data_MicroclimateDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_MicroclimateDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Microclimate; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_MicroclimateDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_SF6_QtsfDao.java b/src/main/java/com/shxy/i2/dao/Data_SF6_QtsfDao.java index abc4f1d..d99c213 100644 --- a/src/main/java/com/shxy/i2/dao/Data_SF6_QtsfDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_SF6_QtsfDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_SF6_Qtsf; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_SF6_QtsfDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_SF6_QtylDao.java b/src/main/java/com/shxy/i2/dao/Data_SF6_QtylDao.java index a272879..cdf6602 100644 --- a/src/main/java/com/shxy/i2/dao/Data_SF6_QtylDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_SF6_QtylDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_SF6_Qtyl; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_SF6_QtylDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_TxDao.java b/src/main/java/com/shxy/i2/dao/Data_TxDao.java index 58ce5e9..78c21d6 100644 --- a/src/main/java/com/shxy/i2/dao/Data_TxDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_TxDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Tx; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_TxDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_WsDao.java b/src/main/java/com/shxy/i2/dao/Data_WsDao.java index 17552d6..c61147f 100644 --- a/src/main/java/com/shxy/i2/dao/Data_WsDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_WsDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Ws; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,5 @@ public interface Data_WsDao { int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_YspDao.java b/src/main/java/com/shxy/i2/dao/Data_YspDao.java index daffd79..3da316f 100644 --- a/src/main/java/com/shxy/i2/dao/Data_YspDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_YspDao.java @@ -1,5 +1,6 @@ package com.shxy.i2.dao; +import cn.hutool.core.date.DateTime; import com.shxy.i2.bean.SendDataBean; import com.shxy.i2.entity.Data_Ysp; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,5 @@ public interface Data_YspDao { int updateDataList2(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") ArrayList id, @Param("updateTime") Date updateTime); + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Data_YxDao.java b/src/main/java/com/shxy/i2/dao/Data_YxDao.java index 20c2873..4069b61 100644 --- a/src/main/java/com/shxy/i2/dao/Data_YxDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_YxDao.java @@ -5,13 +5,14 @@ import com.shxy.i2.entity.Data_Yx; import org.apache.ibatis.annotations.Param; import java.math.BigInteger; +import java.util.Date; import java.util.List; public interface Data_YxDao { - List selectByPrimaryKey(@Param("maxid") BigInteger maxid); - int updateByPrimaryKey(Data_Yx record); + + int deleteData(@Param("time") Date time); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dao/Upload_checkDao.java b/src/main/java/com/shxy/i2/dao/Upload_checkDao.java index b5f7aed..c1bcca3 100644 --- a/src/main/java/com/shxy/i2/dao/Upload_checkDao.java +++ b/src/main/java/com/shxy/i2/dao/Upload_checkDao.java @@ -1,17 +1,15 @@ package com.shxy.i2.dao; import com.shxy.i2.entity.Upload_check; +import org.apache.ibatis.annotations.Param; -public interface Upload_checkDao { - int deleteByPrimaryKey(String checkType); - - int insert(Upload_check record); +import java.math.BigInteger; +import java.util.Date; - int insertSelective(Upload_check record); +public interface Upload_checkDao { Upload_check selectByPrimaryKey(String checkType); - int updateByPrimaryKeySelective(Upload_check record); - int updateByPrimaryKey(Upload_check record); + int updateByPrimaryKey(@Param("checkType") String checkType, @Param("value") BigInteger value, @Param("updateTime") Date updateTime); } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/dto/Data_YxlDto.java b/src/main/java/com/shxy/i2/dto/Data_YxlDto.java index 862265c..7e435d3 100644 --- a/src/main/java/com/shxy/i2/dto/Data_YxlDto.java +++ b/src/main/java/com/shxy/i2/dto/Data_YxlDto.java @@ -2,12 +2,14 @@ package com.shxy.i2.dto; import lombok.Data; +import java.math.BigInteger; import java.util.Date; import java.util.List; @Data public class Data_YxlDto { + BigInteger id; Integer sadr; Date dtime; Integer ival; diff --git a/src/main/java/com/shxy/i2/service/Webservcies.java b/src/main/java/com/shxy/i2/service/Webservcies.java index e5459a5..1454600 100644 --- a/src/main/java/com/shxy/i2/service/Webservcies.java +++ b/src/main/java/com/shxy/i2/service/Webservcies.java @@ -3,7 +3,9 @@ package com.shxy.i2.service; public interface Webservcies { void uploadData(); - void uploadyspData(); + + + void uploadyspData(); void uploadjfjcData(); diff --git a/src/main/java/com/shxy/i2/service/XydlI2Service.java b/src/main/java/com/shxy/i2/service/XydlI2Service.java index 7f75ee2..3ede48b 100644 --- a/src/main/java/com/shxy/i2/service/XydlI2Service.java +++ b/src/main/java/com/shxy/i2/service/XydlI2Service.java @@ -35,5 +35,7 @@ public interface XydlI2Service { void upload_cnj(Client client, HashMap equipMap); - void upload_yx(Client client, HashMap equipMap); + void upload_yx(Client client); + + void clear_history(); } diff --git a/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java b/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java index d39d498..7736c82 100644 --- a/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java +++ b/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java @@ -70,10 +70,38 @@ public class WebServiceImpl implements Webservcies { xydlI2Service.upload_jsyhw_jyjc(client, equipMap); xydlI2Service.upload_microclimate(client, equipMap); xydlI2Service.upload_cnj(client, equipMap); + xydlI2Service.upload_yx(client); + log.info("实时数据定时任务结束"); } +// /** +// * 上传cac数据 +// */ +// @Override +// public void uploadYxData() { +// log.info("实时数据遥信定时任务启动"); +//// 动态客户端 +// JaxWsDynamicClientFactory clientFactory = JaxWsDynamicClientFactory.newInstance(); +// log.info("实时数据 publicsecurity webService url : {}", address); +// //根据WebServices接口地址创建client +// Client client = clientFactory.createClient(address); +// HTTPConduit conduit = (HTTPConduit) client.getConduit(); +// HTTPClientPolicy policy = new HTTPClientPolicy(); +// policy.setAllowChunking(false); +// // 连接服务器超时时间 60秒 +// policy.setConnectionTimeout(60000); +// // 等待服务器响应超时时间 60秒 +// policy.setReceiveTimeout(30000); +// conduit.setClient(policy); +// log.info("开始执行定时遥信任务-查询数据库"); +// xydlI2Service.upload_yx(client); +// +// log.info("实时数据定时遥信任务结束"); +// +// } + @Override public void uploadyspData() { log.info("油色谱数据定时任务启动"); diff --git a/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java b/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java index 0e4080b..866b4c4 100644 --- a/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java +++ b/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java @@ -2,12 +2,14 @@ package com.shxy.i2.serviceimpl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.shxy.i2.Tool.AsyncMethod; import com.shxy.i2.Tool.GenerateI2Xml; import com.shxy.i2.bean.AttrBean; import com.shxy.i2.bean.SendDataBean; +import com.shxy.i2.bean.YxAttrBean; import com.shxy.i2.constant.CommonStatus; import com.shxy.i2.constant.Constant; import com.shxy.i2.dao.*; @@ -96,6 +98,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Byq_Jbfd item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -188,6 +193,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Cnj item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -304,6 +312,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Dlq_Jbfd item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -395,6 +406,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Dr_Jyjc item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -485,6 +499,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Fhdlbx item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -547,6 +564,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Fhzxq item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -609,6 +629,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Jsyhw_Jyjc item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -692,6 +715,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_SF6_Qtsf item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -754,6 +780,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_SF6_Qtyl item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -830,6 +859,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Tx item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -885,6 +917,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Ws item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -941,9 +976,14 @@ public class XydlI2ServiceImpl implements XydlI2Service { ArrayList eqmidlist = new ArrayList<>(); BigInteger maxid = BigInteger.valueOf(0); + log.info("测试断点1"); for (int index = 0; index < list.size(); index++) { + log.info("测试断点2"); Data_Ysp item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -1047,10 +1087,13 @@ public class XydlI2ServiceImpl implements XydlI2Service { maxid = id; } } + log.info("测试断点3"); if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { + log.info("测试断点4"); ArrayList list1 = new ArrayList<>(); String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); list1.addAll(idlist); + log.info("ysp组装完成，开始上传"); // asyncMethod.sendJBFDData(client, list2, xml, Constant.YSP); asyncMethod.sendJBFDData2(client, maxid, eqmidlist, xml, Constant.YSP); maxid = BigInteger.valueOf(0); @@ -1078,6 +1121,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { for (int index = 0; index < list.size(); index++) { Data_Microclimate item = list.get(index); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); @@ -1159,9 +1205,12 @@ public class XydlI2ServiceImpl implements XydlI2Service { } @Override - public void upload_yx(Client client, HashMap equipMap) { + public void upload_yx(Client client) { Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.YXID); BigInteger value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } List list = data_yxDao.selectByPrimaryKey(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询microclimate的数据量：" + list.size()); @@ -1175,78 +1224,88 @@ public class XydlI2ServiceImpl implements XydlI2Service { Integer ival = data_yxlDto.getIval(); Integer sadr = data_yxlDto.getSadr(); String phase = data_yxlDto.getPhase(); + BigInteger id = data_yxlDto.getId(); - 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); - } + YxAttrBean attr = new YxAttrBean<>(); + attr.setSensorid(sensorid); + attr.setEquipmentid(equipmentid); - - if (StrUtil.equals(field, "dischargeWaveform")) { - AttrBean attr = new AttrBean<>(); - attr.setKey("DischargeWaveform"); - attr.setValue(ival); + String timestamp = ""; + if (dtime != null) { + timestamp = DateUtil.format(dtime, DatePattern.NORM_DATETIME_PATTERN); + attr.setTimestamp(timestamp); + } + attr.setPhase(phase); + attr.setKey(field); + attr.setValue(ival); + if (StrUtil.equals(tableName, Constant.data_byq_jbfd)) { + attr.setDevicetype(Constant.BYQ_JBFD); + } else if (StrUtil.equals(tableName, Constant.data_cnj)) { + attr.setDevicetype(Constant.CNJ); + } else if (StrUtil.equals(tableName, Constant.data_dcyw)) { + attr.setDevicetype(Constant.DCYW); + } else if (StrUtil.equals(tableName, Constant.data_dlq_jbfd)) { + attr.setDevicetype(Constant.DLQJBFD); + } else if (StrUtil.equals(tableName, Constant.data_dr_jyjc)) { + attr.setDevicetype(Constant.DRJYJC); + } else if (StrUtil.equals(tableName, Constant.data_fhdlbx)) { + attr.setDevicetype(Constant.FHDLBX); + } else if (StrUtil.equals(tableName, Constant.data_fhzxq)) { + attr.setDevicetype(Constant.FHZXQ); + } else if (StrUtil.equals(tableName, Constant.data_jsyhw_jyjc)) { + attr.setDevicetype(Constant.JSYHW); + } else if (StrUtil.equals(tableName, Constant.data_microclimate)) { + attr.setDevicetype(Constant.WQX); + } else if (StrUtil.equals(tableName, Constant.data_sf6_qtsf)) { + attr.setDevicetype(Constant.SF6_QTSF); + } else if (StrUtil.equals(tableName, Constant.data_sf6_qtyl)) { + attr.setDevicetype(Constant.SF6_QTYL); + } else if (StrUtil.equals(tableName, Constant.data_tx)) { + attr.setDevicetype(Constant.TX); + } else if (StrUtil.equals(tableName, Constant.data_ws)) { + attr.setDevicetype(Constant.WS); + } else if (StrUtil.equals(tableName, Constant.data_ysp)) { + attr.setDevicetype(Constant.YSP); + } + try { + BigInteger maxid = BigInteger.valueOf(0); + String xml = GenerateI2Xml.generateYxCacXml(attr); + if (xml != null && !xml.equals("")) { + if (index == (list.size() - 1)) { + maxid = id; + asyncMethod.sendYxData(client, maxid, xml); + } else { + asyncMethod.sendYxData(client, maxid, xml); + } } - } 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)) { - + } catch (Exception e) { + e.printStackTrace(); } - } } } + @Override + public void clear_history() { + DateTime dateTime = DateUtil.offsetDay(new Date(), -7); + data_byq_jbfdDao.deleteData(dateTime); + data_cnjDao.deleteData(dateTime); + data_dcywDao.deleteData(dateTime); + data_dlq_jbfdDao.deleteData(dateTime); + data_dr_jyjcDao.deleteData(dateTime); + data_fhdlbxDao.deleteData(dateTime); + data_fhzxqDao.deleteData(dateTime); + data_jsyhw_jyjcDao.deleteData(dateTime); + data_microclimateDao.deleteData(dateTime); + data_sf6_qtsfDao.deleteData(dateTime); + data_sf6_qtylDao.deleteData(dateTime); + data_txDao.deleteData(dateTime); + data_wsDao.deleteData(dateTime); + data_yspDao.deleteData(dateTime); + data_yxDao.deleteData(dateTime); + } + } diff --git a/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java b/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java index 9cc5f4e..4c6950e 100644 --- a/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java +++ b/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java @@ -24,6 +24,9 @@ public class ScheduledTask { @Autowired Webservcies webservcies; + @Autowired + XydlI2Service xydlI2Service; + @Async(value = "asyncServiceExecutor") @Scheduled(fixedDelay = 60 * 60 * 1000) public void cacyspupload() { @@ -40,9 +43,21 @@ public class ScheduledTask { @Scheduled(fixedDelay = 5 * 30 * 1000) public void cacupload() { webservcies.uploadData(); + } + + + @Scheduled(cron = "15 11 * * * ?") + public void clear() { + xydlI2Service.clear_history(); + } + + // @Scheduled(cron = "0 0/1 * * * ?") +// @Scheduled(fixedDelay = 5 * 30 * 1000) +// public void cacyxupload() { +// webservcies.uploadYxData(); // String str = "aaaa"; // webservcies.test(str); - } +// } // // @Scheduled(cron = "0 * * * * ?") diff --git a/src/main/resources/mappers/Data_Byq_JbfdDao.xml b/src/main/resources/mappers/Data_Byq_JbfdDao.xml index be574bf..dea8fe5 100644 --- a/src/main/resources/mappers/Data_Byq_JbfdDao.xml +++ b/src/main/resources/mappers/Data_Byq_JbfdDao.xml @@ -120,4 +120,10 @@ + + + delete + from data_byq_jbfd + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_CnjDao.xml b/src/main/resources/mappers/Data_CnjDao.xml index 279d00e..b5f90b2 100644 --- a/src/main/resources/mappers/Data_CnjDao.xml +++ b/src/main/resources/mappers/Data_CnjDao.xml @@ -57,4 +57,10 @@ #{id} + + + delete + from data_cnj + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_DcywDao.xml b/src/main/resources/mappers/Data_DcywDao.xml index 1965475..7b9e833 100644 --- a/src/main/resources/mappers/Data_DcywDao.xml +++ b/src/main/resources/mappers/Data_DcywDao.xml @@ -56,4 +56,11 @@ #{id} + + + delete + from data_dcyw + where acquisitionTime #{time} + + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_Dlq_JbfdDao.xml b/src/main/resources/mappers/Data_Dlq_JbfdDao.xml index 525b99f..29dbe95 100644 --- a/src/main/resources/mappers/Data_Dlq_JbfdDao.xml +++ b/src/main/resources/mappers/Data_Dlq_JbfdDao.xml @@ -121,4 +121,10 @@ + + + delete + from data_dlq_jbfd + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_Dr_JyjcDao.xml b/src/main/resources/mappers/Data_Dr_JyjcDao.xml index c551914..943dc98 100644 --- a/src/main/resources/mappers/Data_Dr_JyjcDao.xml +++ b/src/main/resources/mappers/Data_Dr_JyjcDao.xml @@ -63,4 +63,10 @@ + + delete + from data_dr_jyjc + where acquisitionTime #{time} + + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_FhdlbxDao.xml b/src/main/resources/mappers/Data_FhdlbxDao.xml index 6eda605..8f00b78 100644 --- a/src/main/resources/mappers/Data_FhdlbxDao.xml +++ b/src/main/resources/mappers/Data_FhdlbxDao.xml @@ -57,4 +57,10 @@ #{id} + + + delete + from data_fhdlbx + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml b/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml index 0194abc..f952ab6 100644 --- a/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml +++ b/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml @@ -62,4 +62,11 @@ #{id} + + + delete + from data_jsyhw_jyjc + where acquisitionTime #{time} + + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_MicroclimateDao.xml b/src/main/resources/mappers/Data_MicroclimateDao.xml index af5b28c..f5384cf 100644 --- a/src/main/resources/mappers/Data_MicroclimateDao.xml +++ b/src/main/resources/mappers/Data_MicroclimateDao.xml @@ -66,4 +66,10 @@ #{id} + + + delete + from data_microclimate + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_SF6_QtsfDao.xml b/src/main/resources/mappers/Data_SF6_QtsfDao.xml index 5d066fe..3b450ba 100644 --- a/src/main/resources/mappers/Data_SF6_QtsfDao.xml +++ b/src/main/resources/mappers/Data_SF6_QtsfDao.xml @@ -59,4 +59,10 @@ #{id} + + + delete + from data_sf6_qtsf + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_SF6_QtylDao.xml b/src/main/resources/mappers/Data_SF6_QtylDao.xml index a3020b7..0b6d58d 100644 --- a/src/main/resources/mappers/Data_SF6_QtylDao.xml +++ b/src/main/resources/mappers/Data_SF6_QtylDao.xml @@ -80,7 +80,13 @@ #{id} + + + delete + from data_sf6_qtyl + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_TxDao.xml b/src/main/resources/mappers/Data_TxDao.xml index 32b4e46..9ad3653 100644 --- a/src/main/resources/mappers/Data_TxDao.xml +++ b/src/main/resources/mappers/Data_TxDao.xml @@ -58,4 +58,11 @@ #{id} + + + delete + from data_tx + where acquisitionTime #{time} + + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_WsDao.xml b/src/main/resources/mappers/Data_WsDao.xml index 4d90f3e..8b53ede 100644 --- a/src/main/resources/mappers/Data_WsDao.xml +++ b/src/main/resources/mappers/Data_WsDao.xml @@ -57,4 +57,10 @@ #{id} + + + delete + from data_ws + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_YspDao.xml b/src/main/resources/mappers/Data_YspDao.xml index c5b5ae8..b780e72 100644 --- a/src/main/resources/mappers/Data_YspDao.xml +++ b/src/main/resources/mappers/Data_YspDao.xml @@ -123,4 +123,10 @@ + + + delete + from data_ysp + where acquisitionTime #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Data_YxDao.xml b/src/main/resources/mappers/Data_YxDao.xml index 3c26150..da0d833 100644 --- a/src/main/resources/mappers/Data_YxDao.xml +++ b/src/main/resources/mappers/Data_YxDao.xml @@ -2,8 +2,9 @@ + - + @@ -15,6 +16,7 @@ + + + delete + from data_yx + where d_time #{time} + \ No newline at end of file diff --git a/src/main/resources/mappers/Upload_checkDao.xml b/src/main/resources/mappers/Upload_checkDao.xml index eab90ff..cd39127 100644 --- a/src/main/resources/mappers/Upload_checkDao.xml +++ b/src/main/resources/mappers/Upload_checkDao.xml @@ -15,10 +15,10 @@ from upload_check where check_type = #{checkType,jdbcType=VARCHAR} - + update upload_check - set value = #{value,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where check_type = #{checkType,jdbcType=VARCHAR} + set value = #{value}, + update_time = #{updateTime} + where check_type = #{checkType} \ No newline at end of file diff --git a/src/main/resources/mappers/data_FhzxqDao.xml b/src/main/resources/mappers/data_FhzxqDao.xml index 91127c5..d47bf23 100644 --- a/src/main/resources/mappers/data_FhzxqDao.xml +++ b/src/main/resources/mappers/data_FhzxqDao.xml @@ -58,4 +58,10 @@ #{id} + + + delete + from data_fhzxq + where acquisitionTime #{time} + \ No newline at end of file