安宁 数据采集接口修改

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<AnGrassRootsPmTotalMonthlyFormDTO> 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<AnGrassRootsPmRankFormDTO> 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<AnGrassRootsOrgMonthlyFormDTO> 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<AnGrassRootsGovernMonthlyFormDTO> 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<AnCommunityProjectProfileFormDTO> formDTO){
+        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
         screenCollService.communityProjectProfile(formDTO,customerId);
         return new Result();
     }

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<AnCommunityProjectProfileFormDTO> formDTO,String customerId) {
         List<AnCommunityProjectProfileFormDTO> 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<AnGrassRootsPmRankFormDTO> formDTO,String customerId) {
         List<AnGrassRootsPmRankFormDTO> 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<AnGrassRootsPmTotalMonthlyFormDTO> formDTO,String customerId) {
         List<AnGrassRootsPmTotalMonthlyFormDTO> 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<AnGrassRootsOrgMonthlyFormDTO> formDTO,String customerId) {
         List<AnGrassRootsOrgMonthlyFormDTO> 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<AnGrassRootsGovernMonthlyFormDTO> formDTO,String customerId) {
         List<AnGrassRootsGovernMonthlyFormDTO> dataList = formDTO.getDataList();
         if(CollectionUtils.isEmpty(dataList)) return ;

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(),

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
     </delete>
 
     <insert id="insertBatch">