From f576d788315149489e12e7c98f7377f84102f381 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Mon, 31 Jul 2023 11:36:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A27-31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessRiskDataMapper.xml | 2 +- .../BusinessRiskDateMapper.java | 9 ++++- .../BusinessRiskDateService.java | 4 ++ .../supervise/rms/biz/wechat/WechatRest.java | 37 ++++++++++++------- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml index 256a2552..08efa971 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml @@ -13,7 +13,7 @@ \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java index 7ff77026..40d54794 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java @@ -15,7 +15,12 @@ import java.util.List; @Mapper public interface BusinessRiskDateMapper extends BaseMapper { @Select("select e.*,a.addDate,a.addReason,a.buSid,a.decisionOffice,a.removeDate,a.romoveReason," + - "a.removeDecisionOffice from business_risk_date e right join business_risk_data a on e.sid = a.buSid" + - " where businessName = #{name} order by e.executionTime desc") + "a.removeDecisionOffice from business_risk_date e left join business_risk_data a on e.sid = a.buSid" + + " where e.businessName = #{name} order by e.executionTime desc") List selectBusinessRiskDateByName(@Param("name") String name); + + @Select("select e.*,a.addDate,a.addReason,a.buSid,a.decisionOffice,a.removeDate,a.romoveReason," + + "a.removeDecisionOffice from business_risk_date e right join business_risk_data a on e.sid = a.buSid" + + " where businessName = #{name} and executionTime = #{time}") + List selectBusinessRiskDateSize(@Param("name") String name,@Param("time") String time); } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java index 7c4c6c3f..aea22bc3 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java @@ -51,4 +51,8 @@ public class BusinessRiskDateService extends MybatisBaseService selectBusinessRiskDateByName(String name){ return baseMapper.selectBusinessRiskDateByName(name); } + + public List selectBusinessRiskDateSize(String name,String time){ + return baseMapper.selectBusinessRiskDateSize(name, time); + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/wechat/WechatRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/wechat/WechatRest.java index f2cc4fdb..536389ce 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/wechat/WechatRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/wechat/WechatRest.java @@ -1,6 +1,5 @@ package com.supervise.rms.biz.wechat; -import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.supervise.rms.api.businessriskdate.BusinessRiskDate; import com.supervise.rms.api.pusinformation.PushInformation; @@ -12,10 +11,7 @@ import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; import java.util.HashMap; @@ -44,9 +40,9 @@ public class WechatRest { private String WX_URL_MESSAGE_SEND; //0 30 9 ? * 2 每周一九点半 - @PostMapping("/sendMessage") - public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception { - String t = "imkugi6AM3SgT-GUciOMlkhPQUbfAiooDWxslzgO4Lc"; + @GetMapping("/sendMessage") + public void sendMessage() throws Exception { + String t = "A_fAuJa6edQ-IK4hBRMqDw0OZAQY7DHay87ZOKspneE"; String accessToken = getAccessToken(appId,sppSecret); String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken); //查询库中openId @@ -54,9 +50,9 @@ public class WechatRest { for (PushInformation pushInformation : pushInformations) { //查询库中查询到所有企业的信息 List businessRiskDate = businessRiskDateService.selectBusinessRiskDateByName(pushInformation.getEnterpriseName()); - BusinessRiskDate riskDate = businessRiskDate.get(0); RestTemplate restTemplate = new RestTemplate(); Map sendBody = new HashMap<>(); + BusinessRiskDate riskDate = businessRiskDate.get(0); setTemplateStyle(riskDate,sendBody,t,wxUrl,pushInformation,restTemplate,riskDate.getVerifyResult(),businessRiskDate); } // String openId="o7sGD6r8GP3VEjA9iJz3us6Xg0aM"; @@ -116,6 +112,11 @@ public class WechatRest { // //return forEntity.getBody(); } + /** + * @Description //描述： 获取AccessToken + * @Param [appId, appsecret] + * @return java.lang.String + **/ public String getAccessToken(String appId,String appsecret){ String url = WX_URL_ACCESS_TOKEN.replace("APPID", appId).replace("APPSECRET", appsecret); RestTemplate restTemplate=new RestTemplate(); @@ -125,17 +126,23 @@ public class WechatRest { return at; } + /** + * @Description //描述： 企业经营异常推送 + * @Param [riskDate, sendBody, t, wxUrl, pushInformation, restTemplate, verifyResult, businessRiskDate] + * @return void + **/ public void setTemplateStyle(BusinessRiskDate riskDate, Map sendBody,String t,String wxUrl,PushInformation pushInformation,RestTemplate restTemplate,String verifyResult,List businessRiskDate){ Map sendMag = new HashMap<>(); - sendMag.put("thing2", new TemplateData(riskDate.getBusinessName())); + sendMag.put("thing7", new TemplateData(riskDate.getBusinessName())); + List businessRiskDates = businessRiskDateService.selectBusinessRiskDateSize(riskDate.getBusinessName(), riskDate.getExecutionTime()); if (verifyResult.equals("0")){ sendMag.put("thing5", new TemplateData("该公司暂无风险")); }else { - sendMag.put("thing5", new TemplateData("该企业有"+businessRiskDate.size()+"条风险")); + sendMag.put("thing5", new TemplateData("该企业有"+businessRiskDates.size()+"条风险")); } - sendMag.put("time6", new TemplateData(riskDate.getExecutionTime())); + sendMag.put("time8", new TemplateData(riskDate.getExecutionTime())); Map miniprogram = new HashMap<>(); - miniprogram.put("appid","wx11565021714ba796"); + miniprogram.put("appid","wx05604ce2a8bede05"); miniprogram.put("pagepath","pages/index/enterpriseRisk?businessName="+riskDate.getBusinessName()+"&executionTime="+riskDate.getExecutionTime()); //拼接base参数 sendBody.put("miniprogram",miniprogram); @@ -148,6 +155,8 @@ public class WechatRest { JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody()); String messageCode = jsonObject.getString("errcode"); String msgId = jsonObject.getString("msgid"); - System.out.println("messageCode : " + messageCode + ", msgId: " +msgId); + String msg = jsonObject.getString("errmsg"); + System.out.println("messageCode : " + messageCode + ", msgId: " +msgId + ", msg: "+msg); } + }