From a1e436631e05c068bde72e0eb701bae288e62267 Mon Sep 17 00:00:00 2001 From: wangchao Date: Sat, 10 Oct 2020 10:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=AE=81=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/AnScreenCollController.java | 7 +++++++ .../screen/impl/AnScreenCollServiceImpl.java | 6 ++++++ .../screen/ScreenAnGrassRootsGovernMonthlyDao.xml | 1 + .../screen/ScreenAnGrassRootsPmTotalMonthlyDao.xml | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java index fa1abb21c7..075e9f5959 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java @@ -1,9 +1,11 @@ package com.epmet.controller; +import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.dto.screencoll.form.*; import com.epmet.service.evaluationindex.screen.AnScreenCollService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +32,7 @@ public class AnScreenCollController { */ @PostMapping("pmtotal") public Result pmTotal(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO){ + if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空"); screenCollService.pmTotal(formDTO,customerId); return new Result(); } @@ -44,6 +47,7 @@ public class AnScreenCollController { */ @PostMapping("pmrank") public Result pmRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO){ + if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空"); screenCollService.pmRank(formDTO,customerId); return new Result(); } @@ -58,6 +62,7 @@ public class AnScreenCollController { */ @PostMapping("grassrootsorg") public Result grassrootsOrg(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO){ + if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空"); screenCollService.grassrootsOrg(formDTO,customerId); return new Result(); } @@ -72,6 +77,7 @@ public class AnScreenCollController { */ @PostMapping("grassrootsgovern") public Result grassrootsGovern(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO){ + if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空"); screenCollService.grassrootsGovern(formDTO,customerId); return new Result(); } @@ -86,6 +92,7 @@ public class AnScreenCollController { */ @PostMapping("projectFile") public Result projectFile(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO){ + if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空"); screenCollService.communityProjectProfile(formDTO,customerId); return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java index 74a97ed599..a21953686d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java @@ -16,6 +16,7 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -54,6 +55,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService { * @date 2020.10.09 16:41 */ @Override + @Transactional(rollbackFor = Exception.class) public void communityProjectProfile(ScreenCollFormDTO formDTO,String customerId) { List dataList = formDTO.getDataList(); if(CollectionUtils.isEmpty(dataList)) return ; @@ -78,6 +80,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService { * @date 2020.10.09 17:19 */ @Override + @Transactional(rollbackFor = Exception.class) public void pmRank(ScreenCollFormDTO formDTO,String customerId) { List dataList = formDTO.getDataList(); if(CollectionUtils.isEmpty(dataList)) return ; @@ -101,6 +104,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService { * @date 2020.10.09 17:20 */ @Override + @Transactional(rollbackFor = Exception.class) public void pmTotal(ScreenCollFormDTO formDTO,String customerId) { List dataList = formDTO.getDataList(); if(CollectionUtils.isEmpty(dataList)) return ; @@ -131,6 +135,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService { * @date 2020.10.09 17:22 */ @Override + @Transactional(rollbackFor = Exception.class) public void grassrootsOrg(ScreenCollFormDTO formDTO,String customerId) { List dataList = formDTO.getDataList(); if(CollectionUtils.isEmpty(dataList)) return ; @@ -161,6 +166,7 @@ public class AnScreenCollServiceImpl implements AnScreenCollService { * @date 2020.10.09 17:23 */ @Override + @Transactional(rollbackFor = Exception.class) public void grassrootsGovern(ScreenCollFormDTO formDTO,String customerId) { List dataList = formDTO.getDataList(); if(CollectionUtils.isEmpty(dataList)) return ; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyDao.xml index 6978b64319..5c6ce14824 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsGovernMonthlyDao.xml @@ -50,6 +50,7 @@ #{item.partiProjectTotal}, #{item.closedProjectTotal}, #{item.projectResponseRatio}, + #{item.projectSatisRatio}, #{item.closedProjectRatio}, 'APP_USER', NOW(), diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyDao.xml index 56f4e48a1e..6f4b7b7e67 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsPmTotalMonthlyDao.xml @@ -11,7 +11,7 @@ CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} - LIMITE 1000 + LIMIT 1000