diff --git a/pom.xml b/pom.xml index 59eb97f..4ae64de 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,14 @@ + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + org.projectlombok diff --git a/src/main/java/com/shxy/i2/Tool/AsyncMethod.java b/src/main/java/com/shxy/i2/Tool/AsyncMethod.java index f95d65c..e19e296 100644 --- a/src/main/java/com/shxy/i2/Tool/AsyncMethod.java +++ b/src/main/java/com/shxy/i2/Tool/AsyncMethod.java @@ -4,11 +4,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.XML; -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; @@ -129,46 +127,6 @@ 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 sendJBFDData2(Client client, BigInteger maxid, ArrayList list1, String xml, String type) throws Exception { Object[] objects = client.invoke("uploadCACData", xml); @@ -196,8 +154,6 @@ public class AsyncMethod { } else if (StrUtil.equals(type, Constant.YSP)) { data_yspDao.updateDataList2(CommonStatus.UPLOAD.value(), maxid, list1, new Date()); } - - } } else { log.info("上传失败"); @@ -209,32 +165,63 @@ public class AsyncMethod { } @Async(value = "asyncServiceExecutor") - public void sendYxData(Client client, BigInteger maxid, String xml) throws Exception { - Object[] objects = client.invoke("uploadCACData", xml); + public void sendData2(Client client, String xml) throws Exception { +// Object[] objects = client.invoke("uploadCACData", 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); - 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("上传成功"); +// 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("上传成功"); +// } else { +// log.info("上传失败"); +// } +// } +// } +// } +// } + } + + + @Async(value = "asyncServiceExecutor") + public void sendYxData(Client client, BigInteger maxid, String xml) throws Exception { +// Object[] objects = client.invoke("uploadCACData", 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("上传成功"); if (maxid != null && maxid.longValue() > 0) { upload_checkDao.updateByPrimaryKey(Constant.YXID, maxid, new Date()); } - } else { - log.info("上传失败"); - } - } - } - } - } +// } else { +// log.info("上传失败"); +// } +// } +// } +// } +// } + } + + public void updateRecordId(BigInteger maxid,String type) { + if (maxid != null && maxid.longValue() > 0) { + upload_checkDao.updateByPrimaryKey(type, maxid, new Date()); + } } } diff --git a/src/main/java/com/shxy/i2/Tool/StringUtils.java b/src/main/java/com/shxy/i2/Tool/StringUtils.java new file mode 100644 index 0000000..6b00f73 --- /dev/null +++ b/src/main/java/com/shxy/i2/Tool/StringUtils.java @@ -0,0 +1,449 @@ +package com.shxy.i2.Tool; + +import cn.hutool.core.text.StrFormatter; +import org.springframework.util.AntPathMatcher; + +import java.util.*; + +/** + * 字符串工具类 + * + * @author 晶晶 + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils { + /** + * 空字符串 + */ + private static final String NULLSTR = ""; + + /** + * 下划线 + */ + private static final char SEPARATOR = '_'; + + /** + * 获取参数不为空值 + * + * @param value defaultValue 要判断的value + * @return value 返回值 + */ + public static T nvl(T value, T defaultValue) { + return value != null ? value : defaultValue; + } + + /** + * * 判断一个Collection是否为空， 包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Collection coll) { + return isNull(coll) || coll.isEmpty(); + } + + /** + * * 判断一个Collection是否非空，包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：非空 false：空 + */ + public static boolean isNotEmpty(Collection coll) { + return !isEmpty(coll); + } + + /** + * * 判断一个对象数组是否为空 + * + * @param objects 要判断的对象数组 + * * @return true：为空 false：非空 + */ + public static boolean isEmpty(Object[] objects) { + return isNull(objects) || (objects.length == 0); + } + + /** + * * 判断一个对象数组是否非空 + * + * @param objects 要判断的对象数组 + * @return true：非空 false：空 + */ + public static boolean isNotEmpty(Object[] objects) { + return !isEmpty(objects); + } + + /** + * * 判断一个Map是否为空 + * + * @param map 要判断的Map + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Map map) { + return isNull(map) || map.isEmpty(); + } + + /** + * * 判断一个Map是否为空 + * + * @param map 要判断的Map + * @return true：非空 false：空 + */ + public static boolean isNotEmpty(Map map) { + return !isEmpty(map); + } + + /** + * * 判断一个字符串是否为空串 + * + * @param str String + * @return true：为空 false：非空 + */ + public static boolean isEmpty(String str) { + return isNull(str) || NULLSTR.equals(str.trim()); + } + + /** + * * 判断一个字符串是否为非空串 + * + * @param str String + * @return true：非空串 false：空串 + */ + public static boolean isNotEmpty(String str) { + return !isEmpty(str); + } + + /** + * * 判断一个对象是否为空 + * + * @param object Object + * @return true：为空 false：非空 + */ + public static boolean isNull(Object object) { + return object == null; + } + + /** + * * 判断一个对象是否非空 + * + * @param object Object + * @return true：非空 false：空 + */ + public static boolean isNotNull(Object object) { + return !isNull(object); + } + + /** + * * 判断一个对象是否是数组类型（Java基本型别的数组） + * + * @param object 对象 + * @return true：是数组 false：不是数组 + */ + public static boolean isArray(Object object) { + return isNotNull(object) && object.getClass().isArray(); + } + + /** + * 去空格 + */ + public static String trim(String str) { + return (str == null ? "" : str.trim()); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @return 结果 + */ + public static String substring(final String str, int start) { + if (str == null) { + return NULLSTR; + } + + if (start < 0) { + start = str.length() + start; + } + + if (start < 0) { + start = 0; + } + if (start > str.length()) { + return NULLSTR; + } + + return str.substring(start); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @param end 结束 + * @return 结果 + */ + public static String substring(final String str, int start, int end) { + if (str == null) { + return NULLSTR; + } + + if (end < 0) { + end = str.length() + end; + } + if (start < 0) { + start = str.length() + start; + } + + if (end > str.length()) { + end = str.length(); + } + + if (start > end) { + return NULLSTR; + } + + if (start < 0) { + start = 0; + } + if (end < 0) { + end = 0; + } + + return str.substring(start, end); + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param template 文本模板，被替换的部分用 {} 表示 + * @param params 参数值 + * @return 格式化后的文本 + */ + public static String format(String template, Object... params) { + if (isEmpty(params) || isEmpty(template)) { + return template; + } + return StrFormatter.format(template, params); + } + + + /** + * 字符串转set + * + * @param str 字符串 + * @param sep 分隔符 + * @return set集合 + */ + public static final Set str2Set(String str, String sep) { + return new HashSet(str2List(str, sep, true, false)); + } + + /** + * 字符串转list + * + * @param str 字符串 + * @param sep 分隔符 + * @param filterBlank 过滤纯空白 + * @param trim 去掉首尾空白 + * @return list集合 + */ + public static final List str2List(String str, String sep, boolean filterBlank, boolean trim) { + List list = new ArrayList(); + if (StringUtils.isEmpty(str)) { + return list; + } + + // 过滤空白字符串 + if (StringUtils.isBlank(str)) { + return list; + } + String[] split = str.split(sep); + for (String string : split) { + if (StringUtils.isBlank(string)) { + continue; + } + if (trim) { + string = string.trim(); + } + list.add(string); + } + + return list; + } + + /** + * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 + * + * @param cs 指定字符串 + * @param searchCharSequences 需要检查的字符串数组 + * @return 是否包含任意一个字符串 + */ + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { + if (isEmpty(cs) || isEmpty(searchCharSequences)) { + return false; + } + for (CharSequence testStr : searchCharSequences) { + if (containsIgnoreCase(cs, testStr)) { + return true; + } + } + return false; + } + + /** + * 驼峰转下划线命名 + */ + public static String toUnderScoreCase(String str) { + if (str == null) { + return null; + } + StringBuilder sb = new StringBuilder(); + // 前置字符是否大写 + boolean preCharIsUpperCase = true; + // 当前字符是否大写 + boolean curreCharIsUpperCase = true; + // 下一字符是否大写 + boolean nexteCharIsUpperCase = true; + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (i > 0) { + preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1)); + } else { + preCharIsUpperCase = false; + } + + curreCharIsUpperCase = Character.isUpperCase(c); + + if (i < (str.length() - 1)) { + nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1)); + } + + if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) { + sb.append(SEPARATOR); + } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) { + sb.append(SEPARATOR); + } + sb.append(Character.toLowerCase(c)); + } + + return sb.toString(); + } + + /** + * 是否包含字符串 + * + * @param str 验证字符串 + * @param strs 字符串组 + * @return 包含返回true + */ + public static boolean inStringIgnoreCase(String str, String... strs) { + if (str != null && strs != null) { + for (String s : strs) { + if (str.equalsIgnoreCase(trim(s))) { + return true; + } + } + } + return false; + } + + /** + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld + * + * @param name 转换前的下划线大写方式命名的字符串 + * @return 转换后的驼峰式命名的字符串 + */ + public static String convertToCamelCase(String name) { + StringBuilder result = new StringBuilder(); + // 快速检查 + if (name == null || name.isEmpty()) { + // 没必要转换 + return ""; + } else if (!name.contains("_")) { + // 不含下划线，仅将首字母大写 + return name.substring(0, 1).toUpperCase() + name.substring(1); + } + // 用下划线将原始字符串分割 + String[] camels = name.split("_"); + for (String camel : camels) { + // 跳过原始字符串中开头、结尾的下换线或双重下划线 + if (camel.isEmpty()) { + continue; + } + // 首字母大写 + result.append(camel.substring(0, 1).toUpperCase()); + result.append(camel.substring(1).toLowerCase()); + } + return result.toString(); + } + + /** + * 驼峰式命名法 例如：user_name->userName + */ + public static String toCamelCase(String s) { + if (s == null) { + return null; + } + s = s.toLowerCase(); + StringBuilder sb = new StringBuilder(s.length()); + boolean upperCase = false; + for (int i = 0; i < s.length(); i++) { + char c = s.charAt(i); + + if (c == SEPARATOR) { + upperCase = true; + } else if (upperCase) { + sb.append(Character.toUpperCase(c)); + upperCase = false; + } else { + sb.append(c); + } + } + return sb.toString(); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } + + @SuppressWarnings("unchecked") + public static T cast(Object obj) { + return (T) obj; + } +} \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/Tool/sql/SqlUtils.java b/src/main/java/com/shxy/i2/Tool/sql/SqlUtils.java new file mode 100644 index 0000000..f8b9f35 --- /dev/null +++ b/src/main/java/com/shxy/i2/Tool/sql/SqlUtils.java @@ -0,0 +1,62 @@ +package com.shxy.i2.Tool.sql; + + +import cn.hutool.core.exceptions.UtilException; +import com.shxy.i2.Tool.StringUtils; + +/** + * sql操作工具类 + * + * @author ruoyi + */ +public class SqlUtils extends cn.hutool.db.sql.SqlUtil +{ + /** + * 定义常用的 sql关键字 + */ + public static String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare "; + + /** + * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） + */ + public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + + /** + * 检查字符，防止注入绕过 + */ + public static String escapeOrderBySql(String value) + { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) + { + throw new UtilException("参数不符合规范，不能进行查询"); + } + return value; + } + + /** + * 验证 order by 语法是否符合规范 + */ + public static boolean isValidOrderBySql(String value) + { + return value.matches(SQL_PATTERN); + } + + /** + * SQL关键字检查 + */ + public static void filterKeyword(String value) + { + if (StringUtils.isEmpty(value)) + { + return; + } + String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); + for (String sqlKeyword : sqlKeywords) + { + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) + { + throw new UtilException("参数存在SQL注入风险"); + } + } + } +} diff --git a/src/main/java/com/shxy/i2/constant/Constant.java b/src/main/java/com/shxy/i2/constant/Constant.java index c7c8b88..6828c20 100644 --- a/src/main/java/com/shxy/i2/constant/Constant.java +++ b/src/main/java/com/shxy/i2/constant/Constant.java @@ -5,6 +5,20 @@ public class Constant { public static String YXID = "yxid"; + public static String YSPID = "yspid"; + public static String BYQJBFDID = "byqjbfdid"; + public static String DLQJBFDID = "dlqjbfdid"; + public static String CNJID = "cnjid"; + public static String DCYWID = "dcywid"; + public static String DRJYJCID = "drjyjcid"; + public static String FHDLBXID = "fhdlbxid"; + public static String FHZXQID = "fhzxqid"; + public static String JSYHWJYJCID = "jsyhwjyjcid"; + public static String SF6QTSFID = "sf6qtsfid"; + public static String SF6QTYLID = "sf6qtylid"; + public static String TXID = "txid"; + public static String WSID = "wsid"; + public static String MICROCLIMATEID = "microclimateid"; public static String BYQ_JBFD = "021001"; public static String YSP = "021002"; 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 0d1bcc6..ee8db62 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 @@ -11,6 +11,8 @@ import java.util.List; public interface Data_Byq_JbfdDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); @@ -21,6 +23,6 @@ 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 a4af70f..5a62b91 100644 --- a/src/main/java/com/shxy/i2/dao/Data_CnjDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_CnjDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Cnj; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_CnjDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); @@ -17,4 +18,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 19926e3..a857c8d 100644 --- a/src/main/java/com/shxy/i2/dao/Data_DcywDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_DcywDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Dcyw; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_DcywDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); @@ -17,4 +18,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 4cc6c8d..3d056b5 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,6 +1,5 @@ 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; @@ -14,6 +13,8 @@ public interface Data_Dlq_JbfdDao { List selectUpload(@Param("isupload") Integer isupload); + List selectUploadById(@Param("maxid") BigInteger maxid); + int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); int updateList(@Param("isupload") Integer isupload, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 024543c..8c0ab69 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,6 +1,5 @@ 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; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_Dr_JyjcDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 2b33ee9..ad41867 100644 --- a/src/main/java/com/shxy/i2/dao/Data_FhdlbxDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_FhdlbxDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Fhdlbx; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_FhdlbxDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 fbde878..76c2cad 100644 --- a/src/main/java/com/shxy/i2/dao/Data_FhzxqDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_FhzxqDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Fhzxq; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_FhzxqDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 e4e75b6..d337a97 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,6 +1,5 @@ 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; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_Jsyhw_JyjcDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 5d505d8..89b4401 100644 --- a/src/main/java/com/shxy/i2/dao/Data_MicroclimateDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_MicroclimateDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Microclimate; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_MicroclimateDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 d99c213..d50d2e8 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,6 +1,5 @@ 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; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_SF6_QtsfDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 cdf6602..54d9f19 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,6 +1,5 @@ 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; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_SF6_QtylDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 78c21d6..6440e80 100644 --- a/src/main/java/com/shxy/i2/dao/Data_TxDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_TxDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Tx; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_TxDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 c61147f..64ffd9e 100644 --- a/src/main/java/com/shxy/i2/dao/Data_WsDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_WsDao.java @@ -1,6 +1,5 @@ package com.shxy.i2.dao; -import cn.hutool.core.date.DateTime; import com.shxy.i2.entity.Data_Ws; import org.apache.ibatis.annotations.Param; @@ -10,6 +9,8 @@ import java.util.List; public interface Data_WsDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 3da316f..b42be2e 100644 --- a/src/main/java/com/shxy/i2/dao/Data_YspDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_YspDao.java @@ -1,6 +1,5 @@ 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; @@ -12,6 +11,8 @@ import java.util.List; public interface Data_YspDao { + List selectUploadById(@Param("maxid") BigInteger maxid); + List selectUpload(@Param("isupload") Integer isupload); int updateByPrimaryKey(@Param("isupload") Integer isupload, @Param("maxid") BigInteger maxid, @Param("idlist") List id, @Param("updateTime") Date updateTime); 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 4069b61..e15a95f 100644 --- a/src/main/java/com/shxy/i2/dao/Data_YxDao.java +++ b/src/main/java/com/shxy/i2/dao/Data_YxDao.java @@ -1,7 +1,6 @@ package com.shxy.i2.dao; import com.shxy.i2.dto.Data_YxlDto; -import com.shxy.i2.entity.Data_Yx; import org.apache.ibatis.annotations.Param; import java.math.BigInteger; @@ -12,7 +11,5 @@ 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/service/Webservcies.java b/src/main/java/com/shxy/i2/service/Webservcies.java index 1454600..9baec6a 100644 --- a/src/main/java/com/shxy/i2/service/Webservcies.java +++ b/src/main/java/com/shxy/i2/service/Webservcies.java @@ -8,6 +8,9 @@ public interface Webservcies { void uploadyspData(); void uploadjfjcData(); + void uploadyxData(); -// void test(String str); + void uploaddcywData(); + + void uploadjsyhwjyjcData(); } diff --git a/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java b/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java index 7736c82..9a6afb1 100644 --- a/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java +++ b/src/main/java/com/shxy/i2/serviceimpl/WebServiceImpl.java @@ -11,6 +11,7 @@ import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.stereotype.Service; @@ -31,28 +32,39 @@ public class WebServiceImpl implements Webservcies { @Autowired private Niec_SensorsDao niec_sensorsDao; - private static String address = "http://10.238.71.98:18096/ppa/webservice/CAGAccessService?wsdl"; + + @Value("${webservice.address}") + public String address; + + @Value("${webservice.connecttime}") + public Integer connecttime; + + @Value("${webservice.receivetime}") + public Integer receivetime; + + + /** * 上传cac数据 */ @Override public void uploadData() { - 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("实时数据定时任务启动"); +// // 动态客户端 +// 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(connecttime); +// // 等待服务器响应超时时间 60秒 +// policy.setReceiveTimeout(receivetime); +// conduit.setClient(policy); + Client client = null; log.info("开始执行定时任务-查询数据库"); HashMap equipMap = new HashMap(); List niec_sensors = niec_sensorsDao.selectAll(); @@ -60,65 +72,37 @@ public class WebServiceImpl implements Webservcies { equipMap.put(item.getId(), item); } xydlI2Service.upload_sf6_qtyl(client, equipMap); - xydlI2Service.upload_dcyw(client, equipMap); + xydlI2Service.upload_fhdlbx(client, equipMap); xydlI2Service.upload_fhzxq(client, equipMap); xydlI2Service.upload_sf6_qtsf(client, equipMap); xydlI2Service.upload_tx(client, equipMap); xydlI2Service.upload_ws(client, equipMap); xydlI2Service.upload_dr_jyjc(client, equipMap); - 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("实时数据遥信定时任务启动"); -//// 动态客户端 +//放到配置文件 + @Override + public void uploadyspData() { +// log.info("油色谱数据定时任务启动"); +// // 动态客户端 // JaxWsDynamicClientFactory clientFactory = JaxWsDynamicClientFactory.newInstance(); -// log.info("实时数据 publicsecurity webService url : {}", address); +// 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); +// policy.setConnectionTimeout(connecttime); // // 等待服务器响应超时时间 60秒 -// policy.setReceiveTimeout(30000); +// policy.setReceiveTimeout(receivetime); // conduit.setClient(policy); -// log.info("开始执行定时遥信任务-查询数据库"); -// xydlI2Service.upload_yx(client); -// -// log.info("实时数据定时遥信任务结束"); -// -// } - - @Override - public void uploadyspData() { - 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(60000); - conduit.setClient(policy); - + Client client = null; log.info("开始执行定时任务-查询数据库"); HashMap equipMap = new HashMap(); List niec_sensors = niec_sensorsDao.selectAll(); @@ -131,21 +115,21 @@ public class WebServiceImpl implements Webservcies { @Override public void uploadjfjcData() { - - 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(60000); - conduit.setClient(policy); +// 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(connecttime); +// // 等待服务器响应超时时间 60秒 +// policy.setReceiveTimeout(receivetime); +// conduit.setClient(policy); + Client client = null; HashMap equipMap = new HashMap(); List niec_sensors = niec_sensorsDao.selectAll(); for (Niec_Sensors item : niec_sensors) { @@ -156,4 +140,85 @@ public class WebServiceImpl implements Webservcies { log.info("局放监测数据定时任务结束"); } + @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(connecttime); +// // 等待服务器响应超时时间 60秒 +// policy.setReceiveTimeout(receivetime); +// conduit.setClient(policy); + Client client = null; + log.info("开始执行定时任务-查询数据库"); + HashMap equipMap = new HashMap(); + List niec_sensors = niec_sensorsDao.selectAll(); + for (Niec_Sensors item : niec_sensors) { + equipMap.put(item.getId(), item); + } + xydlI2Service.upload_yx(client); + log.info("实时数据定时任务结束"); + } + + @Override + public void uploaddcywData() { + // 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(connecttime); +// // 等待服务器响应超时时间 60秒 +// policy.setReceiveTimeout(receivetime); +// conduit.setClient(policy); + Client client = null; + log.info("开始执行定时任务-查询数据库"); + HashMap equipMap = new HashMap(); + List niec_sensors = niec_sensorsDao.selectAll(); + for (Niec_Sensors item : niec_sensors) { + equipMap.put(item.getId(), item); + } + xydlI2Service.upload_dcyw(client, equipMap); + log.info("实时数据定时任务结束"); + } + + @Override + public void uploadjsyhwjyjcData() { + // 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(connecttime); +// // 等待服务器响应超时时间 60秒 +// policy.setReceiveTimeout(receivetime); +// conduit.setClient(policy); + Client client = null; + log.info("开始执行定时任务-查询数据库"); + HashMap equipMap = new HashMap(); + List niec_sensors = niec_sensorsDao.selectAll(); + for (Niec_Sensors item : niec_sensors) { + equipMap.put(item.getId(), item); + } + xydlI2Service.upload_jsyhw_jyjc(client, equipMap); + log.info("实时数据定时任务结束"); + } + } \ No newline at end of file diff --git a/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java b/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java index 2c4c497..b27c8c8 100644 --- a/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java +++ b/src/main/java/com/shxy/i2/serviceimpl/XydlI2ServiceImpl.java @@ -19,6 +19,7 @@ import com.shxy.i2.service.XydlI2Service; import lombok.extern.slf4j.Slf4j; import org.apache.cxf.endpoint.Client; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.math.BigInteger; @@ -31,7 +32,6 @@ import java.util.List; @Slf4j public class XydlI2ServiceImpl implements XydlI2Service { - @Autowired private Data_SF6_QtylDao data_sf6_qtylDao; @@ -84,19 +84,30 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Autowired AsyncMethod asyncMethod; + @Value("${webservice.receivetime}") + public int sendlimit; @Override public void upload_byq_jbfd(Client client, HashMap equipMap) { - List list = data_byq_jbfdDao.selectUpload(CommonStatus.UNUPLOAD.value()); - if (CollectionUtil.isNotEmpty(list)) { - log.info("查询byq_jbfd的数据量：" + list.size()); + //查询目前上传的变压器局部放电的id 记录变压器局部放电上传的id大小 + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.BYQJBFDID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List data_byq_jbfdlist = data_byq_jbfdDao.selectUploadById(value); + if (CollectionUtil.isNotEmpty(data_byq_jbfdlist)) { + log.info("查询byq_jbfd的数据量：" + data_byq_jbfdlist.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); - ArrayList list2 = new ArrayList<>(); - ArrayList eqmidlist = new ArrayList<>(); - BigInteger maxid = BigInteger.valueOf(0); - for (int index = 0; index < list.size(); index++) { - Data_Byq_Jbfd item = list.get(index); + BigInteger maxid = null; + for (int index = 0; index < data_byq_jbfdlist.size(); index++) { + Data_Byq_Jbfd item = data_byq_jbfdlist.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -104,7 +115,6 @@ public class XydlI2ServiceImpl implements XydlI2Service { String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); - if (StrUtil.isNotEmpty(sensorid) && StrUtil.isNotEmpty(equipmentid)) { ArrayList attrlist = new ArrayList<>(); try { @@ -150,27 +160,12 @@ public class XydlI2ServiceImpl implements XydlI2Service { String cacdata = GenerateI2Xml.generateCacXml(Constant.BYQ_JBFD, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); BigInteger id = item.getId(); - idlist.add(id); SendDataBean sendDataBean = new SendDataBean(); sendDataBean.setEqmid(item.getEqmid()); sendDataBean.setMaxid(id); - list2.add(sendDataBean); - eqmidlist.add(item.getEqmid()); - if (id != null) { - int i = id.compareTo(maxid); - if (i == 1) { - maxid = id; - } - } - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (data_byq_jbfdlist.size() - 1)) { 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); - idlist = new ArrayList<>(); - maxid = BigInteger.valueOf(0); - eqmidlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -178,6 +173,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.BYQJBFDID); } else { log.info("没有查询byq_jbfd的数据量"); } @@ -185,13 +181,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_cnj(Client client, HashMap equipMap) { - List list = data_cnjDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.CNJID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_cnjDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { - log.info("查询byq_jbfd的数据量：" + list.size()); + log.info("查询cnj的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Cnj item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -222,13 +229,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.CNJ, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.CNJ); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -236,6 +239,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.CNJID); } else { log.info("没有查询cnj的数据量"); } @@ -243,20 +247,32 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_dcyw(Client client, HashMap equipMap) { - List list = data_dcywDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.DCYWID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_dcywDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询dcyw的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Dcyw item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } String sensorid = sensors.getSensorCode(); String equipmentid = sensors.getEquipmentId(); String phase = sensors.getPhase(); - if (StrUtil.isNotEmpty(sensorid) && StrUtil.isNotEmpty(equipmentid)) { - ArrayList attrlist = new ArrayList<>(); try { String timestamp = ""; @@ -279,13 +295,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.DCYW, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.DCYW); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -293,6 +305,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.DCYWID); } else { log.info("没有查询dcyw的数据量"); } @@ -300,17 +313,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_dlq_jbfd(Client client, HashMap equipMap) { - List list = data_dlq_jbfdDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.DLQJBFDID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_dlq_jbfdDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询dlq_jbfd的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); - ArrayList list2 = new ArrayList<>(); - - ArrayList eqmidlist = new ArrayList<>(); - BigInteger maxid = BigInteger.valueOf(0); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Dlq_Jbfd item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -363,27 +383,10 @@ public class XydlI2ServiceImpl implements XydlI2Service { String cacdata = GenerateI2Xml.generateCacXml(Constant.DLQJBFD, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); BigInteger id = item.getId(); - idlist.add(id); - SendDataBean sendDataBean = new SendDataBean(); - sendDataBean.setEqmid(item.getEqmid()); - sendDataBean.setMaxid(id); - list2.add(sendDataBean); - eqmidlist.add(item.getEqmid()); - if (id != null) { - int i = id.compareTo(maxid); - if (i == 1) { - maxid = id; - } - } - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); -// asyncMethod.sendJBFDData(client, list2, xml, Constant.DLQJBFD); - asyncMethod.sendJBFDData2(client, maxid, eqmidlist, xml, Constant.DLQJBFD); + asyncMethod.sendData2(client,xml); maxid = BigInteger.valueOf(0); - eqmidlist = new ArrayList<>(); - idlist = new ArrayList<>(); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -391,6 +394,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.DLQJBFDID); } else { log.info("没有查询到dlq的数据"); } @@ -398,13 +402,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_dr_jyjc(Client client, HashMap equipMap) { - List list = data_dr_jyjcDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.DRJYJCID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_dr_jyjcDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询dr_jyjc的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Dr_Jyjc item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -470,13 +485,10 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.DRJYJC, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { ArrayList list1 = new ArrayList<>(); String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.DRJYJC); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -484,6 +496,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.DRJYJCID); } else { log.info("没有查询dr_jyjc的数据量"); } @@ -491,13 +504,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_fhdlbx(Client client, HashMap equipMap) { - List list = data_fhdlbxDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.FHDLBXID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_fhdlbxDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询fhdlbx的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Fhdlbx item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -535,13 +559,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.FHDLBX, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.FHDLBX); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client,xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -549,6 +569,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.FHDLBXID); } else { log.info("没有查询fhdlbx的数据量"); } @@ -556,13 +577,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_fhzxq(Client client, HashMap equipMap) { + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.FHZXQID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } List list = data_fhzxqDao.selectUpload(CommonStatus.UNUPLOAD.value()); if (CollectionUtil.isNotEmpty(list)) { log.info("查询fhzxq的数据量：" + list.size()); - ArrayList idlist = new ArrayList<>(); ArrayList cacdatalist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Fhzxq item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -600,13 +632,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.FHZXQ, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.FHZXQ); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -614,6 +642,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.FHZXQID); } else { log.info("没有查询fhzxq的数据量"); } @@ -621,13 +650,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_jsyhw_jyjc(Client client, HashMap equipMap) { - List list = data_jsyhw_jyjcDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.JSYHWJYJCID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_jsyhw_jyjcDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询jsyhw_jyjc的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Jsyhw_Jyjc item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -686,13 +726,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.JSYHW, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.JSYHW); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -700,6 +736,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.JSYHWJYJCID); } else { log.info("没有查询jsyhw_jyjc的数据量"); } @@ -707,13 +744,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_sf6_qtsf(Client client, HashMap equipMap) { - List list = data_sf6_qtsfDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.SF6QTSFID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_sf6_qtsfDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询sf6_qtsf的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_SF6_Qtsf item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -751,13 +799,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.SF6_QTSF, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.SF6_QTSF); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -765,6 +809,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.SF6QTSFID); } else { log.info("没有查询sf6_qtsf的数据量"); } @@ -772,92 +817,119 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_sf6_qtyl(Client client, HashMap equipMap) { - List list = data_sf6_qtylDao.selectUpload(CommonStatus.UNUPLOAD.value()); - if (CollectionUtil.isNotEmpty(list)) { - log.info("查询sf6_qtyl的数据量：" + list.size()); - ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); - 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; + + Boolean iscontiue = true; + while (iscontiue) { + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.SF6QTYLID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); } - String sensorid = sensors.getSensorCode(); - String equipmentid = sensors.getEquipmentId(); - String phase = sensors.getPhase(); - if (StrUtil.isNotEmpty(sensorid) && StrUtil.isNotEmpty(equipmentid)) { - ArrayList attrlist = new ArrayList<>(); - try { - String timestamp = ""; - Date acquisitiontime = item.getAcquisitiontime(); - if (acquisitiontime != null) { - timestamp = DateUtil.format(acquisitiontime, DatePattern.NORM_DATETIME_PATTERN); - } - if (phase != null) { - AttrBean attr = new AttrBean<>(); - attr.setKey("Phase"); - attr.setValue(phase); - attrlist.add(attr); - } - Float temperature = item.getTemperature(); - if (temperature != null) { - AttrBean attr = new AttrBean<>(); - attr.setKey("Temperature"); - attr.setValue(temperature); - attrlist.add(attr); - } - Float absolutepressure = item.getAbsolutepressure(); - if (absolutepressure != null) { - AttrBean attr = new AttrBean<>(); - attr.setKey("AbsolutePressure"); - attr.setValue(absolutepressure); - attrlist.add(attr); - } - Float density = item.getDensity(); - if (density != null) { - AttrBean attr = new AttrBean<>(); - attr.setKey("Density"); - attr.setValue(density); - attrlist.add(attr); - } - Float pressure20c = item.getPressure20c(); - if (pressure20c != null) { - AttrBean attr = new AttrBean<>(); - attr.setKey("Pressure20C"); - attr.setValue(pressure20c); - attrlist.add(attr); - } - String cacdata = GenerateI2Xml.generateCacXml(Constant.SF6_QTYL, sensorid, equipmentid, timestamp, attrlist); - cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); - String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.SF6_QTYL); - idlist = new ArrayList<>(); - cacdatalist = new ArrayList<>(); + } + List list = data_sf6_qtylDao.selectUploadById(value); + if (list.size()<1000) { + iscontiue = false; + } + if (CollectionUtil.isNotEmpty(list)) { + log.info("查询sf6_qtyl的数据量：" + list.size()); + ArrayList cacdatalist = new ArrayList<>(); + BigInteger maxid = null; + for (int index = 0; index < list.size(); index++) { + Data_SF6_Qtyl item = list.get(index); + maxid = item.getId(); + Niec_Sensors sensors = equipMap.get(item.getEqmid()); + if (sensors == null) { + continue; + } + String sensorid = sensors.getSensorCode(); + String equipmentid = sensors.getEquipmentId(); + String phase = sensors.getPhase(); + if (StrUtil.isNotEmpty(sensorid) && StrUtil.isNotEmpty(equipmentid)) { + ArrayList attrlist = new ArrayList<>(); + try { + String timestamp = ""; + Date acquisitiontime = item.getAcquisitiontime(); + if (acquisitiontime != null) { + timestamp = DateUtil.format(acquisitiontime, DatePattern.NORM_DATETIME_PATTERN); + } + if (phase != null) { + AttrBean attr = new AttrBean<>(); + attr.setKey("Phase"); + attr.setValue(phase); + attrlist.add(attr); + } + Float temperature = item.getTemperature(); + if (temperature != null) { + AttrBean attr = new AttrBean<>(); + attr.setKey("Temperature"); + attr.setValue(temperature); + attrlist.add(attr); + } + Float absolutepressure = item.getAbsolutepressure(); + if (absolutepressure != null) { + AttrBean attr = new AttrBean<>(); + attr.setKey("AbsolutePressure"); + attr.setValue(absolutepressure); + attrlist.add(attr); + } + Float density = item.getDensity(); + if (density != null) { + AttrBean attr = new AttrBean<>(); + attr.setKey("Density"); + attr.setValue(density); + attrlist.add(attr); + } + Float pressure20c = item.getPressure20c(); + if (pressure20c != null) { + AttrBean attr = new AttrBean<>(); + attr.setKey("Pressure20C"); + attr.setValue(pressure20c); + attrlist.add(attr); + } + String cacdata = GenerateI2Xml.generateCacXml(Constant.SF6_QTYL, sensorid, equipmentid, timestamp, attrlist); + cacdatalist.add(cacdata); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { + log.info("开始传输"); + String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); + asyncMethod.sendData2(client, xml); + cacdatalist = new ArrayList<>(); + } + } catch (Exception e) { + log.error("抛出了异常：{}" + e.getMessage()); } - } catch (Exception e) { - log.error("抛出了异常：{}" + e.getMessage()); } } + asyncMethod.updateRecordId(maxid, Constant.SF6QTYLID); + } else { + log.info("没有查询到sf6_qtyl的数据"); } - } else { - log.info("没有查询到sf6_qtyl的数据"); } } @Override public void upload_tx(Client client, HashMap equipMap) { - List list = data_txDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.TXID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_txDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询tx的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Tx item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -888,13 +960,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.TX, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.TX); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -902,6 +970,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.TXID); } else { log.info("没有查询到tx的数据"); } @@ -909,13 +978,24 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_ws(Client client, HashMap equipMap) { - List list = data_wsDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.WSID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_wsDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询ws的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Ws item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -946,13 +1026,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.WS, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.WS); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -960,6 +1036,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.WSID); } else { log.info("没有查询到ws的数据"); } @@ -967,19 +1044,25 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override public void upload_ysp(Client client, HashMap equipMap) { - List list = data_yspDao.selectUpload(CommonStatus.UNUPLOAD.value()); - if (CollectionUtil.isNotEmpty(list)) { - log.info("查询ysp的数据量：" + list.size()); + //查询目前上传的油色谱的id 记录油色谱上传的id大小 + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.YSPID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List dataYspList = data_yspDao.selectUploadById(value); + if (CollectionUtil.isNotEmpty(dataYspList)) { + log.info("查询ysp的数据量：" + dataYspList.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); - ArrayList list2 = new ArrayList<>(); - - 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); + BigInteger maxid = null; + for (int index = 0; index < dataYspList.size(); index++) { + Data_Ysp item = dataYspList.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -1073,32 +1156,13 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.YSP, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - BigInteger id = item.getId(); - idlist.add(id); - - SendDataBean sendDataBean = new SendDataBean(); - sendDataBean.setEqmid(item.getEqmid()); - sendDataBean.setMaxid(id); - list2.add(sendDataBean); - eqmidlist.add(item.getEqmid()); - if (id != null) { - int i = id.compareTo(maxid); - if (i == 1) { - maxid = id; - } - } log.info("测试断点3"); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { + if ((index != 0 && index % sendlimit == 0) || index == (dataYspList.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); - eqmidlist = new ArrayList<>(); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -1106,20 +1170,33 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.YSPID); } else { log.info("没有查询到ysp的数据"); } + } @Override public void upload_microclimate(Client client, HashMap equipMap) { - List list = data_microclimateDao.selectUpload(CommonStatus.UNUPLOAD.value()); + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.MICROCLIMATEID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + }else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); + } + } + List list = data_microclimateDao.selectUploadById(value); if (CollectionUtil.isNotEmpty(list)) { log.info("查询microclimate的数据量：" + list.size()); ArrayList cacdatalist = new ArrayList<>(); - ArrayList idlist = new ArrayList<>(); + BigInteger maxid = null; for (int index = 0; index < list.size(); index++) { Data_Microclimate item = list.get(index); + maxid = item.getId(); Niec_Sensors sensors = equipMap.get(item.getEqmid()); if (sensors == null) { continue; @@ -1185,13 +1262,9 @@ public class XydlI2ServiceImpl implements XydlI2Service { } String cacdata = GenerateI2Xml.generateCacXml(Constant.WQX, sensorid, equipmentid, timestamp, attrlist); cacdatalist.add(cacdata); - idlist.add(item.getId()); - if ((index != 0 && index % 79 == 0) || index == (list.size() - 1)) { - ArrayList list1 = new ArrayList<>(); + if ((index != 0 && index % sendlimit == 0) || index == (list.size() - 1)) { String xml = GenerateI2Xml.generateEndCacXml(cacdatalist); - list1.addAll(idlist); - asyncMethod.sendData(client, list1, xml, Constant.WQX); - idlist = new ArrayList<>(); + asyncMethod.sendData2(client, xml); cacdatalist = new ArrayList<>(); } } catch (Exception e) { @@ -1199,6 +1272,7 @@ public class XydlI2ServiceImpl implements XydlI2Service { } } } + asyncMethod.updateRecordId(maxid,Constant.MICROCLIMATEID); } else { log.info("没有查询到microcimate的数据"); } @@ -1206,85 +1280,94 @@ public class XydlI2ServiceImpl implements XydlI2Service { @Override 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()); - 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(); - BigInteger id = data_yxlDto.getId(); - YxAttrBean attr = new YxAttrBean<>(); - attr.setSensorid(sensorid); - attr.setEquipmentid(equipmentid); - 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); + + Boolean iscontiue = true; + while (iscontiue) { + Upload_check upload_check = upload_checkDao.selectByPrimaryKey(Constant.YXID); + BigInteger value = null; + if (upload_check == null) { + value = BigInteger.valueOf(0); + } else { + value = upload_check.getValue(); + if (value == null) { + value = BigInteger.valueOf(0); } - 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); + } + List list = data_yxDao.selectByPrimaryKey(value); + if (list.size()<1000) { + iscontiue = false; + } + if (CollectionUtil.isNotEmpty(list)) { + log.info("查询yx的数据量：" + list.size()); + BigInteger maxid =null; + 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(); + maxid = data_yxlDto.getId(); + + YxAttrBean attr = new YxAttrBean<>(); + attr.setSensorid(sensorid); + attr.setEquipmentid(equipmentid); + + 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 { + String xml = GenerateI2Xml.generateYxCacXml(attr); + if (xml != null && !xml.equals("")) { + asyncMethod.sendData2(client, xml); } + } catch (Exception e) { + e.printStackTrace(); } - } catch (Exception e) { - e.printStackTrace(); - } + } + asyncMethod.updateRecordId(maxid,Constant.YXID); } } - } @Override diff --git a/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java b/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java index b6198dd..46d2701 100644 --- a/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java +++ b/src/main/java/com/shxy/i2/timeTask/ScheduledTask.java @@ -20,54 +20,62 @@ import org.springframework.stereotype.Component; @EnableAsync public class ScheduledTask { - @Autowired Webservcies webservcies; @Autowired XydlI2Service xydlI2Service; - @Async(value = "asyncServiceExecutor") + private int i1 = 0; + private int i2 = 0; + private int i3 = 0; + private int i4 = 0; + private int i5 = 0; + private int i6 = 0; + private int i7 = 0; + private int i8 = 0; + private int i9 = 0; + @Scheduled(fixedDelay = 60 * 60 * 1000) public void cacyspupload() { + log.error("cacyspupload执行" + (i1++) ); webservcies.uploadyspData(); } - @Async(value = "asyncServiceExecutor") - @Scheduled(fixedDelay = 10 * 60 * 1000) + @Scheduled(fixedDelay = 1 * 60 * 1000) public void cacjfjcupload() { + log.error("cacjfjcupload执行" + (i2++) ); webservcies.uploadjfjcData(); } - // @Scheduled(cron = "0 0/1 * * * ?") - @Scheduled(fixedDelay = 5 * 30 * 1000) + @Scheduled(fixedDelay = 1 * 30 * 1000) public void cacupload() { + log.error("cacupload执行" + (i3++) ); webservcies.uploadData(); } - - @Scheduled(cron = "0 0 13 * * ?") - public void clear() { - xydlI2Service.clear_history(); + @Scheduled(fixedDelay = 1 * 30 * 1000) + public void cacyxupload() { + log.error("cacyxupload执行" + (i4++) ); + webservcies.uploadyxData(); } - // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(fixedDelay = 5 * 30 * 1000) -// public void cacyxupload() { -// webservcies.uploadYxData(); -// String str = "aaaa"; -// webservcies.test(str); -// } - - // - // @Scheduled(cron = "0 * * * * ?") -// @Async(value = "asyncServiceExecutor") + @Scheduled(fixedDelay = 1 * 30 * 1000) + public void cacdcywupload() { + log.error("cacdcywupload执行" + (i5++) ); + webservcies.uploaddcywData(); + } + @Scheduled(fixedDelay = 1 * 30 * 1000) + public void cacjsyhwjyjcupload() { + log.error("cacjsyhwjyjcupload执行" + (i6++) ); + webservcies.uploadjsyhwjyjcData(); + } -// @Async(value = "asyncServiceExecutor") -// @Scheduled(fixedDelay = 10 * 60 * 1000) -// public void cacjfjcupload() { -// webservcies.uploadjfjcData(); +// @Scheduled(cron = "0 0 13 * * ?") +// public void clear() { +// xydlI2Service.clear_history(); // } + } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 10f8deb..e0b85eb 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -6,31 +6,21 @@ spring: username: root password: 123456 type: com.alibaba.druid.pool.DruidDataSource + task: + scheduling: + pool: + size: 8 # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 port: 8094 - servlet: - # 应用的访问路径 - context-path: /api - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - max-swallow-size: -1 # tomcat默认大小2M，超过2M的文件不会被捕获，需要调整此处大小为100MB或者-1即可 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 # 日志配置 logging: config: classpath:log4j2.xml level: - com.shxy: trace + com.shxy: info org.springframework: warn # MyBatis配置 @@ -40,4 +30,12 @@ mybatis: # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapper-locations: classpath*:mappers/**/*Dao.xml # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml \ No newline at end of file + configLocation: classpath:mybatis/mybatis-config.xml + +# webservice +webservice: + # 超高压中心地址 + address: http://10.238.71.98:18096/ppa/webservice/CAGAccessService?wsdl + connecttime: 30 + receivetime: 30 + sendlimit: 100 diff --git a/src/main/resources/mappers/Data_Byq_JbfdDao.xml b/src/main/resources/mappers/Data_Byq_JbfdDao.xml index dea8fe5..a76fcc1 100644 --- a/src/main/resources/mappers/Data_Byq_JbfdDao.xml +++ b/src/main/resources/mappers/Data_Byq_JbfdDao.xml @@ -16,14 +16,17 @@ id, eqmid, acquisitionTime, dischargeCapacity, dischargePosition, pulseCount, isupload, dischargeWaveform, create_time, update_time - + - + SELECT + t1.id, t1.eqmid, t1.acquisitionTime, t1.dischargeCapacity, t1.dischargePosition, t1.pulseCount, t1.isupload, + t1.dischargeWaveform,t1.create_time, t1.update_time + FROM + data_byq_jbfd t1 where t1.id ]]> #{maxid} + + + select + + from data_cnj + where id ]]> #{maxid} + + + select + + from data_dcyw + where id ]]> #{maxid} + + - - - - + + + + + select + + from data_dr_jyjc + where id ]]> #{maxid} + + + select + + from data_fhdlbx + where id ]]> #{maxid} + + + update data_fhdlbx diff --git a/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml b/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml index f952ab6..fd6300d 100644 --- a/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml +++ b/src/main/resources/mappers/Data_Jsyhw_JyjcDao.xml @@ -19,6 +19,13 @@ lastActionTime, isupload, create_time, update_time + + + select + + from data_microclimate + where id ]]> #{maxid} + + + select + + from data_sf6_qtsf + where id ]]> #{maxid} + + + select + + from data_sf6_qtyl + where id ]]> #{maxid} limit 1000 + + + select + + from data_tx + where id ]]> #{maxid} + + + select + + from data_ws + where id ]]> #{maxid} + + + SELECT + t1.id, t1.eqmid, t1.acquisitionTime, t1.H2, t1.CH4, t1.C2H6, t1.C2H4, t1.C2H2,t1.CO, t1.CO2, t1.O2, t1.N2, + t1.TotalHydrocarbon,t1.isupload, t1.create_time, t1.update_time + FROM + data_ysp t1 where t1.id ]]> #{maxid} + + + diff --git a/src/main/resources/mappers/data_FhzxqDao.xml b/src/main/resources/mappers/data_FhzxqDao.xml index d47bf23..b079a63 100644 --- a/src/main/resources/mappers/data_FhzxqDao.xml +++ b/src/main/resources/mappers/data_FhzxqDao.xml @@ -14,12 +14,21 @@ id, eqmid, acquisitionTime, action, isupload,coilWaveform, create_time, update_time + + + + update data_fhzxq diff --git a/src/test/java/com/shxy/i2/test.java b/src/test/java/com/shxy/i2/test.java index 9c3b298..f8c2f81 100644 --- a/src/test/java/com/shxy/i2/test.java +++ b/src/test/java/com/shxy/i2/test.java @@ -1,13 +1,16 @@ -//package com.shxy.i2; -// -//import cn.hutool.core.util.XmlUtil; -//import cn.hutool.json.JSONObject; -//import cn.hutool.json.XML; -// -//import java.util.Map; -// -//public class test { -// public static void main(String[] args){ +package com.shxy.i2; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.XmlUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.XML; + +import java.util.Date; +import java.util.Map; + +public class test { + public static void main(String[] args){ // JSONObject jsonObject = XML.toJSONObject("\n" + // "\n" + // "\n" + @@ -27,5 +30,8 @@ // JSONObject result = (JSONObject) response.get("result"); // Integer code = (Integer) result.get("code"); // System.out.println(jsonObject.toString()); -// } -//} + + DateTime dateTime = DateUtil.offsetDay(new Date(), -7); + System.out.println(dateTime); + } +}