diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java index 094baed605..7f0ba1752c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java @@ -98,10 +98,11 @@ public interface CodeOperationHistoryService extends BaseService getHistoryList(String codeId); + List getHistoryList(String customerId, String clientType); /** * 更新描述 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java index c75f01637f..c50199c644 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java @@ -103,8 +103,8 @@ public class CodeOperationHistoryServiceImpl extends BaseServiceImpl getHistoryList(String codeId) { - return baseDao.selectHistoryListByCode(codeId); + public List getHistoryList(String customerId, String clientType) { + return baseDao.selectHistoryList(customerId, clientType); } @Override diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index e282dddf7a..d07bf811bf 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -492,7 +492,9 @@ public class CodeServiceImpl implements CodeService { public PageData history(CodeCommonFormDTO formDTO) { PageHelper.startPage(formDTO.getPage(), formDTO.getLimit()); //获取上传代码信息 - List list = codeOperationHistoryService.getHistoryList(formDTO.getCodeId()); + CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId()); + //获取上传代码信息 + List list = codeOperationHistoryService.getHistoryList(code.getCustomerId(), code.getClientType()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } 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 aa327a2475..e0c59f0f0d 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 @@ -729,8 +729,9 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe log.error("授权完成发送钉钉消息失败,原因:未查询到客户信息,客户Id->" + customerId); return null; } + String secret = "SEC68536dfc393790a35cb08e9bc531dad0c654cf84bb53b76667fa7a7f2cbed829"; + String url = "https://oapi.dingtalk.com/robot/send?access_token=c3d34eac31acde342d37a01ac1792beac5b17b2890b4f5015e2759546fed1331"; //2.拼接钉钉消息内容并发送 - DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=b4e47783ad72ba643278598ff8af90e745890c13538b2a4dc139635a71289dfd"); OapiRobotSendRequest request = new OapiRobotSendRequest(); request.setMsgtype("markdown"); OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown(); @@ -741,12 +742,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe "> 管理员称谓: " + result.getAppellation() + "\n\n" + "> 联系方式: " + result.getPhone() + "\n"); request.setMarkdown(markdown); - try { - OapiRobotSendResponse response = client.execute(request); - } catch (ApiException e) { - log.error("机器人生病了......"); - e.printStackTrace(); - } + HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret); return null; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.6__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.6__thirdUpdate.sql index b2e6d411ef..df3249303a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.6__thirdUpdate.sql +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.6__thirdUpdate.sql @@ -5,4 +5,4 @@ alter table code_customer add AUDIT_TIME datetime NULL comment '提交审核时 alter table code_customer add RELEASE_TIME datetime NULL comment '发布时间' after AUDIT_TIME; -alter table code_operation_history add CLIENT_TYPE datetime NULL comment '小程序类型 居民端resi,工作端work' after CUSTOMER_ID; \ No newline at end of file +alter table code_operation_history add CLIENT_TYPE varchar(10) NULL comment '小程序类型 居民端resi,工作端work' after CUSTOMER_ID; \ No newline at end of file