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 1/3] =?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 2/3] 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 3/3] =?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