难点堵点、党建能力、党员相关代码提交v2

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java

@@ -33,11 +33,10 @@ public class FactIndexCollectController {
      * @Author zhangyong
      * @Date 10:52 2020-08-20
      **/
-//    @ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("gridpartymemberdata")
     public Result gridPartyMemberData(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridPartyMemberDataFormDTO formDTO) {
-
+        factIndexCollectService.insertGridPartyMemberData(formDTO,externalAppRequestParam.getCustomerId() );
-        factIndexCollectService.insertGridPartyMemberData(formDTO,"b09527201c4409e19d1dbc5e3c3429a1" );//externalAppRequestParam.getCustomerId()
         return new Result();
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java

@@ -134,7 +134,7 @@ public class ScreenCollController {
     @ExternalAppRequestAuth
     @PostMapping("difficultydata")
     public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody DifficultyDataFormDTO formDTO) {
-        screenCollService.insertDifficultyData(formDTO, "b09527201c4409e19d1dbc5e3c3429a1");//externalAppRequestParam.getCustomerId()
+        screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
         return new Result();
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -16,9 +16,9 @@ import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.dto.screen.FactIndexGridScoreDTO;
 import com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
-import com.epmet.entity.evaluationindex.screen.ScreenIndexDataMonthlyEntity;
 import com.epmet.eum.IndexCodeEnum;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexCollectService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +34,7 @@ import java.util.stream.Collectors;
  * @Auther: zhangyong
  * @Date: 2020-08-20 10:05
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class FactIndexCollectServiceImpl implements FactIndexCollectService {