From 3b9de3a4051b5b8e5c753c0625cb958aacc3467f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 10 Aug 2020 09:53:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/CodeCustomerDTO.java | 20 +++ .../epmet/dto/CodeOperationHistoryDTO.java | 5 + .../dto/result/CodeVersionInfoResultDTO.java | 112 +++++++++++++ .../com/epmet/controller/CodeController.java | 8 + .../controller/PaCustomerController.java | 13 ++ .../java/com/epmet/dao/CodeCustomerDao.java | 47 ++++++ .../java/com/epmet/dao/PaCustomerDao.java | 11 ++ .../com/epmet/entity/CodeCustomerEntity.java | 21 +++ .../entity/CodeOperationHistoryEntity.java | 5 + .../epmet/service/CodeCustomerService.java | 30 ++++ .../java/com/epmet/service/CodeService.java | 23 ++- .../com/epmet/service/PaCustomerService.java | 9 ++ .../service/impl/CodeCustomerServiceImpl.java | 15 ++ .../epmet/service/impl/CodeServiceImpl.java | 152 +++++++++++------- .../service/impl/PaCustomerServiceImpl.java | 8 + .../db/migration/V0.0.6__thirdUpdate.sql | 8 + .../main/resources/mapper/CodeCustomerDao.xml | 61 ++++++- .../main/resources/mapper/PaCustomerDao.xml | 20 +++ 18 files changed, 502 insertions(+), 66 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.6__thirdUpdate.sql diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java index 8e7de04d23..7e86cbaa17 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeCustomerDTO.java @@ -92,6 +92,26 @@ public class CodeCustomerDTO implements Serializable { * 二维码 */ private String qrCode; + /** + * 发布模式 gary:分阶段发布，total:全量发布 + */ + private String releaseType; + /** + * 灰度值 + */ + private Integer garyPercentage; + /** + * 上传时间 + */ + private Date commitTime; + /** + * 提交审核时间 + */ + private Date auditTime; + /** + * 发布时间 + */ + private Date releaseTime; /** * 乐观锁 diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java index 65fa58f1cd..65f67e142c 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java @@ -43,6 +43,11 @@ public class CodeOperationHistoryDTO implements Serializable { */ private String customerId; + /** + * 小程序类型 居民端resi,工作端work + */ + private String clientType; + /** * 代码ID */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java new file mode 100644 index 0000000000..03853d654b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java @@ -0,0 +1,112 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/7 14:00 + */ +@NoArgsConstructor +@Data +public class CodeVersionInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 5822281118416848107L; + /** + * + */ + private CommitBean commit; + /** + * + */ + private AuditBean audit; + /** + * + */ + private ReleaseBean release; + + @NoArgsConstructor + @Data + public static class CommitBean { + private String codeId; + /** + * + */ + private String version; + /** + * + */ + private String codeInfo; + /** + * + */ + private String commitTime; + /** + * + */ + private String modelId; + } + + @NoArgsConstructor + @Data + public static class AuditBean { + private String codeId; + /** + * + */ + private String version; + /** + * + */ + private String codeInfo; + /** + * + */ + private String commitTime; + /** + * + */ + private String auditTime; + /** + * + */ + private String status; + } + + @NoArgsConstructor + @Data + public static class ReleaseBean { + private String codeId; + /** + * + */ + private String version; + /** + * + */ + private String codeInfo; + /** + * + */ + private String commitTime; + /** + * + */ + private String auditTime; + /** + * + */ + private String releaseTime; + /** + * + */ + private String releaseType; + /** + * + */ + private int grayPercentage; + } +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java index 25cc536e72..b7b7ca6ed6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java @@ -207,4 +207,12 @@ public class CodeController { codeService.setDomain(customerId); return new Result<>(); } + + @PostMapping("customers") + public Result getCustomerList(@RequestBody UploadListFormDTO formDTO) { + PageData pageData = codeService.getCustomerList(formDTO); + return new Result().ok(pageData); + } + + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index ef9f3d3425..13ad00fc9d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -179,5 +179,18 @@ public class PaCustomerController { return new Result().ok(paCustomerService.getAccountBasicInfo(formDTO)); } + /** + * 获取客户小程序列表 + * @author zhaoqifeng + * @date 2020/8/10 9:43 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("miniprolist") + public Result getCustomerList(@RequestBody UploadListFormDTO formDTO) { + PageData pageData = paCustomerService.getCustomerList(formDTO); + return new Result().ok(pageData); + } + } 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 f7a2eee380..0b1916a56a 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 @@ -94,4 +94,51 @@ public interface CodeCustomerDao extends BaseDao { */ CodeCustomerDTO selectUploadCodeByCustomer(@Param("customerId") String customerId, @Param("clientType") String clientType); + + /** + * 开发版 + * @author zhaoqifeng + * @date 2020/8/7 15:02 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO selectCommitInfo(@Param("customerId") String customerId, @Param("clientType") String clientType); + /** + * 审核版 + * @author zhaoqifeng + * @date 2020/8/7 15:02 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO selectAuditInfo(@Param("customerId") String customerId, @Param("clientType") String clientType); + /** + * 线上版 + * @author zhaoqifeng + * @date 2020/8/7 15:02 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO selectReleaseInfo(@Param("customerId") String customerId, @Param("clientType") String clientType); + + /** + * 上一个已发布版本 + * @author zhaoqifeng + * @date 2020/8/7 15:12 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO selectLastVersion(@Param("customerId") String customerId, @Param("clientType") String clientType); + + /** + * 激活上一版本 + * @author zhaoqifeng + * @date 2020/8/7 15:18 + * @param codeId + * @return void + */ + void updateVersion(@Param("codeId") String codeId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java index 126ef49db3..8a5e04675c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java @@ -21,9 +21,11 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.ModifyCustomerFormDTO; import com.epmet.dto.form.RegisterByAuthFormDTO; +import com.epmet.dto.form.UploadListFormDTO; import com.epmet.dto.result.CustomerAgencyResultDTO; import com.epmet.dto.result.CustomerAndUserResultDTO; import com.epmet.dto.result.RegisterByAuthResultDTO; +import com.epmet.dto.result.UploadListResultDTO; import com.epmet.entity.PaCustomerEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -86,6 +88,15 @@ public interface PaCustomerDao extends BaseDao { */ String selectCustomerName(@Param("customerId") String customerId); + /** + * 获取已初始化客户列表 + * @author zhaoqifeng + * @date 2020/8/7 17:44 + * @param formDTO + * @return java.util.List + */ + List selectInitCustomerList(UploadListFormDTO formDTO); + /** * @author sun * @Description 查询客户及管理员信息 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java index af21992505..a88d330ff1 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeCustomerEntity.java @@ -93,5 +93,26 @@ public class CodeCustomerEntity extends BaseEpmetEntity { */ private String qrCode; + /** + * 发布模式 gary:分阶段发布，total:全量发布 + */ + private String releaseType; + /** + * 灰度值 + */ + private Integer garyPercentage; + /** + * 上传时间 + */ + private Date commitTime; + /** + * 提交审核时间 + */ + private Date auditTime; + /** + * 发布时间 + */ + private Date releaseTime; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java index 706351f4f7..08ea501e7d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java @@ -43,6 +43,11 @@ public class CodeOperationHistoryEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 小程序类型 居民端resi,工作端work + */ + private String clientType; + /** * 代码ID */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java index bc1ec68f6b..fcbddcd665 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeCustomerService.java @@ -131,4 +131,34 @@ public interface CodeCustomerService extends BaseService { * @return void */ void deleteCode(String customerId, String clientType); + + /** + * 开发版 + * @author zhaoqifeng + * @date 2020/8/7 15:34 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO getCommitInfo(String customerId, String clientType); + + /** + * 审核版 + * @author zhaoqifeng + * @date 2020/8/7 15:34 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO getAuditInfo(String customerId, String clientType); + + /** + * 线上版 + * @author zhaoqifeng + * @date 2020/8/7 15:34 + * @param customerId + * @param clientType + * @return com.epmet.dto.CodeCustomerDTO + */ + CodeCustomerDTO getReleaseInfo(String customerId, String clientType); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java index 19928c70f6..a2fb76a0d7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java @@ -2,10 +2,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.*; -import com.epmet.dto.result.CategoryResultDTO; -import com.epmet.dto.result.QrCodeResultDTO; -import com.epmet.dto.result.ReasonResultDTO; -import com.epmet.dto.result.TemplateListResultDTO; +import com.epmet.dto.result.*; import java.util.List; @@ -54,6 +51,15 @@ public interface CodeService { */ PageData uploadList(UploadListFormDTO formDTO); + /** + * 获取版本信息 + * @author zhaoqifeng + * @date 2020/8/7 15:30 + * @param formDTO + * @return com.epmet.dto.result.CodeVersionInfoResultDTO + */ + CodeVersionInfoResultDTO version(CustomerClientFormDTO formDTO); + /** * 提交审核 * @@ -148,4 +154,13 @@ public interface CodeService { */ void setDomain(String customerId); + /** + * 已初始化客户列表 + * @author zhaoqifeng + * @date 2020/8/7 17:57 + * @param formDTO + * @return com.epmet.commons.tools.page.PageData + */ + PageData getCustomerList(UploadListFormDTO formDTO); + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java index 88259e13c9..b9c77f90f3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java @@ -204,4 +204,13 @@ public interface PaCustomerService extends BaseService { * @return com.epmet.dto.result.AccountBasicInfoResultDTO */ AccountBasicInfoResultDTO getAccountBasicInfo(CustomerClientFormDTO formDTO); + + /** + * 获取已初始化客户列表 + * @author zhaoqifeng + * @date 2020/8/7 17:41 + * @param formDTO + * @return com.epmet.commons.tools.page.PageData + */ + PageData getCustomerList(UploadListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java index 73aa86ccf3..cc3b41531d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeCustomerServiceImpl.java @@ -129,5 +129,20 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl auditingList = codeCustomerService.getAuditingCodeList(formDTO.getSource()); - String customerId = formDTO.getCustomerId(); - if (null != auditingList && auditingList.size() > NumConstant.ZERO) { - auditingList.forEach(code -> { - //获取小程序调用令牌 - AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(code.getCustomerId(), code.getClientType()); - //获取审核结果信息 - CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(code.getId()); - //调用微信API获取最新审核状态 - WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq(); - request.setAuditId(auditResult.getAuditId()); - WxResult wxAuditResult = wxMaCodeService.getAuditStatus(authInfo.getAuthorizerAccessToken(), request); - if (wxAuditResult.success()) { - WxMaAuditStatusResult result = wxAuditResult.getData(); - if (result.getStatus() == NumConstant.ZERO) { - code.setStatus(CodeConstant.AUDIT_SUCCESS); - auditResult.setResult(CodeConstant.AUDIT_SUCCESS); - saveOperation(customerId, code.getId(), code.getUserVersion(), CodeConstant.OPER_SUCCESS, "审核成功"); - } else if (result.getStatus() == NumConstant.ONE) { - code.setStatus(CodeConstant.AUDIT_FAILED); - auditResult.setResult(CodeConstant.AUDIT_FAILED); - auditResult.setReason(result.getReason()); - auditResult.setScreenShot(result.getScreenshot()); - saveOperation(customerId, code.getId(), code.getUserVersion(), CodeConstant.OPER_FAILED, result.getReason()); - } else if (result.getStatus() == NumConstant.FOUR) { - code.setStatus(CodeConstant.DELAY); - auditResult.setResult(CodeConstant.DELAY); - auditResult.setReason(result.getReason()); - saveOperation(customerId, code.getId(), code.getUserVersion(), CodeConstant.OPER_DELAY, result.getReason()); - } - codeCustomerService.update(code); - codeAuditResultService.update(auditResult); + return codeCustomerService.getCodeList(formDTO); + } + + @Override + public CodeVersionInfoResultDTO version(CustomerClientFormDTO formDTO) { + CodeVersionInfoResultDTO resultDTO = new CodeVersionInfoResultDTO(); + //开发版本 + CodeCustomerDTO commit = codeCustomerService.getCommitInfo(formDTO.getCustomerId(), formDTO.getClientType()); + resultDTO.getCommit().setCodeId(commit.getId()); + resultDTO.getCommit().setCodeInfo(commit.getUserDesc()); + resultDTO.getCommit().setModelId(commit.getTemplateId()); + resultDTO.getCommit().setVersion(commit.getUserVersion()); + resultDTO.getCommit().setCommitTime(DateUtils.format(commit.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); + //审核版本 + CodeCustomerDTO audit = codeCustomerService.getAuditInfo(formDTO.getCustomerId(), formDTO.getClientType()); + resultDTO.getAudit().setCodeId(audit.getId()); + resultDTO.getAudit().setVersion(audit.getUserVersion()); + resultDTO.getAudit().setCodeInfo(audit.getUserDesc()); + if (CodeConstant.AUDITING.equals(audit.getStatus())) { + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType()); + //获取审核结果信息 + CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId()); + //调用微信API获取最新审核状态 + WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq(); + request.setAuditId(auditResult.getAuditId()); + WxResult wxAuditResult = wxMaCodeService.getAuditStatus(authInfo.getAuthorizerAccessToken(), request); + if (wxAuditResult.success()) { + WxMaAuditStatusResult result = wxAuditResult.getData(); + if (result.getStatus() == NumConstant.ZERO) { + audit.setStatus(CodeConstant.AUDIT_SUCCESS); + auditResult.setResult(CodeConstant.AUDIT_SUCCESS); + saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_SUCCESS + , "审核成功"); + } else if (result.getStatus() == NumConstant.ONE) { + audit.setStatus(CodeConstant.AUDIT_FAILED); + auditResult.setResult(CodeConstant.AUDIT_FAILED); + auditResult.setReason(result.getReason()); + auditResult.setScreenShot(result.getScreenshot()); + saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_FAILED, + result.getReason()); + } else if (result.getStatus() == NumConstant.FOUR) { + audit.setStatus(CodeConstant.DELAY); + auditResult.setResult(CodeConstant.DELAY); + auditResult.setReason(result.getReason()); + saveOperation(formDTO.getCustomerId(), formDTO.getClientType(), audit.getId(), audit.getUserVersion(), CodeConstant.OPER_DELAY, + result.getReason()); } - }); + codeCustomerService.update(audit); + codeAuditResultService.update(auditResult); + } } - return codeCustomerService.getCodeList(formDTO); + resultDTO.getAudit().setStatus(audit.getStatus()); + resultDTO.getAudit().setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); + resultDTO.getAudit().setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN)); + //线上版本 + CodeCustomerDTO release = codeCustomerService.getReleaseInfo(formDTO.getCustomerId(), formDTO.getClientType()); + resultDTO.getRelease().setCodeId(release.getId()); + resultDTO.getRelease().setCodeInfo(release.getUserDesc()); + resultDTO.getRelease().setCommitTime(DateUtils.format(release.getCommitTime(), DateUtils.DATE_TIME_PATTERN)); + resultDTO.getRelease().setAuditTime(DateUtils.format(release.getAuditTime(), DateUtils.DATE_TIME_PATTERN)); + resultDTO.getRelease().setReleaseTime(DateUtils.format(release.getReleaseTime(), DateUtils.DATE_TIME_PATTERN)); + resultDTO.getRelease().setReleaseType(release.getReleaseType()); + resultDTO.getRelease().setGrayPercentage(release.getGaryPercentage()); + resultDTO.getRelease().setVersion(release.getUserVersion()); + return resultDTO; } @Override @@ -233,8 +256,8 @@ public class CodeServiceImpl implements CodeService { request.setUgcDeclare(formDTO.getUgcDeclare()); WxResult wxResult = wxMaCodeService.submitAudit(authInfo.getAuthorizerAccessToken(), request); if (!wxResult.success()) { - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, - wxResult.getErrorMsg()); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), + codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxResult.getErrorMsg()); throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); } if(formDTO.getIsSpeed()) { @@ -243,8 +266,8 @@ public class CodeServiceImpl implements CodeService { speedRequest.setAuditId(wxResult.getData()); WxResult wxSpeedResult = wxMaCodeService.speedUpAudit(authInfo.getAuthorizerAccessToken(), speedRequest); if (!wxSpeedResult.success()) { - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, - wxSpeedResult.getErrorMsg()); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), + codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg()); throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg()); } } @@ -270,8 +293,8 @@ public class CodeServiceImpl implements CodeService { //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.AUDITING); codeCustomerService.update(codeCustomerDTO); - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, - "审核中"); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), + CodeConstant.OPER_SUBMIT, "审核中"); } @Override @@ -302,8 +325,8 @@ public class CodeServiceImpl implements CodeService { //调用微信API撤销审核 WxResult wxResult = wxMaCodeService.undoCodeAudit(authInfo.getAuthorizerAccessToken()); if (!wxResult.success()) { - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_UNDO, - wxResult.getErrorMsg()); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), + codeCustomerDTO.getUserVersion(), CodeConstant.OPER_UNDO, wxResult.getErrorMsg()); throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); } //更新审核结果 @@ -315,8 +338,8 @@ public class CodeServiceImpl implements CodeService { //更新审核操作记录描述 codeOperationHistoryService.updateDescribe(codeCustomerDTO.getId(), "已撤回"); - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_UNDO, - "成功"); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), + CodeConstant.OPER_UNDO, "成功"); } @Override @@ -338,15 +361,18 @@ public class CodeServiceImpl implements CodeService { //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.RELEASE_FAILED); codeCustomerService.update(codeCustomerDTO); - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_RELEASE, - wxResult.getErrorMsg()); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), + codeCustomerDTO.getUserVersion(), CodeConstant.OPER_RELEASE, wxResult.getErrorMsg()); throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); } + //将之前上传信息删除 + codeCustomerService.deleteCode(formDTO.getCustomerId(), codeCustomerDTO.getClientType()); + //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.RELEASE_SUCCESS); codeCustomerService.update(codeCustomerDTO); - saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_RELEASE, - "发布成功"); + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), + CodeConstant.OPER_RELEASE, "发布成功"); } @Override @@ -522,9 +548,15 @@ public class CodeServiceImpl implements CodeService { }); } - private void saveOperation(String customerId, String codeId, String version, String operation, String describe) { + @Override + public PageData getCustomerList(UploadListFormDTO formDTO) { + return paCustomerService.getCustomerList(formDTO); + } + + private void saveOperation(String customerId, String clientType, String codeId, String version, String operation, String describe) { CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO(); operationDTO.setCustomerId(customerId); + operationDTO.setClientType(clientType); operationDTO.setCodeId(codeId); operationDTO.setVersion(version); operationDTO.setOperation(operation); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 806be0f664..c77f86e336 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -633,4 +633,12 @@ public class PaCustomerServiceImpl extends BaseServiceImpl list = baseDao.selectInitCustomerList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + } \ No newline at end of file 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 new file mode 100644 index 0000000000..b2e6d411ef --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.6__thirdUpdate.sql @@ -0,0 +1,8 @@ +alter table code_customer add RELEASE_TYPE varchar(10) NULL comment '发布模式 gary:分阶段发布，total:全量发布' after QR_CODE; +alter table code_customer add GARY_PERCENTAGE int(11) NULL comment '灰度值' after RELEASE_TYPE; +alter table code_customer add COMMIT_TIME datetime NULL comment '上传时间' after GARY_PERCENTAGE; +alter table code_customer add AUDIT_TIME datetime NULL comment '提交审核时间' after COMMIT_TIME; +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 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 c05006ae39..4ef32234ef 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 @@ -21,6 +21,7 @@ + + SELECT ID, + USER_VERSION, + USER_DESC, + TEMPLATE_ID, + COMMIT_TIME + FROM code_customer + WHERE CUSTOMER_ID = #{customerId} + AND CLIENT_TYPE = #{clientType} + AND STATUS = 'unaudited' + AND DEL_FLAG = '0' + + + + + + UPDATE code_customer + SET + DEL_FLAG = '0' + WHERE ID = #{codeId} + \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml index ffceb02e07..b14f2a4764 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml @@ -81,6 +81,26 @@ del_flag = 0 AND id = #{customerId} +