From cf4ad99fd0e0f7133114e3c5ae6b7db91dc88055 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 24 Aug 2021 10:56:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/DingdingMsgSender.java | 74 ++----------------- 1 file changed, 5 insertions(+), 69 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java index 4cde837bc9..bb663ac327 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java @@ -2,7 +2,6 @@ package com.epmet.commons.tools.utils; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.dto.form.DingTalkTextMsg; -import com.epmet.commons.tools.exception.EpmetErrorCode; import com.google.common.collect.Lists; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; @@ -13,13 +12,9 @@ import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.net.URL; -import java.net.URLConnection; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.concurrent.ArrayBlockingQueue; /** @@ -104,7 +99,7 @@ public class DingdingMsgSender { } private Thread getThread() { - Thread sendMsgThread = new Thread("MsgSender-Thread") { + return new Thread("MsgSender-Thread") { @Override public void run() { while (running) { @@ -112,7 +107,6 @@ public class DingdingMsgSender { } } }; - return sendMsgThread; } @@ -139,77 +133,19 @@ public class DingdingMsgSender { try { String stringToSign = timestamp + "\n" + param.getSecret(); Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(param.getSecret().getBytes("UTF-8"), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8")); + mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); + byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); String url = param.getWebHook(); url = url.concat("×tamp=" + timestamp + "&sign=" + sign); String jsonStrParam = param.getMsgContent(); - result = this.sendPostByJSON(url, jsonStrParam); + result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); } catch (Exception e) { logger.warn("sendPostByJSON error", e); } return result; } - /** - * 发送POST 请求 - * - * @param url 发送请求的 URL - * @param param 请求参数，JSON格式 - * @return - */ - public Result sendPostByJSON(String url, String param) throws IOException { - if (StringUtils.isEmpty(url) || StringUtils.isEmpty(param)) { - throw new IllegalArgumentException("参数不能为空"); - } - PrintWriter out = null; - BufferedReader in = null; - String result = ""; - try { - URL realUrl = new URL(url); - // 打开和URL之间的连接 - URLConnection conn = realUrl.openConnection(); - // 设置通用的请求属性 - conn.setRequestProperty("accept", "*/*"); - conn.setRequestProperty("Content-Type", "application/json"); - conn.setRequestProperty("connection", "Keep-Alive"); - conn.setRequestProperty("user-agent", - "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - // 发送POST请求必须设置如下两行 - conn.setDoOutput(true); - conn.setDoInput(true); - // 获取URLConnection对象对应的输出流 - out = new PrintWriter(conn.getOutputStream()); - // 发送请求参数 - out.print(param); - // flush输出流的缓冲 - out.flush(); - // 定义BufferedReader输入流来读取URL的响应 - in = new BufferedReader( - new InputStreamReader(conn.getInputStream())); - String line; - while ((line = in.readLine()) != null) { - result += line; - } - } catch (Exception e) { - logger.warn("sendPostByJSON error", e); - return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); - } finally { - try { - if (out != null) { - out.close(); - } - if (in != null) { - in.close(); - } - } catch (IOException ex) { - } - - } - return new Result().ok(result); - } - public static void main(String[] args) { for (int i = 0; i < 50; i++) { From 2a904497ffb22d4dd27b8e8f24b827161acdafea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 14:02:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5?= =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E3=80=81=E5=A4=84=E7=90=86=E4=B8=AD?= =?UTF-8?q?=E3=80=81=E5=B7=B2=E5=8A=9E=E7=BB=93=E5=9B=BE=E7=89=87=E5=8D=87?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ResiEventDao.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index f9fc875f7e..e77383613a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -49,7 +49,12 @@ ORDER BY re.CLOSE_CASE_TIME DESC )t - LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2)) + LEFT JOIN resi_event_attachment rea + ON (rea.RESI_EVENT_ID = t.eventId + AND rea.DEL_FLAG = '0' + AND rea.ATTACHMENT_TYPE = 'image' + AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2)) + order by rea.sort asc From 36aa9ea21af2bc796e8bf8170e4232a1b552e1bb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 14:56:42 +0800 Subject: [PATCH 3/6] ? --- .../src/main/resources/mapper/ResiEventDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index e77383613a..1dabf75712 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -5,8 +5,8 @@ + - From 7807e8de70345b20b8331a72db68f504421952c5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 15:13:52 +0800 Subject: [PATCH 4/6] right --- .../main/resources/mapper/ResiEventDao.xml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 1dabf75712..5883c4ccec 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -36,25 +36,29 @@ and ro.ORG_ID = #{orgId} AND ro.ORG_READ = 'un_read' - ORDER BY re.CREATED_TIME AND ro.ORG_READ = 'read' AND re.`STATUS` = 'processing' - ORDER BY re.LATEST_OPERATED_TIME DESC AND ro.ORG_READ = 'read' AND re.`STATUS` = 'closed_case' - ORDER BY re.CLOSE_CASE_TIME DESC )t LEFT JOIN resi_event_attachment rea - ON (rea.RESI_EVENT_ID = t.eventId - AND rea.DEL_FLAG = '0' - AND rea.ATTACHMENT_TYPE = 'image' - AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2)) - order by rea.sort asc + ON (rea.RESI_EVENT_ID = t.eventId) + where rea.DEL_FLAG = '0' + AND rea.ATTACHMENT_TYPE = 'image' + + ORDER BY t.eventTime,rea.sort asc + + + ORDER BY t.eventTime DESC,rea.sort asc + + + ORDER BY t.eventTime DESC,rea.sort asc + From 097b92c67448772c869cd739504d3491915266fa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 24 Aug 2021 16:05:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectCategoryDailyDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml index 2a466396bd..a33bda9bed 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml @@ -91,6 +91,7 @@ UNION ALL SELECT c.CUSTOMER_ID, + c.CUSTOMER_ID AS categoryOriginCustomerId, left(c.CATEGORY_CODE, 4) AS CATEGORY_CODE, '1' AS `LEVEL`, p.AGENCY_ID AS orgId, From 3fe62f4a70e1a96f3d938c8a5bed984af7c64f13 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 24 Aug 2021 17:22:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/TagCustomerDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index 183eb8317f..83ed4289ad 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -31,7 +31,7 @@ VALUES ( - #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.tagColor} #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW() + #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.tagColor}, #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW() ) ON DUPLICATE KEY UPDATE