From fca0bfcb76be726c24ceb387cdbeedac4001be59 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 12 Aug 2020 09:18:05 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9Esql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserPointStatisticalDailyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml index 45470e58d9..9bb759ed72 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml @@ -116,7 +116,7 @@ #{actionFlag}, #{customerId}, #{pointChange}, - '1', + '0', 0, #{createdBy}, now(), From 1dc7bf8d741d6cf4a30ec22fe52f0a677f93e69d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Aug 2020 09:48:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8=E8=AE=B0=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/DingResultDTO.java | 25 ++++++++++++++ .../com/epmet/constant/ModuleConstant.java | 3 ++ .../java/com/epmet/dao/CodeCustomerDao.java | 9 +++++ .../service/impl/WarrantServiceImpl.java | 33 +++++++++++++------ .../main/resources/mapper/CodeCustomerDao.xml | 15 +++++++++ 5 files changed, 75 insertions(+), 10 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java new file mode 100644 index 0000000000..e90a581f3b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DingResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/12 9:35 上午 + */ +@Data +public class DingResultDTO implements Serializable { + + private static final long serialVersionUID = 160205553553352808L; + + /** + * 代码版本号 + */ + private String userVersion; + + /** + * 客户名称 + */ + private String customerName; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java index de55530200..2db62d7822 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java @@ -95,6 +95,9 @@ public interface ModuleConstant { String TO_USER_NAME = "ToUserName"; String FROM_USER_NAME = "FromUserName"; String RESI = "resi"; + String SUCC_TIME = "SuccTime"; + String FAIL_TIME = "FailTime"; + String DELAY_TIME = "DelayTime"; /** * 微信模推送给第三方平台方 Content固定格式 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java index 7ff7c5114e..e7ba21153c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeCustomerDao.java @@ -20,6 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CodeCustomerDTO; import com.epmet.dto.form.UploadListFormDTO; +import com.epmet.dto.result.DingResultDTO; import com.epmet.dto.result.UploadListResultDTO; import com.epmet.dto.form.CodeAuditRecordFormDTO; import com.epmet.dto.result.TemplateAndAppIdResultDTO; @@ -144,4 +145,12 @@ public interface CodeCustomerDao extends BaseDao { * @return void */ void updateVersion(@Param("codeId") String codeId); + + /** + * 查询客户名称 和 代码版本号 + * @param customerId + * @param clientType + * @Author zxc + */ + DingResultDTO selectCustomerNameAndVersion(@Param("customerId") String customerId, @Param("clientType") String clientType); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 85b15f296d..351f505d31 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -17,6 +17,7 @@ import com.epmet.dto.form.CodeAuditRecordFormDTO; import com.epmet.dto.form.MessagePushTextFormDTO; import com.epmet.dto.result.AuthorizationInfoResultDTO; import com.epmet.dto.result.CustomerIdAndClientResultDTO; +import com.epmet.dto.result.DingResultDTO; import com.epmet.dto.result.TemplateAndAppIdResultDTO; import com.epmet.mpaes.AesException; import com.epmet.mpaes.WXBizMsgCrypt; @@ -143,27 +144,35 @@ public class WarrantServiceImpl implements WarrantService { codeAuditRecord.setCustomerId(customerId); codeAuditRecord.setAuthAppId(authAppId); codeAuditRecord.setTemplateId(templateId); - String customerName = paCustomerDao.selectCustomerName(customerId); String client = clientType.equals(ModuleConstant.RESI) ? "居民端" : "工作端"; - //插入 代码审核 记录 - log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml)); - codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); - // 修改 code_audit_result 中的代码审核结果 - String reason = codeAuditRecord.getReason(); String codeResult = null; switch (event) { case ModuleConstant.WEAPP_AUDIT_SUCCESS: codeResult = ModuleConstant.AUDIT_SUCCESS; + Long successTime = Long.valueOf(xml.get(ModuleConstant.SUCC_TIME).toString()); + codeAuditRecord.setSuccTime(componentVerifyTicketServiceImpl.sToDate(successTime.toString())); break; case ModuleConstant.WEAPP_AUDIT_FAIL: codeResult = ModuleConstant.AUDIT_FAILED; + Long failTime = Long.valueOf(xml.get(ModuleConstant.FAIL_TIME).toString()); + codeAuditRecord.setFailTime(componentVerifyTicketServiceImpl.sToDate(failTime.toString())); break; case ModuleConstant.WEAPP_AUDIT_DELAY: codeResult = ModuleConstant.DELAY; + Long delayTime = Long.valueOf(xml.get(ModuleConstant.DELAY_TIME).toString()); + codeAuditRecord.setDelayTime(componentVerifyTicketServiceImpl.sToDate(delayTime.toString())); break; + default: + codeResult = ModuleConstant.AUDIT_FAILED; } + //插入 代码审核 记录 + log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml)); + codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); + // 修改 code_audit_result 中的代码审核结果 + String reason = codeAuditRecord.getReason(); log.info("开始寻找机器人发送消息"); - this.dingDingRobot(reason,event,customerName,client); + DingResultDTO dingResultDTO = codeCustomerDao.selectCustomerNameAndVersion(customerId, clientType); + this.dingDingRobot(reason,event,dingResultDTO,client); log.info("已找到robot，并发送消息......"); String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); @@ -206,33 +215,37 @@ public class WarrantServiceImpl implements WarrantService { * @author zxc * @date 2020/8/5 4:33 下午 */ - public void dingDingRobot(String result,String event,String customerName,String clientType){ + public void dingDingRobot(String result,String event,DingResultDTO dingResultDTO,String clientType){ OapiRobotSendRequest request = new OapiRobotSendRequest(); request.setMsgtype("markdown"); OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown(); markdown.setTitle("代码审核结果"); + String customerName = dingResultDTO.getCustomerName(); + String userVersion = dingResultDTO.getUserVersion(); switch (event){ case ModuleConstant.WEAPP_AUDIT_SUCCESS: markdown.setText("代码审核结果: 审核成功\n"+ "> 客户名称：" + customerName +"\n\n"+ - "> 客户端："+clientType+"\n"); + "> 客户端："+clientType+"\n\n"+ + "> 版本号："+userVersion); break; case ModuleConstant.WEAPP_AUDIT_FAIL: markdown.setText("代码审核结果: 审核不通过\n"+ "> 客户名称：" + customerName +"\n\n"+ "> 客户端："+clientType+"\n\n"+ + "> 版本号："+userVersion+"\n\n"+ "> 不通过原因："+result); break; case ModuleConstant.WEAPP_AUDIT_DELAY: markdown.setText("代码审核结果: 审核延时\n"+ "> 客户名称：" + customerName +"\n\n"+ "> 客户端："+clientType+"\n\n"+ + "> 版本号："+userVersion+"\n\n"+ "> 延时原因："+result); break; default: markdown.setText("机器人生病了......"); log.info("event为："+event); - break; } request.setMarkdown(markdown); log.info("robot需要发送的内容为："+markdown.getText()); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml index 366e15e889..cce9cbc767 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml @@ -170,6 +170,21 @@ ORDER BY RELEASE_TIME DESC LIMIT 1 + + + UPDATE code_customer SET From dc2c90dbaf99a79b4dc20d5730880d5def6543d9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Aug 2020 10:10:44 +0800 Subject: [PATCH 03/10] robot --- .../com/epmet/constant/ModuleConstant.java | 1 + .../service/impl/WarrantServiceImpl.java | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java index 2db62d7822..544e4da23e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java @@ -98,6 +98,7 @@ public interface ModuleConstant { String SUCC_TIME = "SuccTime"; String FAIL_TIME = "FailTime"; String DELAY_TIME = "DelayTime"; + String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; /** * 微信模推送给第三方平台方 Content固定格式 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 351f505d31..87fa2d0a39 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -7,6 +7,7 @@ import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ModuleConstant; @@ -172,7 +173,7 @@ public class WarrantServiceImpl implements WarrantService { String reason = codeAuditRecord.getReason(); log.info("开始寻找机器人发送消息"); DingResultDTO dingResultDTO = codeCustomerDao.selectCustomerNameAndVersion(customerId, clientType); - this.dingDingRobot(reason,event,dingResultDTO,client); + this.dingDingRobot(reason,event,dingResultDTO,client,codeAuditRecord); log.info("已找到robot，并发送消息......"); String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); @@ -210,12 +211,24 @@ public class WarrantServiceImpl implements WarrantService { } } + /*public static void main(String[] args) { + WarrantServiceImpl w = new WarrantServiceImpl(); + DingResultDTO ding = new DingResultDTO(); + ding.setUserVersion("1.1.1"); + ding.setCustomerName("阿里巴巴"); + CodeAuditRecordFormDTO dto = new CodeAuditRecordFormDTO(); + String format = DateUtils.format(new Date(),ModuleConstant.DATE_FORMAT); + System.out.println(format); + dto.setFailTime(new Date()); + w.dingDingRobot("再次失败","weapp_audit_fail",ding,"支付宝",dto); + }*/ + /** * @Description 钉钉机器人报警 * @author zxc * @date 2020/8/5 4:33 下午 */ - public void dingDingRobot(String result,String event,DingResultDTO dingResultDTO,String clientType){ + public void dingDingRobot(String result,String event,DingResultDTO dingResultDTO,String clientType,CodeAuditRecordFormDTO codeAuditRecord){ OapiRobotSendRequest request = new OapiRobotSendRequest(); request.setMsgtype("markdown"); OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown(); @@ -227,12 +240,14 @@ public class WarrantServiceImpl implements WarrantService { markdown.setText("代码审核结果: 审核成功\n"+ "> 客户名称：" + customerName +"\n\n"+ "> 客户端："+clientType+"\n\n"+ + "> 审核成功时间："+DateUtils.format(codeAuditRecord.getSuccTime(),ModuleConstant.DATE_FORMAT)+"\n\n"+ "> 版本号："+userVersion); break; case ModuleConstant.WEAPP_AUDIT_FAIL: markdown.setText("代码审核结果: 审核不通过\n"+ "> 客户名称：" + customerName +"\n\n"+ "> 客户端："+clientType+"\n\n"+ + "> 审核失败时间："+DateUtils.format(codeAuditRecord.getFailTime(),ModuleConstant.DATE_FORMAT)+"\n\n"+ "> 版本号："+userVersion+"\n\n"+ "> 不通过原因："+result); break; @@ -240,6 +255,7 @@ public class WarrantServiceImpl implements WarrantService { markdown.setText("代码审核结果: 审核延时\n"+ "> 客户名称：" + customerName +"\n\n"+ "> 客户端："+clientType+"\n\n"+ + "> 审核延时时间："+DateUtils.format(codeAuditRecord.getDelayTime(),ModuleConstant.DATE_FORMAT)+"\n\n"+ "> 版本号："+userVersion+"\n\n"+ "> 延时原因："+result); break; From 4a291244ebffb2d7ca1bb646dc6558d00995b48f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Aug 2020 10:12:13 +0800 Subject: [PATCH 04/10] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 35fe6cdf05..d7c17935eb 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.121 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.122 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 30fc886a6a..a08ed467fb 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.121 + 0.0.122 com.epmet From 12b5bb388d678866dc28a126c3fff93a0d97c8f2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Aug 2020 10:15:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ComponentVerifyTicketServiceImpl.java | 4 ---- .../com/epmet/service/impl/WarrantServiceImpl.java | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index e0c59f0f0d..7377950f1f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -3,10 +3,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.client.config.utils.IOUtils; -import com.dingtalk.api.DefaultDingTalkClient; -import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiRobotSendRequest; -import com.dingtalk.api.response.OapiRobotSendResponse; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; @@ -26,7 +23,6 @@ import com.epmet.mpaes.WXXmlToMapUtil; import com.epmet.redis.RedisThird; import com.epmet.service.ComponentVerifyTicketService; import com.epmet.wxapi.constant.WxMaCodeConstant; -import com.taobao.api.ApiException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 87fa2d0a39..8e1d2bfcc7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -9,7 +9,6 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.HttpClientManager; -import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ModuleConstant; import com.epmet.constant.ThirdRedisKeyConstant; import com.epmet.constant.ThirdRunTimeInfoConstant; @@ -27,7 +26,6 @@ import com.epmet.redis.RedisThird; import com.epmet.service.WarrantService; import com.epmet.wxapi.constant.WxMaCodeConstant; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; @@ -35,14 +33,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; -import java.net.URLEncoder; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -57,8 +52,6 @@ public class WarrantServiceImpl implements WarrantService { @Value("${third.platform.appId}") private String componentAppId; - @Value("${third.platform.appSecret}") - private String appSecret; @Value("${third.platform.aesKey}") private String aesKey; @Value("${third.platform.token}") @@ -74,11 +67,7 @@ public class WarrantServiceImpl implements WarrantService { @Autowired private ComponentVerifyTicketServiceImpl componentVerifyTicketServiceImpl; @Autowired - private MessagePushTextDao messagePushTextDao; - @Autowired private RedisThird redisThird; - @Autowired - private PaCustomerDao paCustomerDao; /** * @Description 1.保存代码审核结果 2.更新代码上传结果 From f97759551ab0fdb61d9ebbb759b096709f6e55cb Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 12 Aug 2020 11:03:33 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=97=A5=E7=BB=9F=E8=AE=A1=E3=80=81=E5=B7=A5=E4=BD=9C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=A0=B8=E9=94=80=E6=97=A5=E7=BB=9F=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=80=BB=E7=A7=AF=E5=88=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/TestController.java | 18 ++++++++ .../PointVerificationStatisticalDailyDao.java | 2 + .../java/com/epmet/dao/UserPointTotalDao.java | 2 + ...ntVerificationStatisticalDailyService.java | 2 + .../epmet/service/UserPointTotalService.java | 2 + .../impl/PointVerificationLogServiceImpl.java | 1 + ...rificationStatisticalDailyServiceImpl.java | 9 +++- .../impl/UserPointTotalServiceImpl.java | 9 +++- .../PointVerificationStatisticalDailyDao.xml | 45 +++++++++++++++++++ .../resources/mapper/UserPointTotalDao.xml | 35 +++++++++++++++ 10 files changed, 123 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java index b3cbf19d45..59437dcff3 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java @@ -4,8 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; +import com.epmet.entity.PointVerificationStatisticalDailyEntity; import com.epmet.entity.UserPointStatisticalDailyEntity; +import com.epmet.entity.UserPointTotalEntity; +import com.epmet.service.PointVerificationStatisticalDailyService; import com.epmet.service.UserPointStatisticalDailyService; +import com.epmet.service.UserPointTotalService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +33,10 @@ public class TestController { private LoginUserUtil loginUserUtil; @Autowired private UserPointStatisticalDailyService userPointStatisticalDailyService; + @Autowired + private PointVerificationStatisticalDailyService pointVerificationStatisticalDailyService; + @Autowired + private UserPointTotalService userPointTotalService; @GetMapping("test") public Result test(@LoginUser TokenDto tokenDto){ Map map=new HashMap<>(); @@ -49,5 +57,15 @@ public class TestController { userPointStatisticalDailyService.test(entity); return new Result(); } + @PostMapping("testunixkeyverification") + public Result testUnixKeyVerification(@RequestBody PointVerificationStatisticalDailyEntity entity){ + pointVerificationStatisticalDailyService.testUnixKey(entity); + return new Result(); + } + @PostMapping("testtotal") + public Result testTotal(@RequestBody UserPointTotalEntity entity){ + userPointTotalService.testInsertOrUpdate(entity); + return new Result(); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java index 5880d4bc3e..4ad495b7e4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationStatisticalDailyDao.java @@ -39,4 +39,6 @@ public interface PointVerificationStatisticalDailyDao extends BaseDao { **/ UserPointTotalEntity selectIfExisted(@Param("userId") String userId); + + void insertOrUpdate(UserPointTotalEntity userPointTotalEntity); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java index d48e70529b..a87601131d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointVerificationStatisticalDailyService.java @@ -101,4 +101,6 @@ public interface PointVerificationStatisticalDailyService extends BaseService * @date 2020.07.27 16:45 **/ void insertOrUpdate(UserPointTotalEntity entity); + + void testInsertOrUpdate(UserPointTotalEntity entity); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 14194f057f..f8f3974e80 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -330,6 +330,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl + + + + + SELECT replace(uuid(),'-','') AS ID + + INSERT INTO point_verification_statistical_daily + ( + id, + date_id, + week_id, + month_id, + quarter_id, + year_id, + customer_id, + verificated_point, + agency_id, + pid, + pids, + created_by, + created_time, + updated_by, + updated_time + ) VALUE ( + #{id}, + #{dateId}, + #{weekId}, + #{monthId}, + #{quarterId}, + #{yearId}, + #{customerId}, + #{verificatedPoint}, + #{agencyId}, + #{pid}, + #{pids}, + #{createdBy}, + now(), + #{createdBy}, + now() + ) ON DUPLICATE KEY UPDATE + VERIFICATED_POINT = (VERIFICATED_POINT + #{verificatedPoint}), + UPDATED_TIME = NOW(), + UPDATED_BY = #{createdBy} + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml index db72188a9e..d84b1b02ed 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml @@ -59,4 +59,39 @@ user_id = #{userId} + + + SELECT replace(uuid(),'-','') AS ID + + INSERT INTO user_point_total + ( + id, + user_id, + customer_id, + used_point, + usable_point, + total_point, + created_by, + created_time, + updated_by, + updated_time + ) VALUE ( + #{id}, + #{userId}, + #{customerId}, + #{usedPoint}, + #{usablePoint}, + #{totalPoint}, + #{createdBy}, + now(), + #{createdBy}, + now() + ) ON DUPLICATE KEY UPDATE + USED_POINT = (USED_POINT + #{usedPoint}), + USABLE_POINT = (USABLE_POINT + #{usablePoint}), + TOTAL_POINT = (TOTAL_POINT + #{totalPoint}), + UPDATED_TIME = NOW(), + UPDATED_BY = #{createdBy} + + \ No newline at end of file From 6bfce19417570991668eeb732c687dcb8e7168c5 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 12 Aug 2020 11:06:24 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql new file mode 100644 index 0000000000..4eda6716dc --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.3__unixKeyOnStatisticalAndTotal.sql @@ -0,0 +1,5 @@ + +ALTER TABLE point_verification_statistical_daily ADD UNIQUE STAFF_DATE_AGENCY(CREATED_BY,DATE_ID,AGENCY_ID,CUSTOMER_ID); + + +ALTER TABLE USER_POINT_TOTAL ADD UNIQUE USR(USER_ID,CUSTOMER_ID); \ No newline at end of file From 8a04659c215283f9667bfc9b0c5cea28b4f9f950 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 12 Aug 2020 11:09:28 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=A7=AF=E5=88=86=20+1=20=20=20=2039?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index b86c424cf9..b6e8d3f329 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.38 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.39 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index c2eb2f4bd0..e5cf1cc84f 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.38 + 0.0.39 epmet-point com.epmet From 83559233b4803b5e40b071466dd978e1856840ae Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 12 Aug 2020 16:04:09 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 4711ac11b7..ce18ca880c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -188,7 +188,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { public WxResult release(String accessToken) { WxResult result = new WxResult(); String url = WxMaCodeConstant.RELEASE_URL + "?" + "access_token=" + accessToken; - Result releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, null); + Result releaseResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}"); if (!releaseResult.success()) { result.setErrorCode(releaseResult.getCode()); result.setErrorMsg(releaseResult.getMsg()); From ec02284fcaa0a4f5aef66fa6cc39bce284803f96 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 12 Aug 2020 16:16:05 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index d7c17935eb..15b06dbbb3 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.122 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.123 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a08ed467fb..10d75a3848 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.122 + 0.0.123 com.epmet