From 62a79612f85bfff5aa764e80a77031604be997fb Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 29 Aug 2024 11:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=A7=E6=B3=95=E6=8A=95?= =?UTF-8?q?=E8=AF=89=20=E6=A3=80=E6=9F=A5=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E5=92=8C?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppThirdLoginController.java | 3 +- .../main/resources/application-druidDev.yml | 71 +++++++++++++++++++ .../main/resources/application-druidPro.yml | 71 +++++++++++++++++++ .../zdxt/code/domain/EnterpriseComplaint.java | 38 ++++++++++ .../java/com/zdxt/code/utils/HttpUtil.java | 11 +-- .../mapper/EnterpriseComplaintMapper.xml | 12 +++- 6 files changed, 199 insertions(+), 7 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidDev.yml create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidPro.yml diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index d4021ee7..10681189 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java @@ -246,6 +246,7 @@ public class AppThirdLoginController { @ResponseBody public ZDResponse siqLogin(@RequestBody SiqLogin siqLogin){ Map params = new HashMap<>(); + log.info("获取深i企登录用户code：{}",siqLogin.getCode()); String secret = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getCode()); params.put("accessKeySign",secret); params.put("appCode",code); @@ -343,7 +344,7 @@ public class AppThirdLoginController { @PostMapping("/sendMessage") @ResponseBody public void sendMessage(String phone,String content) throws Exception { - zwSmsClient.sendMessage(phone,content); + ZwSmsClient.sendMessage(phone,content); } @GetMapping("/queryByIdCard") diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidDev.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidDev.yml new file mode 100644 index 00000000..737ccb4f --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidDev.yml @@ -0,0 +1,71 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://146.56.223.227:3306/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: ENC(XZ0cNb5wfN9GkTEq+SgVNA==) + password: ENC(+bxT7W35PF0k/5FZBYV0uwFLN+I9kZsF) + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: + login-password: + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true +# PageHelper分页插件 +pagehelper: + helperDialect: mysql + reasonable: true + supportMethodsArguments: true + params: count=countSql + +# MybatisPlus +mybatis-plus: + config-location: classpath:mapper/mybatis-config.xml + mapper-locations: classpath*:mapper/**/*Mapper.xml + typeAliasesPackage: com.zdxt.**.domain + +largeScreenConfig: DatasourcesCofig.xml \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidPro.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidPro.yml new file mode 100644 index 00000000..77f9bbea --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidPro.yml @@ -0,0 +1,71 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: ENC(v3oHIZvpj5ZRTcLc41PnMXUVZbXK7dp+IKwsOlJ2bRUf5E5bagEjlB3qNwT7KiAnX3+ugTUeKWt1cVPh1iVLlQE1ELVNILu6k0X4/uH9ao53b4pLlyJsim67HozUikmKDQ/wDMxVUSkBW21g6jcKeEzXgSphxUQvPz/L8KJzzHJvkpDarGwYUZH+sV1VnSkHCHpPqW9wkbD/AN8K+iNiLw==) + username: ENC(E5mY10bkGFBgN1Pljgzggg==) + password: ENC(oqD1IasQS57qOeOHFtBdAAemGwJ2I7BV) + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: + login-password: + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true +# PageHelper分页插件 +pagehelper: + helperDialect: mysql + reasonable: true + supportMethodsArguments: true + params: count=countSql + +# MybatisPlus +mybatis-plus: + config-location: classpath:mapper/mybatis-config.xml + mapper-locations: classpath*:mapper/**/*Mapper.xml + typeAliasesPackage: com.zdxt.**.domain + +largeScreenConfig: DatasourcesCofig.xml \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index fe796b41..9953b410 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -57,6 +57,27 @@ public class EnterpriseComplaint extends BaseDomain */ private String evaluateTime; + /** + * 执法时间 - 入企不扫码 使用 + */ + private String enforcementTime; + + /** + * 入企不扫码投诉-投诉部门 多个逗号隔开 + */ + private String complaintDepartments; + /** + * 入企不扫码投诉-投诉部门ID 多个逗号隔开 + */ + private String complaintDepartmentIds; + + public String getEnforcementTime() { + return enforcementTime; + } + + public void setEnforcementTime(String enforcementTime) { + this.enforcementTime = enforcementTime; + } public String getProWoCode() { return proWoCode; @@ -296,6 +317,23 @@ public class EnterpriseComplaint extends BaseDomain this.mssqOrderFlows = mssqOrderFlows; } + public String getComplaintDepartments() { + return complaintDepartments; + } + + public void setComplaintDepartments(String complaintDepartments) { + this.complaintDepartments = complaintDepartments; + } + + public String getComplaintDepartmentIds() { + return complaintDepartmentIds; + } + + public void setComplaintDepartmentIds(String complaintDepartmentIds) { + this.complaintDepartmentIds = complaintDepartmentIds; + } + + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java index ec2a0bd4..3bcd5592 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java @@ -42,6 +42,7 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; @@ -186,17 +187,15 @@ public class HttpUtil { // 对value进行相应的操作 connection.setRequestProperty(entry.getKey(), String.valueOf(entry.getValue())); } -// connection.setRequestProperty("x-auth-channel",IdUtil.simpleUUID()); -// connection.setRequestProperty("x-auth-app-code","zfjdm"); connection.setDoOutput(true); DataOutputStream out = new DataOutputStream(connection.getOutputStream()); // out.writeBytes(params); - out.write(params.getBytes("utf-8")); //解决中文乱码 + out.write(params.getBytes(StandardCharsets.UTF_8)); //解决中文乱码 out.flush(); out.close(); int responseCode = connection.getResponseCode(); if(responseCode == HttpURLConnection.HTTP_OK){ - BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)); String inputLine; StringBuffer response = new StringBuffer(); @@ -204,10 +203,12 @@ public class HttpUtil { response.append(inputLine); } in.close(); - System.out.println(new String(response.toString())); + System.out.println(response.toString()); System.out.println("请求成功"); return response.toString(); }else{ + log.error("深i企接口获取用户信息接口调用失败，失败码：{}",responseCode); +// BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); System.out.println("请求失败"); } } catch (Exception e) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index b5c19bac..89535ece 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -20,12 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + select id, rel_id, enforce_type, problem_description, enterprise_address, linkman, linkman_tel, com_or_opi, authorization, create_time, pro_wo_code,enterprise_number, - enterprise_name,status,evaluate_time + enterprise_name,status,evaluate_time,complaint_departments,complaint_department_ids, + enforcement_time from enterprise_complaint @@ -69,6 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pro_wo_code, enterprise_name, enterprise_number, + complaint_departments, + complaint_department_ids, + enforcement_time, #{id}, @@ -84,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{proWoCode}, #{enterpriseName}, #{enterpriseNumber}, + #{complaintDepartments}, + #{complaintDepartmentIds}, + #{enforcementTime},