From 4777b56d32502c544a2639bb9381f42103c571e6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 8 Sep 2021 17:40:31 +0800 Subject: [PATCH 1/5] wxController --- .../com/epmet/controller/WxController.java | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java new file mode 100644 index 0000000000..71fc73ef60 --- /dev/null +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java @@ -0,0 +1,125 @@ + +package com.epmet.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + + +/** + * desc:微信配置测试 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-08 + */ +@RestController +@RequestMapping("wechat") +public class WxController { + private static Logger log = LoggerFactory.getLogger(WxController.class); + + + @RequestMapping("check") + public void doGet(HttpServletRequest request, HttpServletResponse response) { + log.debug("weixin get..."); + // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。 + String signature = request.getParameter("signature"); + // 时间戳 + String timestamp = request.getParameter("timestamp"); + // 随机数 + String nonce = request.getParameter("nonce"); + // 随机字符串 + String echostr = request.getParameter("echostr"); + + // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败 + PrintWriter out = null; + try { + out = response.getWriter(); + if (WxController.checkSignature(signature, timestamp, nonce)) { + log.debug("weixin get success...."); + out.print(echostr); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (out != null) + out.close(); + } + } + + /** + * 与接口配置信息中的Token要一致 + */ + private static String token = "o2opri3hschiwit"; + + /** + * 验证签名 + * + * @param signature + * @param timestamp + * @param nonce + * @return + */ + public static boolean checkSignature(String signature, String timestamp, String nonce) { + String[] arr = new String[]{token, timestamp, nonce}; + // 将token、timestamp、nonce三个参数进行字典序排序 + Arrays.sort(arr); + StringBuilder content = new StringBuilder(); + for (int i = 0; i < arr.length; i++) { + content.append(arr[i]); + } + MessageDigest md = null; + String tmpStr = null; + + try { + md = MessageDigest.getInstance("SHA-1"); + // 将三个参数字符串拼接成一个字符串进行sha1加密 + byte[] digest = md.digest(content.toString().getBytes()); + tmpStr = byteToStr(digest); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + + content = null; + // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 + return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; + } + + /** + * 将字节数组转换为十六进制字符串 + * + * @param byteArray + * @return + */ + private static String byteToStr(byte[] byteArray) { + String strDigest = ""; + for (int i = 0; i < byteArray.length; i++) { + strDigest += byteToHexStr(byteArray[i]); + } + return strDigest; + } + + /** + * 将字节转换为十六进制字符串 + * + * @param mByte + * @return + */ + private static String byteToHexStr(byte mByte) { + char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; + char[] tempArr = new char[2]; + tempArr[0] = Digit[(mByte >>> 4) & 0X0F]; + tempArr[1] = Digit[mByte & 0X0F]; + + String s = new String(tempArr); + return s; + } +} From c2f45bc4b608e8a4ecf4044e3380f2f89ce55b67 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 8 Sep 2021 18:00:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?wxController=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/WxController.java | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 epmet-auth/src/main/java/com/epmet/controller/WxController.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java new file mode 100644 index 0000000000..71fc73ef60 --- /dev/null +++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java @@ -0,0 +1,125 @@ + +package com.epmet.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + + +/** + * desc:微信配置测试 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-08 + */ +@RestController +@RequestMapping("wechat") +public class WxController { + private static Logger log = LoggerFactory.getLogger(WxController.class); + + + @RequestMapping("check") + public void doGet(HttpServletRequest request, HttpServletResponse response) { + log.debug("weixin get..."); + // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。 + String signature = request.getParameter("signature"); + // 时间戳 + String timestamp = request.getParameter("timestamp"); + // 随机数 + String nonce = request.getParameter("nonce"); + // 随机字符串 + String echostr = request.getParameter("echostr"); + + // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败 + PrintWriter out = null; + try { + out = response.getWriter(); + if (WxController.checkSignature(signature, timestamp, nonce)) { + log.debug("weixin get success...."); + out.print(echostr); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (out != null) + out.close(); + } + } + + /** + * 与接口配置信息中的Token要一致 + */ + private static String token = "o2opri3hschiwit"; + + /** + * 验证签名 + * + * @param signature + * @param timestamp + * @param nonce + * @return + */ + public static boolean checkSignature(String signature, String timestamp, String nonce) { + String[] arr = new String[]{token, timestamp, nonce}; + // 将token、timestamp、nonce三个参数进行字典序排序 + Arrays.sort(arr); + StringBuilder content = new StringBuilder(); + for (int i = 0; i < arr.length; i++) { + content.append(arr[i]); + } + MessageDigest md = null; + String tmpStr = null; + + try { + md = MessageDigest.getInstance("SHA-1"); + // 将三个参数字符串拼接成一个字符串进行sha1加密 + byte[] digest = md.digest(content.toString().getBytes()); + tmpStr = byteToStr(digest); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + + content = null; + // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 + return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; + } + + /** + * 将字节数组转换为十六进制字符串 + * + * @param byteArray + * @return + */ + private static String byteToStr(byte[] byteArray) { + String strDigest = ""; + for (int i = 0; i < byteArray.length; i++) { + strDigest += byteToHexStr(byteArray[i]); + } + return strDigest; + } + + /** + * 将字节转换为十六进制字符串 + * + * @param mByte + * @return + */ + private static String byteToHexStr(byte mByte) { + char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; + char[] tempArr = new char[2]; + tempArr[0] = Digit[(mByte >>> 4) & 0X0F]; + tempArr[1] = Digit[mByte & 0X0F]; + + String s = new String(tempArr); + return s; + } +} From babd4c73c2c16682180c8abc3249c589b2d4f799 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 9 Sep 2021 09:04:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?wxController=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/WxController.java | 64 ++++----- .../com/epmet/controller/WxController.java | 125 ------------------ 2 files changed, 28 insertions(+), 161 deletions(-) delete mode 100644 epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java index 71fc73ef60..5723e7106a 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/WxController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.io.PrintWriter; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; +import java.util.Enumeration; /** @@ -28,48 +28,39 @@ public class WxController { @RequestMapping("check") - public void doGet(HttpServletRequest request, HttpServletResponse response) { - log.debug("weixin get..."); - // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。 - String signature = request.getParameter("signature"); - // 时间戳 - String timestamp = request.getParameter("timestamp"); - // 随机数 - String nonce = request.getParameter("nonce"); - // 随机字符串 - String echostr = request.getParameter("echostr"); - - // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败 - PrintWriter out = null; - try { - out = response.getWriter(); - if (WxController.checkSignature(signature, timestamp, nonce)) { - log.debug("weixin get success...."); - out.print(echostr); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (out != null) - out.close(); + public void get(HttpServletRequest request, HttpServletResponse response) throws Exception { + System.out.println("========WechatController========= "); + Enumeration pNames = request.getParameterNames(); + while (pNames.hasMoreElements()) { + String name = (String) pNames.nextElement(); + String value = request.getParameter(name); + // out.print(name + "=" + value); + + String log = "name =" + name + " value =" + value; } + + String signature = request.getParameter("signature");/// 微信加密签名 + String timestamp = request.getParameter("timestamp");/// 时间戳 + String nonce = request.getParameter("nonce"); /// 随机数 + String echostr = request.getParameter("echostr"); // 随机字符串 + response.reset(); + PrintWriter out = response.getWriter(); + +// if (this.checkSignature(signature, timestamp, nonce)) { +// out.print(echostr); +// } + out.close(); + out = null; } - /** - * 与接口配置信息中的Token要一致 - */ - private static String token = "o2opri3hschiwit"; /** - * 验证签名 - * - * @param signature - * @param timestamp - * @param nonce - * @return + * 校验签名 */ public static boolean checkSignature(String signature, String timestamp, String nonce) { - String[] arr = new String[]{token, timestamp, nonce}; + System.out.println("signature:" + signature + "timestamp:" + timestamp + "nonc:" + nonce); + String WECHAT_TOKEN = "1jkoyyih83nj8"; + String[] arr = new String[]{WECHAT_TOKEN, timestamp, nonce}; // 将token、timestamp、nonce三个参数进行字典序排序 Arrays.sort(arr); StringBuilder content = new StringBuilder(); @@ -90,6 +81,7 @@ public class WxController { content = null; // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 + System.out.println(tmpStr.equals(signature.toUpperCase())); return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java deleted file mode 100644 index 71fc73ef60..0000000000 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/WxController.java +++ /dev/null @@ -1,125 +0,0 @@ - -package com.epmet.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; - - -/** - * desc:微信配置测试 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-08 - */ -@RestController -@RequestMapping("wechat") -public class WxController { - private static Logger log = LoggerFactory.getLogger(WxController.class); - - - @RequestMapping("check") - public void doGet(HttpServletRequest request, HttpServletResponse response) { - log.debug("weixin get..."); - // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。 - String signature = request.getParameter("signature"); - // 时间戳 - String timestamp = request.getParameter("timestamp"); - // 随机数 - String nonce = request.getParameter("nonce"); - // 随机字符串 - String echostr = request.getParameter("echostr"); - - // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败 - PrintWriter out = null; - try { - out = response.getWriter(); - if (WxController.checkSignature(signature, timestamp, nonce)) { - log.debug("weixin get success...."); - out.print(echostr); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (out != null) - out.close(); - } - } - - /** - * 与接口配置信息中的Token要一致 - */ - private static String token = "o2opri3hschiwit"; - - /** - * 验证签名 - * - * @param signature - * @param timestamp - * @param nonce - * @return - */ - public static boolean checkSignature(String signature, String timestamp, String nonce) { - String[] arr = new String[]{token, timestamp, nonce}; - // 将token、timestamp、nonce三个参数进行字典序排序 - Arrays.sort(arr); - StringBuilder content = new StringBuilder(); - for (int i = 0; i < arr.length; i++) { - content.append(arr[i]); - } - MessageDigest md = null; - String tmpStr = null; - - try { - md = MessageDigest.getInstance("SHA-1"); - // 将三个参数字符串拼接成一个字符串进行sha1加密 - byte[] digest = md.digest(content.toString().getBytes()); - tmpStr = byteToStr(digest); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - - content = null; - // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 - return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; - } - - /** - * 将字节数组转换为十六进制字符串 - * - * @param byteArray - * @return - */ - private static String byteToStr(byte[] byteArray) { - String strDigest = ""; - for (int i = 0; i < byteArray.length; i++) { - strDigest += byteToHexStr(byteArray[i]); - } - return strDigest; - } - - /** - * 将字节转换为十六进制字符串 - * - * @param mByte - * @return - */ - private static String byteToHexStr(byte mByte) { - char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - char[] tempArr = new char[2]; - tempArr[0] = Digit[(mByte >>> 4) & 0X0F]; - tempArr[1] = Digit[mByte & 0X0F]; - - String s = new String(tempArr); - return s; - } -} From 94e7f017cb97c879d24c3138ea73b1d40988928d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 9 Sep 2021 09:22:22 +0800 Subject: [PATCH 4/5] 1 --- .../com/epmet/controller/WxController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java index 5723e7106a..3ea0b091a5 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/WxController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java @@ -4,6 +4,8 @@ package com.epmet.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; @@ -114,4 +116,27 @@ public class WxController { String s = new String(tempArr); return s; } + + + /** + * 打开开发者模式签名认证 + * @param signature + * @param timestamp + * @param nonce + * @param echostr + * @return + */ + @ResponseBody + @RequestMapping(value = "/service", method = RequestMethod.GET) + public Object defaultView(String signature, String timestamp, String nonce, String echostr) { + if (echostr == null || echostr.isEmpty()) { + return nonce; + } + if (this.checkSignature(signature, timestamp, nonce)) { + return echostr; + } + return nonce; + } + + } From 1ecef89fb099815de465ca59b2563e7ae046e2a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Sep 2021 10:46:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=86=E5=B8=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenProjectDistributionFormDTO.java | 1 + .../ScreenProjectDistributionResultDTO.java | 6 ++++ .../mapper/screen/ScreenProjectDataDao.xml | 32 +++++++++---------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java index b6eeff0053..d189574ef3 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java @@ -21,6 +21,7 @@ public class ScreenProjectDistributionFormDTO implements Serializable { /** * 如果为空返回全部；可选值：1:红色事件；2：黄色事件；3：绿色事件 + * all:全部 */ @NotBlank(message = "level不能为空") private String level; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java index ec2c9e5219..a45acf622c 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java @@ -37,4 +37,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date projectCreateTime; + + + /** + * 分类名称 add 21.09.9 + */ + private String categoryName; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 543b9d3eb4..a4a6582cf2 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -12,7 +12,8 @@ longitude AS longitude, latitude AS latitude, PROJECT_CREATE_TIME AS projectCreateTime, - CUSTOMER_ID AS customerId + CUSTOMER_ID AS customerId, + ALL_CATEGORY_NAME as categoryName FROM screen_project_data WHERE @@ -30,26 +31,23 @@ and org_id = #{agencyId} - - - - and PROJECT_STATUS_CODE ='pending' - - - and PROJECT_STATUS_CODE ='pending' - - - and PROJECT_STATUS_CODE !='pending' - and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(PROJECT_CREATE_TIME) - - - and PROJECT_STATUS_CODE ='pending' - - + + and PROJECT_STATUS_CODE ='pending' + + + and PROJECT_STATUS_CODE ='pending' + + + and PROJECT_STATUS_CODE !='pending' + and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(PROJECT_CREATE_TIME) + order by PROJECT_CREATE_TIME desc LIMIT #{pageSize} + + LIMIT #{pageSize} +