From 3be3601cdbcd976df1b890228d19e8cecd8be21b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 26 Aug 2021 16:39:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?/data/stats/screencoll/meetdata=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E5=8A=A0=E4=B8=80=E4=B8=8B=E6=A0=A1=E9=AA=8C=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screencoll/form/PartyBranchDataFormDTO.java | 13 +++++++++++++ .../screencoll/form/PartyBranchDataListFormDTO.java | 10 ++++++++++ .../external/ShiBeiScreenCollController.java | 2 ++ 3 files changed, 25 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java index 21144c89ab..b1f01ed63b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto.screencoll.form; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -17,46 +19,57 @@ public class PartyBranchDataFormDTO implements Serializable { /** * 年Id ：yyyy */ + @NotBlank(message = "yearId不能为空") + @Length(max = 4,message = "yyyy") private String yearId; /** * 月份Id ：yyyyMM */ + @NotBlank(message = "monthId不能为空") + @Length(max = 6,message = "格式：yyyyMM") private String monthId; /** * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice */ + @NotBlank(message = "type不能为空") private String type; /** * 组织类别 agency：组织；部门：department；网格：grid */ + @NotBlank(message = "orgType不能为空") private String orgType; /** * 组织Id 可以为网格，机关id */ + @NotBlank(message = "orgId不能为空") private String orgId; /** * 上级组织Id */ + @NotBlank(message = "parentId不能为空") private String parentId; /** * 组织名称 */ + @NotBlank(message = "orgName不能为空") private String orgName; /** * 会议分类名称 */ + @NotBlank(message = "meetCategoryName不能为空") private String meetCategoryName; /** * 会议分类id */ + @NotBlank(message = "meetCategoryId不能为空") private String meetCategoryId; /** diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java index 8c6a92e7b6..cfda49c5e0 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java @@ -1,7 +1,12 @@ package com.epmet.dto.screencoll.form; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -18,12 +23,17 @@ public class PartyBranchDataListFormDTO implements Serializable { /** * 当为true时后台将删除本月数据 */ + @NotNull(message = "isFirst不能为空") private Boolean isFirst; /** * yyyyMM */ + @NotBlank(message = "monthId不能为空") + @Length(max = 6,message = "格式：yyyyMM") private String monthId; + @Valid + @NotEmpty(message = "数据集合不能为空") private List dataList; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java index f142adbf6d..d99bece157 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java @@ -1,6 +1,7 @@ package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO; import com.epmet.dto.screencoll.form.*; import com.epmet.service.evaluationindex.screen.ShiBeiScreenCollService; @@ -59,6 +60,7 @@ public class ShiBeiScreenCollController { **/ @PostMapping("meetdata") public Result meetData(@RequestHeader("CustomerId") String customerId, @RequestBody PartyBranchDataListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); shiBeiScreenCollService.insertPartyBranchData(formDTO, customerId); return new Result(); } From 52b18c84159bcebde8f6a4c332be784f7ceb4d72 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 13:46:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ResiEventDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 5883c4ccec..3284be99e6 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 @@ -47,9 +47,9 @@ )t LEFT JOIN resi_event_attachment rea - ON (rea.RESI_EVENT_ID = t.eventId) - where rea.DEL_FLAG = '0' - AND rea.ATTACHMENT_TYPE = 'image' + ON (rea.RESI_EVENT_ID = t.eventId + and rea.DEL_FLAG = '0' + AND rea.ATTACHMENT_TYPE = 'image') ORDER BY t.eventTime,rea.sort asc From 0e408f78c21a29b8c6240c65110d6b93409654fd Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 27 Aug 2021 14:41:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=AA=E5=A4=9A=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/todata/impl/ProjectExtractServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index f05f6e5f70..f4f616a722 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.service.project.ProjectService; import com.epmet.service.stats.DimCustomerService; import com.epmet.service.topic.TopicService; import com.epmet.util.DimIdGenerator; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -478,9 +479,11 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { formattingData.add(dest); }); - if(!CollectionUtils.isEmpty(formattingData)) { - factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(null,param.getCustomerId()); - factOriginProjectOrgPeriodDailyDao.insertBatch(formattingData); + if (!CollectionUtils.isEmpty(formattingData)) { + factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(null, param.getCustomerId()); + Lists.partition(formattingData, NumConstant.ONE_HUNDRED) + .forEach(part -> factOriginProjectOrgPeriodDailyDao.insertBatch(part)); + } }