ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
@@ -91,6 +91,11 @@ public R<String> getWXToken() { return R.fail("获取微信token失败：" + throwable.getMessage()); } @Override public R<Boolean> sensitiveWordDetection(String content, String openid) { return R.fail("敏感词校验失败：" + throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -93,4 +93,13 @@ */ @PostMapping("/wxLogin/getWXToken") R<String> getWXToken(); /** * 敏感词检测 * @param content * @param openid * @return */ @PostMapping("/wxLogin/sensitiveWordDetection") R<Boolean> sensitiveWordDetection (@RequestParam("content") String content, @RequestParam("openid") String openid); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/config/FileUploadConfig.java
File was renamed from ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/config/FileUploadConfig.java @@ -1,4 +1,4 @@ package com.ruoyi.chargingPile.config; package com.ruoyi.account.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/FileController.java
File was renamed from ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/FileController.java @@ -1,6 +1,6 @@ package com.ruoyi.chargingPile.controller; package com.ruoyi.account.controller; import com.ruoyi.chargingPile.config.FileUploadConfig; import com.ruoyi.account.config.FileUploadConfig; import com.ruoyi.common.core.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,7 +37,6 @@ } String TimeDir =new SimpleDateFormat("yyyy-MM-dd").format(new Date()); String realPath = fileUploadConfig.getLocation() + TimeDir; // String realPath = "D:\\file\\" + TimeDir; File file = new File(realPath); // 没有目录就创建 if (!file.exists()) { @@ -57,7 +56,6 @@ mf.transferTo(targetFile); //拼接数据 String imgstr = fileUploadConfig.getAccessPath() + TimeDir +"/"+ filename; // String imgstr = TimeDir +"/"+ filename; return AjaxResult.success(imgstr); }
@@ -1,6 +1,7 @@ package com.ruoyi.account.controller; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.alipay.api.internal.util.codec.Base64; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -18,6 +19,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.FileUploadUtils; import com.ruoyi.common.core.utils.HttpUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.RedisService; @@ -179,4 +181,43 @@ String accessToken = appletTools.getAccessToken(""); return R.ok(accessToken); } /** * 敏感词检测 * @param content * @param openid * @return */ @PostMapping("/sensitiveWordDetection") public R<Boolean> sensitiveWordDetection (@RequestParam("content") String content, @RequestParam("openid") String openid){ WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService); String accessToken = appletTools.getAccessToken(""); com.alibaba.fastjson2.JSONObject jsonObject = new com.alibaba.fastjson2.JSONObject(); jsonObject.put("content", content); jsonObject.put("version", 2); jsonObject.put("scene", 2); jsonObject.put("openid", openid); String post = HttpUtils.post("https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + accessToken, jsonObject.toString()); com.alibaba.fastjson2.JSONObject object = com.alibaba.fastjson2.JSONObject.parseObject(post); Integer errcode = object.getInteger("errcode"); if(0 != errcode){ throw new RuntimeException(object.getString("errmsg")); } JSONArray detail = object.getJSONArray("detail"); for (int i = 0; i < detail.size(); i++) { JSONObject jsonObject1 = detail.getJSONObject(i); Integer errcode1 = jsonObject1.getInteger("errcode"); if(0 == errcode1){ String suggest = jsonObject1.getString("suggest"); Integer label = jsonObject1.getInteger("label"); String keyword = jsonObject1.getString("keyword"); Integer prob = jsonObject1.getInteger("prob"); if(("risky".equals(suggest) || "review".equals(suggest)) && 100 != label && StringUtils.isNotEmpty(keyword) && 80 <= prob){ return R.ok(true); } } } return R.ok(false); } } ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -1,8 +1,6 @@ package com.ruoyi.chargingPile.controller; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.chargingPile.api.dto.GetSiteListDTO; @@ -10,7 +8,6 @@ import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.chargingPile.api.model.TFaultMessage; import com.ruoyi.chargingPile.api.query.TChargingGunQuery; import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode; import com.ruoyi.chargingPile.api.vo.GunStatusStatisticsVO; @@ -23,14 +20,11 @@ import com.ruoyi.chargingPile.util.QRCodeUtils; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.BaseDelete; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.log.enums.OperatorType; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.integration.api.feignClient.IntegrationClient; import com.ruoyi.integration.api.model.EndCharge; import com.ruoyi.order.api.feignClient.ChargingOrderClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -40,13 +34,11 @@ import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.*; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; /** * <p> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -526,7 +526,7 @@ @ResponseBody @PostMapping(value = "/securityDetection") public void securityDetection(@RequestBody SecurityDetectionVO securityDetection){ log.error("-------------------安全检测数据-------------------：" + securityDetection); log.info("-------------------安全检测数据-------------------：" + securityDetection); chargingOrderService.securityDetection(securityDetection); } @@ -537,7 +537,7 @@ @ResponseBody @PostMapping(value = "/startChargeSuccessfully") public void startChargeSuccessfully(@RequestBody PlatformStartChargingReplyMessageVO message){ log.error("-------------------远程启动充电请求应答-------------------：" + message); log.info("-------------------远程启动充电请求应答-------------------：" + message); chargingOrderService.startChargeSuccessfully(message); } @@ -625,7 +625,7 @@ */ @PostMapping("/terminateSuccessfulResponse") public void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply){ log.error("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply); log.info("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply); chargingOrderService.terminateSuccessfulResponse(platformStopChargingReply); } @@ -636,7 +636,7 @@ */ @PostMapping("/endChargeBillingCharge") public void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){ log.error("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo); log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo); chargingOrderService.endChargeBillingCharge(vo); } @@ -1804,7 +1804,7 @@ */ @PostMapping("/endCharge") public void endCharge(@RequestParam("code") String code){ log.error(code + "：-------------------充电桩自动结束充电-------------------"); log.info(code + "：-------------------充电桩自动结束充电-------------------"); chargingOrderService.endCharge(code, 2); } @@ -1814,7 +1814,7 @@ */ @PostMapping("/excelEndCharge") public void excelEndCharge(@RequestParam("code") String code){ log.error(code + "：-------------------充电异常，停止充电-------------------"); log.info(code + "：-------------------充电异常，停止充电-------------------"); chargingOrderService.excelEndCharge(code); }
@@ -671,7 +671,7 @@ platformStartCharging.setCard_number(chargingOrder.getId().toString()); platformStartCharging.setAccount_balance(account_balance); log.error(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString()); log.info(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString()); sendMessageClient.platformStartCharging(platformStartCharging); //异步线程检测远程启动的应答结果。如果失败，则需要全额退款 Long id = chargingOrder.getId(); @@ -699,7 +699,7 @@ String code = chargingOrder.getCode(); String key = "AQJC_" + chargingOrder.getChargingGunId(); List<PlatformStartChargingReply> data = platformStartChargingReplyClient.getPlatformStartChargingReply(code).getData(); log.error(code + "：-------------------开始检查调起充电结果-------------------" + data.toString()); log.info(code + "：-------------------开始检查调起充电结果-------------------" + data.toString()); if(data.size() != 0){ PlatformStartChargingReply platformStartChargingReply = data.get(1); Integer startup_result = platformStartChargingReply.getStartup_result(); @@ -741,7 +741,7 @@ return true; }else{ Integer counter = boot_failed_map.get(code); log.error(code + "：-------------------未上传开启充电结果-------------------" + counter); log.info(code + "：-------------------未上传开启充电结果-------------------" + counter); PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key); //5分钟内未启动成功，退回金额。 if(null == counter || counter < 300){ @@ -837,7 +837,7 @@ * @param code */ public void refund(String code){ log.error(code + "：-------------------充电启动失败，执行退款-------------------"); log.info(code + "：-------------------充电启动失败，执行退款-------------------"); TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code)); if(chargingOrder.getStatus() == 2){ Integer rechargePaymentType = chargingOrder.getRechargePaymentType(); @@ -1007,8 +1007,8 @@ platformStopCharging.setCharging_pile_code(chargingPile.getCode()); platformStopCharging.setCharging_gun_code(chargingGun.getCode()); sendMessageClient.platformStopCharging(platformStopCharging); log.error(code1 + "：-------------------远程停止充电请求-------------------"); log.error(platformStopCharging.toString()); log.info(code1 + "：-------------------远程停止充电请求-------------------"); log.info(platformStopCharging.toString()); }); return AjaxResult.success(); } @@ -1163,7 +1163,7 @@ failure_cause = "其他"; break; } log.error(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause); log.info(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause); }else{ TChargingOrder chargingOrder = new TChargingOrder(); chargingOrder.setId(order.getId()); @@ -1982,10 +1982,11 @@ TChargingOrder order = new TChargingOrder(); order.setId(chargingOrder.getId()); order.setAppUserId(chargingOrder.getAppUserId()); if(null != chargingOrder.getEndMode() && chargingOrder.getEndMode() == 2){ order.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3); } if(null == chargingOrder.getEndMode()){ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData(); if(null != uploadRealTimeMonitoringData && null == chargingOrder.getEndMode()){ Integer soc = uploadRealTimeMonitoringData.getSoc(); order.setEndMode(soc > 98 ? 2 : 3); }else{ order.setEndMode(1); } order.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.DOWN)); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -352,31 +352,9 @@ //检测敏感词 String content = orderEvaluate.getContent(); if(StringUtils.isNotEmpty(content)){ String token = appUserClient.getWXToken().getData(); JSONObject jsonObject = new JSONObject(); jsonObject.put("content", content); jsonObject.put("version", 2); jsonObject.put("scene", 2); jsonObject.put("openid", appUser.getWxOpenid()); String post = HttpUtils.post("https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token, jsonObject.toString()); JSONObject object = JSONObject.parseObject(post); Integer errcode = object.getInteger("errcode"); if(0 != errcode){ throw new RuntimeException(object.getString("errmsg")); } JSONArray detail = object.getJSONArray("detail"); for (int i = 0; i < detail.size(); i++) { JSONObject jsonObject1 = detail.getJSONObject(i); Integer errcode1 = jsonObject1.getInteger("errcode"); if(0 == errcode1){ String suggest = jsonObject1.getString("suggest"); Integer label = jsonObject1.getInteger("label"); String keyword = jsonObject1.getString("keyword"); Integer prob = jsonObject1.getInteger("prob"); if(("risky".equals(suggest) || "review".equals(suggest)) && 100 != label && StringUtils.isNotEmpty(keyword) && 80 <= prob){ return AjaxResult.error("评价包含违规内容，请重新评价!"); } } Boolean data = appUserClient.sensitiveWordDetection(content, appUser.getWxOpenid()).getData(); if(data){ return AjaxResult.error("评价包含违规内容，请重新评价!"); } } orderEvaluate.setContent(content);
