From 48c603fea407fbcbc2fa039e375bc11d25445c6e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 18:08:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java | 4 +
flower_city/src/main/java/com/dg/core/util/WxUtil.java | 110 ++++++++++++++++++++++++++++++++++++
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 1
flower_city/pom.xml | 6 ++
4 files changed, 121 insertions(+), 0 deletions(-)
diff --git a/flower_city/pom.xml b/flower_city/pom.xml
index af145bd..f787a19 100644
--- a/flower_city/pom.xml
+++ b/flower_city/pom.xml
@@ -80,6 +80,12 @@
</dependency>
<dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.74</version>
+ </dependency>
+
+ <dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>4.1.0</version>
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
index e09f11f..746a93f 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -199,6 +199,10 @@
@ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
private String guideDepartmentName;
+ @TableField(exist = false)
+ @ApiModelProperty(name = "areaName", value = "所属地区名字")
+ private String areaName;
+
@Override
public String toString() {
return "GuideRepairOrder{" +
diff --git a/flower_city/src/main/java/com/dg/core/util/WxUtil.java b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
new file mode 100644
index 0000000..f0d524f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
@@ -0,0 +1,110 @@
+package com.dg.core.util;
+
+import com.alibaba.fastjson.JSON;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class WxUtil {
+
+ private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+
+ /**
+ * 获取花城token，（ps:0=token获取失败）
+ *
+ * @return
+ */
+ public String getBatteryCarAccessToken() throws Exception {
+ String accessToken = "0";
+ try {
+ // 此处APP_ID APP_SECRET 在微信小程序后端可见
+ // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET);
+ String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + ConstantPropertiesUtil.WX_OPEN_APP_ID
+ + "&secret=" + ConstantPropertiesUtil.WX_OPEN_APP_SECRET;
+ String result = this.httpGet(accessTokenUrl, null, null);
+ Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+ if (resultMap.containsKey("access_token")) {
+ accessToken = resultMap.get("access_token").toString();
+ }
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ return accessToken;
+ }
+
+
+ /**
+ * http请求工具类，get请求
+ *
+ * @param url
+ * @param params
+ * @param resonseCharSet
+ * @return
+ * @throws Exception
+ */
+ public static String httpGet(String url, Map<String, Object> params, String... resonseCharSet) throws Exception {
+ DefaultHttpClient defaultHttpClient = null;
+ BufferedReader bufferedReader = null;
+ try {
+ defaultHttpClient = new DefaultHttpClient();
+ if (params != null) {
+ StringBuilder stringBuilder = new StringBuilder();
+ Iterator<String> iterator = params.keySet().iterator();
+ String key;
+ while (iterator.hasNext()) {
+ key = iterator.next();
+ Object val = params.get(key);
+ if (val instanceof List) {
+ List v = (List) val;
+ for (Object o : v) {
+ stringBuilder.append(key).append("=").append(o.toString()).append("&");
+ }
+ } else {
+ stringBuilder.append(key).append("=").append(val.toString()).append("&");
+ }
+ }
+ stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+ url = url + "?" + stringBuilder.toString();
+ }
+ HttpGet httpGet = new HttpGet(url);
+ httpGet.setHeader("Content-Type", "application/json;charset=ut-8");
+ HttpResponse httpResponse = defaultHttpClient.execute(httpGet);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ String errorLog = "请求失败，errorCode:" + httpResponse.getStatusLine().getStatusCode();
+
+ throw new Exception(url + errorLog);
+ }
+ // 读取返回信息
+ String charSet = "utf-8";
+ if (resonseCharSet != null && resonseCharSet.length > 0)
+ charSet = resonseCharSet[0];
+ String output;
+ bufferedReader = new BufferedReader(new InputStreamReader(httpResponse.getEntity().getContent(), charSet));
+
+ StringBuilder dataBuilder = new StringBuilder();
+ while ((output = bufferedReader.readLine()) != null) {
+ dataBuilder.append(output);
+ }
+ return dataBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (defaultHttpClient != null)
+ defaultHttpClient.getConnectionManager().shutdown();
+ if (bufferedReader != null)
+ bufferedReader.close();
+ }
+ }
+
+
+
+}
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index e05bc29..aca20d0 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -57,6 +57,7 @@
consult_user_phone,
submit_user_phone,
guide_user_phone,
+ (select name from automessage_area_code_2022 where code=a.area_code)areaName,
area_code,
detailed_address,
create_time,
--
Gitblit v1.7.1