From 25616b3c3e32ee57cfa136689b5f5fb1652f9242 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 13 Aug 2020 16:38:55 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=89=88=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-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml index 4efc51d87e..aeca1692a3 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.123 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.125 ports: - "8110:8110" network_mode: host # 使用现有网络 From 5206cc98dfb657471a539566cb732bb45ed390e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Aug 2020 16:47:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index c3d4efaca1..fd7b3a0072 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -193,6 +193,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 13 Aug 2020 16:52:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/CodeController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 01014d7564..cdaa2a6742 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 @@ -232,11 +232,24 @@ public class CodeController { return new Result().ok(result); } + /** + * 版本回退 + * @author zhaoqifeng + * @date 2020/8/13 16:51 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ @PostMapping("speedupaudit") public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) { codeService.speedUpAudit(formDTO); return new Result<>(); } + @PostMapping("revertcoderelease") + public Result revertCodeRelease(@RequestBody CodeCommonFormDTO formDTO) { + codeService.revertCodeRelease(formDTO); + return new Result<>(); + } + } From abf62739693d6e2cf8044969cb4aa3e2edc710bf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 16:53:42 +0800 Subject: [PATCH 4/9] =?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 4bd3602a2f..6bc39da836 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.125 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.126 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 9bf16b4e2d..f8a5371837 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.125 + 0.0.126 com.epmet From b24045f383a72f1010db0825c5e8c92d6106a710 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 16:56:50 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E4=BB=8Euser=5Fcustomer=E6=9F=A5=E8=AF=A2(=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A[=E9=9D=9E=E9=A6=96=E6=AC=A1]=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91Id)=E6=94=B9=E6=88=90=E4=BB=8Eregister=5Frela?= =?UTF-8?q?tion=E6=9F=A5=E8=AF=A2(=E9=A6=96=E6=AC=A1=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91Id=E4=BB=A5=E5=8F=8A[=E9=9D=9E=E9=A6=96?= =?UTF-8?q?=E6=AC=A1]=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/GridLatestServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/GridLatestDao.xml | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index 051666a7cc..46bd30dfff 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -190,12 +190,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) { - - List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); List allData = new LinkedList<>(); - if(null == userIds || userIds.isEmpty()){ - return allData; - } + List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); + if(null == userIds) userIds = new LinkedList<>(); CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO(); customerParam.setCustomerId(customerUserFormDTO.getCustomerId()); Result> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam); @@ -203,6 +200,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl From 4cf31f07c8176129c279aabba6f2c73c6150966b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 17:05:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20+=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 614297ad11..60fb75bf2c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.115 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c97c10d46f..a1575aa794 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.115 + 0.3.116 com.epmet epmet-user From 02b9a9e79e9a9ee4cbbd45f5dd8bea472765f2bc Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Aug 2020 17:07:39 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=83=A8=E7=BD=B2user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index f4095a047f..51d4f40331 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.115 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.116 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 391618f6b9750a7f9441c86c98e60ac2b0f03372 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:28:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/CodeAuditResultDao.java | 5 +++-- .../com/epmet/service/CodeAuditResultService.java | 5 +++-- .../service/impl/CodeAuditResultServiceImpl.java | 4 ++-- .../com/epmet/service/impl/CodeServiceImpl.java | 3 ++- .../db/migration/V0.0.7__thirdUpdate.sql | 5 +++++ .../main/resources/mapper/CodeAuditResultDao.xml | 15 +++++++++++---- 6 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java index 691f8cd708..a72e0756b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java @@ -46,10 +46,11 @@ public interface CodeAuditResultDao extends BaseDao { * 获取审核失败列表 * @author zhaoqifeng * @date 2020/8/5 11:11 - * @param codeId + * @param customerId + * @param clientType * @return java.util.List */ - List selectAuditFailedList(@Param("codeId") String codeId); + List selectAuditFailedList(@Param("customerId") String customerId, @Param("clientType") String clientType); /** * @Description 更新 代码审核结果中的审核状态 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java index 9fff9570dd..4ecb436796 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java @@ -106,10 +106,11 @@ public interface CodeAuditResultService extends BaseService getAuditFailedList(String codeId); + List getAuditFailedList(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/impl/CodeAuditResultServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java index dfcd1cb87c..534aba66b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java @@ -107,8 +107,8 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl getAuditFailedList(String codeId) { - return baseDao.selectAuditFailedList(codeId); + public List getAuditFailedList(String customerId, String clientType) { + return baseDao.selectAuditFailedList(customerId, clientType); } } \ No newline at end of file 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 216330a6e3..ce3a43181d 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 @@ -420,7 +420,8 @@ public class CodeServiceImpl implements CodeService { throw new RenException("未授权"); } //获取审核结果信息 - List codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCodeId()); + List codeAuditResultList = codeAuditResultService.getAuditFailedList(codeCustomerDTO.getCustomerId(), + codeCustomerDTO.getClientType()); codeAuditResultList.forEach(dto -> { ReasonResultDTO result = new ReasonResultDTO(); result.setReason(dto.getReason()); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql new file mode 100644 index 0000000000..6cf941f4ee --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql @@ -0,0 +1,5 @@ +alter table code_audit_result add FEEDBACK_INFO varchar(255) NULL comment '反馈内容' after SCREEN_SHOT_URL; +alter table code_audit_result add FEEDBACK_STUFF tinytext NULL comment '反馈素材' after FEEDBACK_INFO; + + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml index 7fdba9ef6f..2c3146763a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml @@ -22,10 +22,17 @@ ORDER BY CREATED_TIME DESC From 9b4b4a49f0ab4123ecd1d88c3944b8a60abf9a64 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:30:28 +0800 Subject: [PATCH 9/9] =?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 6bc39da836..4dcb903831 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.126 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.127 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 f8a5371837..ad595a9de5 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.126 + 0.0.127 com.epmet