From 8dfbe0f5bf7f71a8d495a4cd052a1f4173b74072 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Sep 2021 11:15:10 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=AF=84=E5=88=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index bc905870e8..f83db7979c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -580,8 +580,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 12:03:27 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmettduck/result/TDuckListResultDTO.java | 4 ++-- .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java index ee412e8ad3..5b2346cb97 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java @@ -4,8 +4,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -69,6 +67,7 @@ public class TDuckListResultDTO implements Serializable { private String client; private String createdTime; + private String updatedTime; /** * 是否填写问卷，true：是，false：否 @@ -107,6 +106,7 @@ public class TDuckListResultDTO implements Serializable { this.status = NumConstant.ONE; this.client = ""; this.createdTime = ""; + this.updatedTime = ""; this.fillStatus = false; this.isFillQuestion = true; this.orgName = ""; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index a22d98b11d..48bd2f41bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -92,7 +92,7 @@ #{key} ) - ORDER BY up.created_time DESC + ORDER BY up.updated_time DESC \ No newline at end of file From ce433557a24f3195b27e900648bb29d97890beaf Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Sep 2021 15:11:33 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PrUserProjectServiceImpl.java | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index f83db7979c..0c6894e9de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -51,6 +51,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.*; import com.epmet.dataaggre.dto.epmettduck.struct.*; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; +import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; @@ -70,6 +71,8 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -251,9 +254,37 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl insertPrVistRecord(TDuckListFormDTO formDTO) { + return Executors.newCachedThreadPool().submit(()->{ + PrVistRecordDTO param = new PrVistRecordDTO(); + param.setCustomerId(formDTO.getCustomerId()); + param.setUserId(formDTO.getUserId()); + param.setUserType(formDTO.getOrgType()); + param.setProjectKey(formDTO.getClient()); + PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId()); + PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class); + if (newestRecord == null) { + prVistRecordService.insert(entity); + } else { + entity = new PrVistRecordEntity(); + entity.setId(newestRecord.getId()); + prVistRecordService.updateById(entity); + } + }); + } + /** * @Description orgIds拼接 * @Param pids @@ -808,4 +839,4 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 15:15:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 0c6894e9de..063e326d45 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -256,7 +256,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 15:23:47 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=9C=8B=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 063e326d45..04d4c7425e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -268,6 +268,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl insertPrVistRecord(TDuckListFormDTO formDTO) { return Executors.newCachedThreadPool().submit(()->{ + log.info("insertPrVistRecord start ========="); PrVistRecordDTO param = new PrVistRecordDTO(); param.setCustomerId(formDTO.getCustomerId()); param.setUserId(formDTO.getUserId()); @@ -282,6 +283,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 15:36:57 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B0=8F=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 2 +- .../service/epmettduck/impl/PrVistRecordServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 04d4c7425e..5975c7959d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -827,7 +827,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl 0) { + if (list.get(0).getCreatedTime().compareTo(visitRecord.getUpdatedTime()) > 0) { result.setRedPoint(NumConstant.ONE_STR); } else { result.setRedPoint(NumConstant.ZERO_STR); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java index fbc0034277..b3c99aadcb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java @@ -115,12 +115,13 @@ public class PrVistRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PrVistRecordEntity::getUserId, staffId); - wrapper.orderByDesc(PrVistRecordEntity::getCreatedTime); + wrapper.orderByDesc(PrVistRecordEntity::getUpdatedTime); + wrapper.last("limit 1"); List list = baseDao.selectList(wrapper); if (CollectionUtils.isEmpty(list)) { return null; } - return ConvertUtils.sourceToTarget(list, PrVistRecordDTO.class).get(0); + return ConvertUtils.sourceToTarget(list.get(0), PrVistRecordDTO.class); } } \ No newline at end of file From 68b62193e39022258e4168a405b87d403dc3da75 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Sep 2021 16:09:17 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/epmettduck/PrVistRecordEntity.java | 17 ++++----- .../epmettduck/PrVistRecordService.java | 8 ++++- .../impl/PrUserProjectServiceImpl.java | 35 ++++--------------- .../impl/PrVistRecordServiceImpl.java | 22 +++++++++++- 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java index 00864276e1..61f7c117cb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java @@ -17,14 +17,13 @@ package com.epmet.dataaggre.entity.epmettduck; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 用户访问问卷记录表 * @@ -38,9 +37,10 @@ public class PrVistRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; - /** - * - */ + /** + * + */ + @TableId(type = IdType.ID_WORKER_STR) private String id; /** @@ -58,9 +58,4 @@ public class PrVistRecordEntity extends BaseEpmetEntity { */ private String userType; - /** - * 项目key - */ - private String projectKey; - } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java index 691e4cdc95..e505cf6995 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java @@ -101,4 +101,10 @@ public interface PrVistRecordService extends BaseService { * @Date 2021/9/23 14:16 */ PrVistRecordDTO getNewestRecord(String staffId); -} \ No newline at end of file + + /** + * desc:插入或更新记录 + * @param param + */ + void insertOrUpdate(PrVistRecordDTO param); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 5975c7959d..a958594b83 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -254,39 +254,16 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl insertPrVistRecord(TDuckListFormDTO formDTO) { - return Executors.newCachedThreadPool().submit(()->{ - log.info("insertPrVistRecord start ========="); - PrVistRecordDTO param = new PrVistRecordDTO(); - param.setCustomerId(formDTO.getCustomerId()); - param.setUserId(formDTO.getUserId()); - param.setUserType(formDTO.getOrgType()); - param.setProjectKey(formDTO.getClient()); - PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId()); - PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class); - if (newestRecord == null) { - prVistRecordService.insert(entity); - } else { - entity = new PrVistRecordEntity(); - entity.setId(newestRecord.getId()); - prVistRecordService.updateById(entity); - } - log.info("insertPrVistRecord end ========="); - }); - } - /** * @Description orgIds拼接 * @Param pids diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java index b3c99aadcb..7c25410b56 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java @@ -124,4 +124,24 @@ public class PrVistRecordServiceImpl extends BaseServiceImpl { + try { + + PrVistRecordDTO newestRecord = this.getNewestRecord(param.getUserId()); + if (newestRecord == null) { + PrVistRecordEntity entity = ConvertUtils.sourceToTarget(param, PrVistRecordEntity.class); + this.insert(entity); + } else { + PrVistRecordEntity entity = new PrVistRecordEntity(); + entity.setId(newestRecord.getId()); + this.updateById(entity); + } + } catch (Exception e) { + log.error("insertPrVistRecord excption", e); + } + //}); + } + +} From 751fa2af3cd9fcdfbd490c43fc94dce64b368b66 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 30 Sep 2021 17:31:05 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/govorg/CustomerAgencyDao.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index aa345e87b3..65e1cece37 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -165,7 +165,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - CONCAT( PIDS, ID ) AS orgPids + IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids FROM customer_agency a WHERE @@ -175,7 +175,7 @@ cd.ID AS orgId, DEPARTMENT_NAME AS orgName, 'dept' AS orgType, - CONCAT( PIDS, ca.ID, cd.ID ) AS orgPids + CONCAT( PIDS, ':', ca.ID, ':', cd.ID ) AS orgPids FROM customer_department cd INNER JOIN customer_agency ca ON cd.AGENCY_ID = ca.ID @@ -186,7 +186,7 @@ ID AS orgId, GRID_NAME AS orgName, 'grid' AS orgType, - CONCAT( PIDS, ID ) AS orgPids + CONCAT( PIDS,':', ID ) AS orgPids FROM customer_grid WHERE @@ -202,7 +202,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - CONCAT(PIDS,ID) AS orgPids + IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids from customer_agency @@ -228,7 +228,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - CONCAT( PIDS, ID ) AS orgPids + IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids FROM customer_agency a WHERE @@ -238,7 +238,7 @@ ID AS orgId, GRID_NAME AS orgName, 'grid' AS orgType, - CONCAT( PIDS, ID ) AS orgPids + CONCAT( PIDS, ':', ID ) AS orgPids FROM customer_grid WHERE @@ -254,7 +254,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - CONCAT(PIDS,ID) AS orgPids + IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids from customer_agency From e54092c46cf3ce15aaa7b8f2c29aaa3783b630ce Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 30 Sep 2021 17:36:16 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/govorg/CustomerAgencyDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 65e1cece37..7a0760d0a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -165,7 +165,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids + IF(PIDS = '', ID, CONCAT( PIDS,':', ID )) AS orgPids FROM customer_agency a WHERE @@ -202,7 +202,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids + IF(PIDS = '', ID, CONCAT( PIDS,':', ID )) AS orgPids from customer_agency @@ -228,7 +228,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids + IF(PIDS = '', ID, CONCAT( PIDS,':', ID )) AS orgPids FROM customer_agency a WHERE @@ -254,7 +254,7 @@ ID AS orgId, ORGANIZATION_NAME AS orgName, 'agency' AS orgType, - IF(PIDS = '',CONCAT( ID ),CONCAT( PIDS,':', ID )) AS orgPids + IF(PIDS = '', ID, CONCAT( PIDS,':', ID )) AS orgPids from customer_agency From 6e2259ec9400cb1543d8eeb353125ee99210badc Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Sep 2021 18:18:04 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index a958594b83..33f1c36c49 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -51,7 +51,6 @@ import com.epmet.dataaggre.dto.epmettduck.result.*; import com.epmet.dataaggre.dto.epmettduck.struct.*; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; -import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; @@ -71,8 +70,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -193,7 +190,10 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl