From ccb95c5c5c0bb39aa6ce846321b0d2ab0b02f802 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 21 Dec 2021 17:14:22 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=201.=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=BC=8F=E6=8E=89=E7=9A=84=E5=8E=86=E5=8F=B2grid?= =?UTF-8?q?=EF=BC=8Cagency,department=E7=BB=B4=E5=BA=A6=E5=88=B0=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E8=A1=A8=EF=BC=8C=E6=9F=A5=E6=BC=8F=E8=A1=A5=E7=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/DimController.java | 57 +++++++++++++++++ .../epmet/dao/org/CustomerDepartmentDao.java | 1 + .../com/epmet/dao/org/CustomerGridDao.java | 2 +- .../epmet/dao/org/StatsCustomerAgencyDao.java | 1 + .../com/epmet/service/StatsDimService.java | 18 ++++++ .../epmet/service/impl/EIDimServiceImpl.java | 6 +- .../service/impl/StatsDimServiceImpl.java | 62 +++++++++++++++++-- .../service/org/CustomerAgencyService.java | 9 ++- .../org/CustomerDepartmentService.java | 2 +- .../service/org/CustomerGridService.java | 2 +- .../org/impl/CustomerAgencyServiceImpl.java | 17 ++++- .../impl/CustomerDepartmentServiceImpl.java | 4 +- .../org/impl/CustomerGridServiceImpl.java | 4 +- .../epmet/service/stats/DimAgencyService.java | 21 +++++++ .../service/stats/DimDepartmentService.java | 7 +++ .../epmet/service/stats/DimGridService.java | 8 +++ .../stats/impl/DimAgencyServiceImpl.java | 12 ++++ .../stats/impl/DimDepartmentServiceImpl.java | 11 ++++ .../stats/impl/DimGridServiceImpl.java | 12 ++++ .../mapper/org/CustomerDepartmentDao.xml | 3 + .../resources/mapper/org/CustomerGridDao.xml | 3 + .../mapper/org/StatsCustomerAgencyDao.xml | 3 + 22 files changed, 247 insertions(+), 18 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java index 68dedbd4a0..3f9aa180a6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java @@ -1,18 +1,26 @@ package com.epmet.controller; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.AgencySubDeptTreeDto; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO; import com.epmet.service.StatsDimService; import com.epmet.service.stats.*; +import com.sun.org.apache.xpath.internal.operations.Bool; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +@Slf4j @RestController @RequestMapping("dim") public class DimController { @@ -272,4 +280,53 @@ public class DimController { return new Result().ok(partyMemberService.statsPartyMember(customerIdAndDateIdFormDTO)); } + /** + * 同步客户相关的维度：agency,department,grid + * 用来补充其他系统传递过来的，旧有的数据 + * @param customerId + * @return + */ + @PostMapping("/customer-related-dims/sync") + public Result syncCustomerRelatedDims(@RequestParam("customer-id") String customerId) { + if (StringUtils.isBlank(customerId)) { + String errorMsg = "【同步客户相关的维度】请传递客户ID"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg); + } + + boolean syncAgencySuccess = true; + boolean syncGridSuccess = true; + boolean syncDepartmentSuccess = true; + + // 一.同步agency + try { + statsDimService.syncCustomerAgencyDims(customerId); + } catch (Exception e) { + syncAgencySuccess = false; + log.error("【同步客户相关维度】同步agency失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + + // 二.同步grid + try { + statsDimService.syncCustomerGridDims(customerId); + } catch (Exception e) { + syncGridSuccess = false; + log.error("【同步客户相关维度】同步grid失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + + // 三.同步department + try { + statsDimService.syncCustomerDepartmentDims(customerId); + } catch (Exception e) { + syncDepartmentSuccess = false; + log.error("【同步客户相关维度】同步department失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + + // 构造结果 + HashMap r = new HashMap<>(); + r.put("syncAgencySuccess", syncAgencySuccess); + r.put("syncGridSuccess", syncGridSuccess); + r.put("syncDepartmentSuccess", syncDepartmentSuccess); + + return new Result().ok(r); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java index 8db5a46efb..a3cb1286a2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerDepartmentDao.java @@ -35,6 +35,7 @@ import java.util.List; public interface CustomerDepartmentDao extends BaseDao { List listDepartmentsByCreatedTime( + @Param("customerId") String customerId, @Param("createdTimeFrom") Date createdTimeFrom, @Param("createdTimeTo") Date createdTimeTo); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java index 688807259e..1677dc8f76 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java @@ -49,7 +49,7 @@ public interface CustomerGridDao extends BaseDao { * @param end * @return */ - List listGridsByCreateTime(@Param("start") Date start, @Param("end") Date end); + List listGridsByCreateTime(@Param("customerId") String customerId, @Param("start") Date start, @Param("end") Date end); /** * @Description 查询机关下的网格总数 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java index a16f40e204..7f2ed28d1e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java @@ -19,6 +19,7 @@ public interface StatsCustomerAgencyDao extends BaseDao { List listAllEntities(); List listAgenciesByCreateTime( + @Param("customerId") String customerId, @Param("statsStartTime") Date statsStartTime, @Param("statsEndTime") Date statsEndTime); List selectAllAgency(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java index 0bdac4cb04..9e9a37de5a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java @@ -12,4 +12,22 @@ public interface StatsDimService { void initDepartmentDim(); void customerInitProjectCategory(); + + /** + * 同步客户的组织维度 + * @param customerId + */ + void syncCustomerAgencyDims(String customerId); + + /** + * 同步客户的网格维度 + * @param customerId + */ + void syncCustomerGridDims(String customerId); + + /** + * 同步客户的部门维度 + * @param customerId + */ + void syncCustomerDepartmentDims(String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java index 696b6fb221..c67213d6d2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java @@ -83,7 +83,7 @@ public class EIDimServiceImpl implements EIDimService { startTime = e.getCreatedTime(); } - return originCustomerAgencyService.listAgenciesByCreateTime(startTime, endTime); + return originCustomerAgencyService.listAgenciesByCreateTime(null, startTime, endTime); } @Override @@ -125,7 +125,7 @@ public class EIDimServiceImpl implements EIDimService { startTime = lastAddDept.getCreatedTime(); } - return originCustomerDepartmentService.listDepartmentsByCreatedTime(startTime, endTime); + return originCustomerDepartmentService.listDepartmentsByCreatedTime(null, startTime, endTime); } @Override @@ -179,6 +179,6 @@ public class EIDimServiceImpl implements EIDimService { startTime = lastAddGrid.getCreatedTime(); } - return customerGridService.listGridsByCreateTime(startTime, endTime); + return customerGridService.listGridsByCreateTime(null, startTime, endTime); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java index d81f5afb89..d9081c7c6f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.RobotConstant; import com.epmet.dto.org.result.CustomerAreaCodeResultDTO; import com.epmet.entity.crm.CustomerEntity; @@ -78,10 +79,10 @@ public class StatsDimServiceImpl implements StatsDimService { Date now = new Date(); if (lastDimEntity == null) { // 首次初始化 - grids = customerGridService.listGridsByCreateTime(null, now); + grids = customerGridService.listGridsByCreateTime(null, null, now); } else { Date lastInitTime = lastDimEntity.getCreatedTime(); - grids = customerGridService.listGridsByCreateTime(lastInitTime, now); + grids = customerGridService.listGridsByCreateTime(null, lastInitTime, now); } return convertCustomerGrid2GridDim(grids, now); @@ -127,7 +128,7 @@ public class StatsDimServiceImpl implements StatsDimService { * @param initTime 创建时间会用来作为下一次查询的输入条件，因此必须和本次初始化查询的endTime一致 * @return */ - private List convertCustomerGrid2GridDim(List grids, Date initTime) { + public List convertCustomerGrid2GridDim(List grids, Date initTime) { return grids.stream().map(grid -> { DimGridEntity dimGrid = new DimGridEntity(); dimGrid.setAgencyId(grid.getPid()); @@ -168,7 +169,7 @@ public class StatsDimServiceImpl implements StatsDimService { lastInitTime = latestCreatedAgencyDim.getCreatedTime(); } - return customerAgencyService.listAgenciesByCreateTime(lastInitTime, endDate); + return customerAgencyService.listAgenciesByCreateTime(null, lastInitTime, endDate); } /** @@ -268,7 +269,7 @@ public class StatsDimServiceImpl implements StatsDimService { if (lastCreatedDeptDim != null) { lastInitTime = lastCreatedDeptDim.getCreatedTime(); } - return departmentService.listDepartmentsByCreatedTime(lastInitTime, now); + return departmentService.listDepartmentsByCreatedTime(null, lastInitTime, now); } public List listUpdatedDepartments(Date initTime) { @@ -321,4 +322,55 @@ public class StatsDimServiceImpl implements StatsDimService { } return new ArrayList<>(); } + + @Override + public void syncCustomerAgencyDims(String customerId) { + // 1.列出现有的agency 维度id列表 + List dimAgencyIds = dimAgencyService.listAgencyIds(customerId); + + // 2.查询业务表的agency列表 + Date endDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); + List bizAgencies = customerAgencyService.listAgenciesByCreateTime(customerId, null, endDate); + + // 3.将没有同步过来的插入到dim表。创建和更新时间存为今天凌晨 + for (CustomerAgencyEntity bizAgency : bizAgencies) { + if (!dimAgencyIds.contains(bizAgency.getId())) { + dimAgencyService.initAgencyAllDim(bizAgency, endDate); + dimAgencyService.initAgencySelfDim(bizAgency, endDate); + } + } + } + + @Override + public void syncCustomerGridDims(String customerId) { + // 1.列出现有的grid维度id列表 + List dimGridIds = dimGridService.listGridIds(customerId); + + // 2.查询业务表的grid列表 + // 时间截止到今天凌晨，防止把今天的数据同步过来，影响定时任务查询，漏掉其他客户的数据 + Date endDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); + List bizGrids = customerGridService.listGridsByCreateTime(customerId, null, endDate); + + // 3.将没有同步过来的插入到dim表。创建和更新时间存为今天凌晨 + List grids2insert = bizGrids.stream().filter(bg -> !dimGridIds.contains(bg.getId())).collect(Collectors.toList()); + List dimGridEntities = convertCustomerGrid2GridDim(grids2insert, endDate); + + dimGridEntities.forEach(g -> dimGridService.insert(g)); + } + + @Override + public void syncCustomerDepartmentDims(String customerId) { + // 1.列出现有的grid维度id列表 + List dimDeptIds = dimDepartmentService.listDepartmentIds(customerId); + + // 2.查询业务表的grid列表 + // 时间截止到今天凌晨，防止把今天的数据同步过来，影响定时任务查询，漏掉其他客户的数据 + Date endDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); + List bizDepts = departmentService.listDepartmentsByCreatedTime(customerId, null, endDate); + + List depts2insert = bizDepts.stream().filter(bd -> !dimDeptIds.contains(bd.getId())).collect(Collectors.toList()); + + // 3.将没有同步过来的插入到dim表。创建和更新时间存为今天凌晨 + dimDepartmentService.initDepartmentDims(depts2insert, new ArrayList<>(), endDate); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java index 156b7294a9..4a47055e82 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java @@ -10,7 +10,7 @@ import java.util.Date; import java.util.List; public interface CustomerAgencyService { - List listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime); + List listAgenciesByCreateTime(String customerId, Date statsStartTime, Date statsEndTime); List listAgenciesByUpdatedTime(Date updatedTime, Date now); @@ -66,4 +66,11 @@ public interface CustomerAgencyService { * @Description 批量查询客户组织基础信息 **/ List getAgencyBaseInfo(GridBaseInfoFormDTO formDTO); + + /** + * 列出agencyId列表 + * @param customerId + * @return + */ + List listAgencyIds(String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java index f7d5900682..45650a3864 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerDepartmentService.java @@ -7,7 +7,7 @@ import java.util.List; public interface CustomerDepartmentService { - List listDepartmentsByCreatedTime(Date createdTimeFrom, Date createdTimeTo); + List listDepartmentsByCreatedTime(String customerId, Date createdTimeFrom, Date createdTimeTo); List listDepartmentsByUpdatedTime(Date startTime, Date endTime); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java index f6131f2906..d4aedd0ba2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java @@ -23,7 +23,7 @@ public interface CustomerGridService extends BaseService { * @return * @Param("start") Date start, @Param("end") Date end */ - List listGridsByCreateTime(Date start, Date end); + List listGridsByCreateTime(String customerId, Date start, Date end); /** * @Description 查询机关下有多少网格 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java index 3e06682b15..af86e32a74 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.org.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -25,6 +26,7 @@ import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service @DataSource(DataSourceConstant.GOV_ORG) @@ -40,8 +42,8 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService { private CustomerGridService customerGridService; @Override - public List listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime) { - return customerAgencyDao.listAgenciesByCreateTime(statsStartTime, statsEndTime); + public List listAgenciesByCreateTime(String customerId, Date statsStartTime, Date statsEndTime) { + return customerAgencyDao.listAgenciesByCreateTime(customerId, statsStartTime, statsEndTime); } @Override @@ -283,4 +285,15 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService { return customerAgencyDao.getAgencyBaseInfo(formDTO); } + @Override + public List listAgencyIds(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(CustomerAgencyEntity::getCustomerId, customerId); + query.select(CustomerAgencyEntity::getId); + + return customerAgencyDao.selectObjs(query) + .stream() + .map(o -> o.toString()) + .collect(Collectors.toList()); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java index 0a7a4e380a..2427d025dc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerDepartmentServiceImpl.java @@ -25,8 +25,8 @@ public class CustomerDepartmentServiceImpl implements CustomerDepartmentService * @return */ @Override - public List listDepartmentsByCreatedTime(Date createdTimeFrom, Date createdTimeTo) { - return departmentDao.listDepartmentsByCreatedTime(createdTimeFrom, createdTimeTo); + public List listDepartmentsByCreatedTime(String customerId, Date createdTimeFrom, Date createdTimeTo) { + return departmentDao.listDepartmentsByCreatedTime(customerId, createdTimeFrom, createdTimeTo); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java index 76376efd82..956c5990bc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java @@ -34,8 +34,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl listGridsByCreateTime(Date start, Date end) { - return baseDao.listGridsByCreateTime(start, end); + public List listGridsByCreateTime(String customerId, Date start, Date end) { + return baseDao.listGridsByCreateTime(customerId, start, end); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java index e22b42c609..47e8ead12d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java @@ -187,4 +187,25 @@ public interface DimAgencyService extends BaseService { * @return java.util.List */ List getAgencyByLevel(String customerId, String level); + + /** + * 查询agency维度已存在的id列表 + * @param customerId + * @return + */ + List listAgencyIds(String customerId); + + /** + * 初始化agency all 维度(all区分于self) + * @param agency + * @param initTime + */ + void initAgencyAllDim(CustomerAgencyEntity agency, Date initTime); + + /** + * 初始化agency self 维度(self区分于all) + * @param agency + * @param initTime + */ + void initAgencySelfDim(CustomerAgencyEntity agency, Date initTime); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java index c1d5478153..3fae407d7c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimDepartmentService.java @@ -120,4 +120,11 @@ public interface DimDepartmentService extends BaseService { */ List getDistrictDepByCustomer(String customerId); + /** + * 查询部门维度id列表 + * @param customerId + * @return + */ + List listDepartmentIds(String customerId); + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java index f98f0dd75a..3702b09ceb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java @@ -148,4 +148,12 @@ public interface DimGridService extends BaseService { * @date 2020.09.20 13:01 **/ List getGridAttributes(String customerId,List gridIds); + + /** + * 查询网格维度ID列表 + * @param customerId + * @return + */ + List listGridIds(String customerId); + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java index 99e6ba794c..90c8a46324 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.stats.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.dynamic.datasource.annotation.DataSource; @@ -47,6 +48,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 机关维度 @@ -158,6 +160,7 @@ public class DimAgencyServiceImpl extends BaseServiceImpl listAgencyIds(String customerId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DimAgencyEntity::getCustomerId, customerId); + queryWrapper.select(DimAgencyEntity::getId); + + return baseDao.selectObjs(queryWrapper).stream().map(o -> o.toString()).collect(Collectors.toList()); + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java index 28d1026a17..47e474c4aa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.stats.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.dynamic.datasource.annotation.DataSource; @@ -43,6 +44,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 客户部门维度 @@ -169,4 +171,13 @@ public class DimDepartmentServiceImpl extends BaseServiceImpl getDistrictDepByCustomer(String customerId) { return baseDao.getDistrictDepByCustomer(customerId); } + + @Override + public List listDepartmentIds(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(DimDepartmentEntity::getCustomerId, customerId); + query.select(DimDepartmentEntity::getId); + + return baseDao.selectObjs(query).stream().map(d -> d.toString()).collect(Collectors.toList()); + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java index df149feb02..0a0fb86ecf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.stats.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.dynamic.datasource.annotation.DataSource; @@ -45,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.stream.Collectors; /** * 客户网格维度 @@ -193,4 +195,14 @@ public class DimGridServiceImpl extends BaseServiceImpl listGridIds(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(DimGridEntity::getCustomerId, customerId); + query.select(DimGridEntity::getId); + + return baseDao.selectObjs(query).stream().map(o -> o.toString()).collect(Collectors.toList()); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml index 0e373b7d3d..1df3ef3a1a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml @@ -13,6 +13,9 @@ dept.AGENCY_ID = ca.id and ca.DEL_FLAG='0') dept.DEL_FLAG = 0 + + AND dept.CUSTOMER_ID = #{customerId} + AND dept.CREATED_TIME >= #{createdTimeFrom} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml index 5b39b9e9a1..587b75120e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml @@ -10,6 +10,9 @@ DEL_FLAG = 0 AND SYNC_FLAG='1' + + AND CUSTOMER_ID = #{customerId} + AND CREATED_TIME >= #{start} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml index b43eea7bb1..aa337955ad 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml @@ -17,6 +17,9 @@ DEL_FLAG = 0 AND SYNC_FLAG='1' + + AND CUSTOMER_ID = #{customerId} + AND CREATED_TIME >= #{statsStartTime} From 82f7e51d7b9b474fd828c949da2183fa817885e8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 10:25:38 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=20=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=20=E6=88=BF=E5=B1=8B=20=E6=8E=92=E5=BA=8F=20=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=20=E6=A5=BC=E5=AE=87=20=20?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E5=90=8D=E7=A7=B0=20=E6=88=BF=E5=B1=8B=20?= =?UTF-8?q?=E5=8D=95=E5=85=83-=E9=97=A8=E7=89=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 7 +---- .../service/impl/BuildingServiceImpl.java | 18 +------------ .../epmet/service/impl/HouseServiceImpl.java | 27 +------------------ .../service/impl/NeighborHoodServiceImpl.java | 8 ------ .../main/resources/mapper/IcBuildingDao.xml | 4 +-- .../src/main/resources/mapper/IcHouseDao.xml | 1 + .../resources/mapper/IcNeighborHoodDao.xml | 3 ++- 7 files changed, 8 insertions(+), 60 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index ab0b6c646f..dff792d8c6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -32,7 +32,6 @@ import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.excel.IcHouseExcel; import com.epmet.service.HouseService; -import com.epmet.service.NeighborHoodService; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -56,10 +55,6 @@ import java.util.stream.Collectors; @RestController @RequestMapping("house") public class HouseController { - - - @Autowired - private NeighborHoodService neighborHoodService; @Autowired private HouseService houseService; @@ -173,4 +168,4 @@ public class HouseController { Result> queryListHouseInfo(@RequestBody Set houseIds){ return new Result>().ok(houseService.queryListHouseInfo(houseIds)); } -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 24fe5e520a..512a89c209 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -365,25 +365,9 @@ public class BuildingServiceImpl implements BuildingService { private IPage> searchBuilding(ListIcNeighborHoodFormDTO formDTO) { IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); -// IcNeighborHoodEntity neighbor = new IcNeighborHoodEntity(); -// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); - -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); - - IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); building.setDelFlag("0"); -// QueryWrapper buildingEntityQueryWrapper = new QueryWrapper<>(); -// -// buildingEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId()) -// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName()); -// buildingEntityQueryWrapper.eq("a.DEL_FLAG","0"); + IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); IPage> mapIPage = icBuildingDao.searchBuildingByPage(page, building, house); List> records = mapIPage.getRecords(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 4ff3bb2948..69a2000d97 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -201,9 +201,7 @@ public class HouseServiceImpl implements HouseService { //3.保存 icHouseService.insertBatch(houseEntityList); - /*if(!"".equals(str)){ - return new Result().error(9999, str.append("不存在").toString()); - }*/ + return numList; } @@ -252,28 +250,6 @@ public class HouseServiceImpl implements HouseService { private IPage> searchHouse(ListIcNeighborHoodFormDTO formDTO) { IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); -// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); - - -// QueryWrapper buildingEntityQueryWrapper = new QueryWrapper<>(); -// buildingEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId()) -// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName()); -// IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); - - -// QueryWrapper houseEntityQueryWrapper = new QueryWrapper<>(); -// houseEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getOwnerName()),IcHouseEntity::getOwnerName,formDTO.getOwnerName()) -// .like(!StringUtils.isEmpty(formDTO.getOwnerPhone()),IcHouseEntity::getOwnerPhone,formDTO.getOwnerPhone()); -// houseEntityQueryWrapper.eq("a.DEL_FLAG","0"); - IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); house.setDelFlag("0"); @@ -281,7 +257,6 @@ public class HouseServiceImpl implements HouseService { List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); -// item.put("rentFlag", HouseRentFlagEnums.getTypeValue(item.get("rentFlagKey") )); item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey"))); }); return mapIPage; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index dd5e742342..5c68f83dba 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -133,14 +133,6 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); -// neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0"); - IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); neighbor.setDelFlag("0"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index f605b5c71f..a9df36a163 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -94,7 +94,7 @@ AND a.DEL_FLAG = #{building.delFlag} - order by a.CREATED_TIME asc + order by a.BUILDING_NAME - \ No newline at end of file + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 61aa971630..8b0286d90f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -144,6 +144,7 @@ + ORDER BY d.UNIT_NUM,a.DOOR_NAME - \ No newline at end of file + From 14487d3f70db28aeb72bc299a5e5c04456003ed3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 10:49:22 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E4=B9=9F?= =?UTF-8?q?=E6=8E=92=E4=B8=80=E4=B8=8B=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 8 +- .../com/epmet/service/BuildingService.java | 8 +- .../service/impl/BuildingServiceImpl.java | 29 +++-- .../main/resources/mapper/IcBuildingDao.xml | 112 ------------------ 4 files changed, 21 insertions(+), 136 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 98b5d1233e..adaa3ed3f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -92,9 +92,7 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - - buildingService.AddBuilding(customerId,formDTO); + buildingService.addBuilding(customerId,formDTO); return new Result().ok("保存成功"); } @@ -105,7 +103,7 @@ public class BuildingController { ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - buildingService.UpdateBuilding(customerId,formDTO); + buildingService.updateBuilding(customerId,formDTO); return new Result().ok("修改成功"); } @@ -114,7 +112,7 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.DeleteGroup.class); String buildingId = formDTO.getBuildingId(); - buildingService.DelBuilding(buildingId); + buildingService.delBuilding(buildingId); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 3a78628602..81b70a4bd2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -40,16 +40,16 @@ public interface BuildingService { - void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO); + void updateBuilding(String customerId, IcBulidingFormDTO formDTO); /** * 删除小区 * @param buildingId */ - void DelBuilding(String buildingId); + void delBuilding(String buildingId); - void AddBuilding(String customerId, IcBulidingFormDTO formDTO); + void addBuilding(String customerId, IcBulidingFormDTO formDTO); List treeList(String customerId); @@ -62,4 +62,4 @@ public interface BuildingService { List buildingListByIds(List buildingIdList); BuildingResultPagedDTO buildinglistbyidsPage(List buildingIdList, Integer pageNo, Integer pageSize); -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 512a89c209..c421861a7c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -70,7 +72,7 @@ public class BuildingServiceImpl implements BuildingService { @Override @Transactional(rollbackFor = Exception.class) - public void AddBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void addBuilding(String customerId, IcBulidingFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null); if (null != count && count > 0) { @@ -152,8 +154,10 @@ public class BuildingServiceImpl implements BuildingService { //3.获取网格下的所有小区 - List gridIdList = customerGridList.stream().map(a->a.getId()).collect(Collectors.toList()); - List icNeighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList)); + List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList); + queryWrapper.orderByAsc(IcNeighborHoodEntity::getCreatedTime); + List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); return covertToTree(customerAgency,agencyList); @@ -171,8 +175,11 @@ public class BuildingServiceImpl implements BuildingService { }).collect(Collectors.toList()); //3.获取小区下的所有楼宇 - List neighborHoodIdList = icNeighborHoodList.stream().map(a->a.getId()).collect(Collectors.toList()); - List icBuildingList = icBuildingDao.selectList(new QueryWrapper().lambda().in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList)); + List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() + .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) + .orderByAsc(IcBuildingEntity::getBuildingName); + List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if(CollectionUtils.isEmpty(neighborHoodIdList)){ agencyList.addAll(gridList); @@ -193,14 +200,6 @@ public class BuildingServiceImpl implements BuildingService { return buildingTreeLevelDTO; }).collect(Collectors.toList()); - - - - //组织 -// gridList.stream() -// Map> gridMap = gridList.stream().collect(Collectors.groupingBy(e -> e.getPId())); -// List allList = agencyList.addAll(gridList) - agencyList.addAll(gridList); agencyList.addAll(neighbourHoodList); agencyList.addAll(buildingList); @@ -412,7 +411,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void updateBuilding(String customerId, IcBulidingFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId()); if (null != count && count > 0) { @@ -468,7 +467,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void DelBuilding(String buildingId) { + public void delBuilding(String buildingId) { //如果存在房屋，无法删除 List icHouseEntities = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, buildingId)); if(!CollectionUtils.isEmpty(icHouseEntities)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index a9df36a163..f3aaa7ba80 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -138,117 +138,6 @@ - - - - - - - From 8f0b81b16d1d251fca1214d22fefa9bb31122c99 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 12:37:16 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E5=85=88=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E5=86=8D=E6=8C=89=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=9B=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=B0=86=E5=8D=95=E5=85=83=E5=8F=B7=E8=BD=AC=E4=B8=BA=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 7 ++++--- .../src/main/resources/mapper/IcBuildingDao.xml | 2 +- .../src/main/resources/mapper/IcHouseDao.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index c421861a7c..c51ffbb4f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -155,8 +155,9 @@ public class BuildingServiceImpl implements BuildingService { //3.获取网格下的所有小区 List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList); - queryWrapper.orderByAsc(IcNeighborHoodEntity::getCreatedTime); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .in(IcNeighborHoodEntity::getGridId, gridIdList) + .orderByAsc(IcNeighborHoodEntity::getCreatedTime); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); @@ -178,7 +179,7 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getBuildingName); + .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if(CollectionUtils.isEmpty(neighborHoodIdList)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index f3aaa7ba80..d4f3847235 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -94,7 +94,7 @@ AND a.DEL_FLAG = #{building.delFlag} - order by a.BUILDING_NAME + order by a.CREATED_TIME, a.BUILDING_NAME SELECT CONCAT( - (select agency_name from screen_customer_agency where agency_id = rd.parent_id), + (select agency_name from screen_customer_agency where agency_id = rd.parent_id AND org.CUSTOMER_ID = #{customerId}), '-', dm.org_name )AS "name", @@ -252,7 +252,7 @@ rd.satisfaction_ratio AS "satisfactionRatio" FROM screen_index_data_monthly dm - INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id + INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id AND dm.CUSTOMER_ID = rd.CUSTOMER_ID INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0' From 56ceafd039b9bddf439536ae2c8145ccd35ce1d9 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Dec 2021 14:44:39 +0800 Subject: [PATCH 08/14] fix --- .../main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index cdf670c98e..2851c5a835 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -172,7 +172,7 @@ - u.CUSTOMER_ID = #{customerId} + AND u.CUSTOMER_ID = #{customerId} ORDER BY u.point_total DESC,convert(u.user_name using gbk) ASC From 1c87a9d0b87c091d64116c084dfb46e6c53dc255 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 15:22:29 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E6=A0=B9=E7=BB=84=E7=BB=87=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/CustomerAgencyDao.xml | 36 +++---------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 4e7660f651..8b89d3c966 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -341,22 +341,8 @@ cg.id AS gridId, cg.GRID_NAME AS gridName, cg.CUSTOMER_ID AS customerId, - ( CASE WHEN ca.longitude is null THEN - ( SELECT longitude FROM customer_agency - WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) - ORDER BY pid ASC LIMIT 1 - ) - ELSE ca.longitude - END - ) longitude, - ( CASE WHEN ca.latitude is null THEN - ( SELECT latitude FROM customer_agency - WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) - ORDER BY pid ASC LIMIT 1 - ) - ELSE ca.latitude - END - ) latitude + ca.longitude, + ca.latitude FROM customer_grid cg INNER JOIN customer_agency ca ON cg.PID = ca.ID @@ -371,22 +357,8 @@ agency.ORGANIZATION_NAME AS agencyName, agency.LEVEL AS level, agency.CUSTOMER_ID as customerId, - ( CASE WHEN agency.longitude is null THEN - ( SELECT longitude FROM customer_agency - WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id) - ORDER BY pid ASC LIMIT 1 - ) - ELSE agency.longitude - END - ) longitude, - ( CASE WHEN agency.latitude is null THEN - ( SELECT latitude FROM customer_agency - WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id) - ORDER BY pid ASC LIMIT 1 - ) - ELSE agency.latitude - END - ) latitude + agency.longitude, + agency.latitude FROM CUSTOMER_AGENCY agency WHERE From f034060dd996088d8cf37675eeb09151870b902d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 23 Dec 2021 15:46:50 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/ResiEventFormDTO.java | 2 +- .../epmet/dto/result/EventListResultDTO.java | 24 ++++ .../epmet/dto/result/NewEventsResultDTO.java | 2 +- .../dto/result/ResiEventListResultDTO.java | 2 +- .../dto/result/UserMentionResultDTO.java | 2 +- .../service/impl/ResiEventServiceImpl.java | 110 ++++++++++-------- .../src/main/resources/bootstrap.yml | 2 + .../main/resources/mapper/ResiEventDao.xml | 83 +++++++------ .../resources/mapper/ResiEventMentionDao.xml | 2 + 9 files changed, 138 insertions(+), 91 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java index 0a8929b0dd..e297f4f153 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java @@ -34,7 +34,7 @@ public class ResiEventFormDTO implements Serializable { /** * 事件内容，最多1000 */ - @Length(min = 1, max = 1000, message = "请填写内容,最多输入1000字", groups = AddUserShowGroup.class) + @Length(max = 1000, message = "请填写内容,最多输入1000字", groups = AddUserShowGroup.class) private String eventContent; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java index 23ecd11982..47fc45c7c6 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -45,4 +46,27 @@ public class EventListResultDTO implements Serializable { */ private List eventImgs; + /** + * 语音附件url集合 + */ + private List voiceList; + /** + * 事件附件 + */ + @JsonIgnore + private List attachmentList; + + @Data + public static class Attachment { + /** + * url + */ + private String url; + + /** + * 附件类型 + */ + private String type; + } + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java index 580d9da12d..68e0ba99ca 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java @@ -40,7 +40,7 @@ public class NewEventsResultDTO implements Serializable { * 事件附件 */ @JsonIgnore - private List attachmentList; + private List attachmentList; @Data public static class Attachment { diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventListResultDTO.java index 44dc457a59..3fa8432bab 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventListResultDTO.java @@ -69,7 +69,7 @@ public class ResiEventListResultDTO implements Serializable { * 事件附件 */ @JsonIgnore - private List attachmentList; + private List attachmentList; @Data public static class Attachment { diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java index 4be78b5d64..0abae1961f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java @@ -68,7 +68,7 @@ public class UserMentionResultDTO implements Serializable { * 事件附件 */ @JsonIgnore - private List attachmentList; + private List attachmentList; @Data public static class Attachment { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 626b058f2d..72c2a5529f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -125,6 +125,20 @@ public class ResiEventServiceImpl extends BaseServiceImpl result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType()); if (!CollectionUtils.isEmpty(result)){ + //附件按类型分组【图片、语音】 + result.forEach(re->{ + List eventImgs = new ArrayList<>(); + List voiceList = new ArrayList<>(); + re.getAttachmentList().forEach(file->{ + if ("image".equals(file.getType())) { + eventImgs.add(file.getUrl()); + } else if ("voice".equals(file.getType())) { + voiceList.add(file.getUrl()); + } + }); + re.setEventImgs(eventImgs); + re.setVoiceList(voiceList); + }); return result; } return new ArrayList<>(); @@ -322,7 +336,50 @@ public class ResiEventServiceImpl extends BaseServiceImpl voiceDTOList = new ArrayList<>(); + int sort = 1;//原本下标从0开始 图片的用了1就保持一致从1开始 + for (FileCommonDTO file : formDTO.getVoiceList()) { + ResiEventAttachmentEntity entity = new ResiEventAttachmentEntity(); + entity.setCustomerId(formDTO.getCustomerId()); + entity.setResiEventId(resiEventEntity.getId()); + entity.setAttachmentName(file.getName()); + entity.setAttachmentFormat(file.getFormat()); + entity.setAttachmentType(file.getType()); + entity.setAttachmentUrl(file.getUrl()); + entity.setSort(sort); + entity.setStatus(TopicConstant.AUDITING); + sort++; + resiEventAttachmentDao.insert(entity); + + VoiceTaskDTO task = new VoiceTaskDTO(); + task.setDataId(entity.getId()); + task.setUrl(file.getUrl()); + voiceDTOList.add(task); + } + //5-2-2.语音创建审核任务【定时任务会处理待审核语音后修改数据库数据】 + VoiceScanParamDTO voiceScanParamDTO = new VoiceScanParamDTO(); + voiceScanParamDTO.setTasks(voiceDTOList); + voiceScanParamDTO.setOpenCallBack(false); + Result voiceScanResult = ScanContentUtils.voiceAsyncScan(scanApiUrl.concat(voiceAsyncScanMethod), voiceScanParamDTO); + if (!voiceScanResult.success() || !voiceScanResult.getData().isAllSuccess()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + List taskList = voiceScanResult.getData().getSuccessTasks(); + //提交记录存入task表 + List scanTaskEntityList = taskList.stream().map(item -> { + ResiEventScanTaskEntity taskEntity = new ResiEventScanTaskEntity(); + taskEntity.setCustomerId(formDTO.getCustomerId()); + taskEntity.setResiEventId(resiEventEntity.getId()); + taskEntity.setResiEventAttachmentId(item.getDataId()); + taskEntity.setTaskId(item.getTaskId()); + taskEntity.setStatus(TopicConstant.AUDITING); + taskEntity.setAttachmentType(TopicConstant.VOICE); + return taskEntity; + }).collect(Collectors.toList()); + resiEventScanTaskService.insertBatch(scanTaskEntityList); + } } //6、插入组织表 List orgEntityList=getOrgList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getOrgList()); @@ -401,62 +458,13 @@ public class ResiEventServiceImpl extends BaseServiceImpl voiceList) { - //1.语音附件存入表中 - List voiceDTOList = new ArrayList<>(); - int sort = 0; - for (FileCommonDTO file : voiceList) { - ResiEventAttachmentEntity entity = new ResiEventAttachmentEntity(); - entity.setCustomerId(customerId); - entity.setResiEventId(resiEventId); - entity.setAttachmentName(file.getName()); - entity.setAttachmentFormat(file.getFormat()); - entity.setAttachmentType(file.getType()); - entity.setAttachmentUrl(file.getUrl()); - entity.setSort(sort); - sort++; - resiEventAttachmentDao.insert(entity); - - VoiceTaskDTO task = new VoiceTaskDTO(); - task.setDataId(entity.getId()); - task.setUrl(file.getUrl()); - voiceDTOList.add(task); - } - //2.语音创建审核任务【定时任务会处理待审核语音后修改数据库数据】 - VoiceScanParamDTO voiceScanParamDTO = new VoiceScanParamDTO(); - voiceScanParamDTO.setTasks(voiceDTOList); - voiceScanParamDTO.setOpenCallBack(false); - Result voiceScanResult = ScanContentUtils.voiceAsyncScan(scanApiUrl.concat(voiceAsyncScanMethod), voiceScanParamDTO); - if (!voiceScanResult.success() || !voiceScanResult.getData().isAllSuccess()) { - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); - } else { - List taskList = voiceScanResult.getData().getSuccessTasks(); - List taskIds = taskList.stream().map(AsyncScanTaskDTO::getTaskId).collect(Collectors.toList()); - //提交记录存入task表 - List scanTaskEntityList = taskList.stream().map(item -> { - ResiEventScanTaskEntity taskEntity = new ResiEventScanTaskEntity(); - taskEntity.setCustomerId(customerId); - taskEntity.setResiEventId(resiEventId); - taskEntity.setResiEventAttachmentId(item.getDataId()); - taskEntity.setTaskId(item.getTaskId()); - taskEntity.setStatus(TopicConstant.AUDITING); - taskEntity.setAttachmentType(TopicConstant.VOICE); - return taskEntity; - }).collect(Collectors.toList()); - resiEventScanTaskService.insertBatch(scanTaskEntityList); - } - } - private void scanContent(String eventContent, List attachmentList) { //事件内容 if (StringUtils.isNotBlank(eventContent)) { diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index 2800f5ad1c..7821e73e53 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -122,6 +122,8 @@ openapi: method: imgSyncScan: /imgSyncScan textSyncScan: /textSyncScan + voiceAsyncScan: /voiceAsyncScan + voiceResults: /voiceResults #pageHelper分页插件 pagehelper: diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 72a83c1e6a..ff32d40a97 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -10,46 +10,51 @@ - - + + + +