Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -28,78 +28,78 @@ public class FactIndexController {
     private FactIndexService factIndexService;
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 能力指数
      * @author sun
      */
     @PostMapping("index/ablityindex")
-    public Result<List<AblityIndexResultDTO>> ablityIndex(@LoginUser TokenDto tokenDTO, @RequestBody AblityIndexFormDTO formDTO) {
+    public Result<List<AblityIndexResultDTO>> ablityIndex(@RequestBody AblityIndexFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityIndexFormDTO.AddUserInternalGroup.class);
         return new Result<List<AblityIndexResultDTO>>().ok(factIndexService.ablityIndex(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 按月份查询各项能力分数
      * @author sun
      */
     @PostMapping("index/scorelist")
-    public Result<List<ScoreListResultDTO>> scoreList(@LoginUser TokenDto tokenDTO, @RequestBody ScoreListFormDTO formDTO) {
+    public Result<List<ScoreListResultDTO>> scoreList(@RequestBody ScoreListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ScoreListFormDTO.AddUserInternalGroup.class);
         return new Result<List<ScoreListResultDTO>>().ok(factIndexService.scoreList(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 按月份查询各项能力最近12个月得分
      * @author sun
      */
     @PostMapping("index/monthscorelist")
-    public Result<List<MonthScoreListResultDTO>> monthScoreList(@LoginUser TokenDto tokenDTO, @RequestBody MonthScoreListFormDTO formDTO) {
+    public Result<List<MonthScoreListResultDTO>> monthScoreList(@RequestBody MonthScoreListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MonthScoreListFormDTO.AddUserInternalGroup.class);
         return new Result<List<MonthScoreListResultDTO>>().ok(factIndexService.monthScoreList(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 按月查询各项指标数据
      * @author sun
      */
     @PostMapping("index/ablitylist")
-    public Result<List<AblityListResultDTO>> ablityList(@LoginUser TokenDto tokenDTO, @RequestBody AblityListFormDTO formDTO) {
+    public Result<List<AblityListResultDTO>> ablityList(@RequestBody AblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityListFormDTO.AddUserInternalGroup.class);
         return new Result<List<AblityListResultDTO>>().ok(factIndexService.ablityList(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 按月查询各项指标最近12个月数据
      * @author sun
      */
     @PostMapping("index/monthablitylist")
-    public Result<List<MonthAblityListResultDTO>> monthAblityList(@LoginUser TokenDto tokenDTO, @RequestBody MonthAblityListFormDTO formDTO) {
+    public Result<List<MonthAblityListResultDTO>> monthAblityList(@RequestBody MonthAblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MonthAblityListFormDTO.AddUserInternalGroup.class);
         return new Result<List<MonthAblityListResultDTO>>().ok(factIndexService.monthAblityList(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 同级对比各项数据查询
      * @author sun
      */
     @PostMapping("index/peercomparison")
-    public Result<List<PeerComparisonResultDTO>> peerComparison(@LoginUser TokenDto tokenDTO, @RequestBody PeerComparisonFormDTO formDTO) {
+    public Result<List<PeerComparisonResultDTO>> peerComparison(@RequestBody PeerComparisonFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, PeerComparisonFormDTO.AddUserInternalGroup.class);
         return new Result<List<PeerComparisonResultDTO>>().ok(factIndexService.peerComparison(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description 是否根组织
      * @author sun
      */
     @PostMapping("index/rootagency")
-    public Result<RootAgencyResultDTO> rootAgency(@LoginUser TokenDto tokenDTO, @RequestBody RootAgencyFormDTO formDTO) {
+    public Result<RootAgencyResultDTO> rootAgency(@RequestBody RootAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, RootAgencyFormDTO.AddUserInternalGroup.class);
         return new Result<RootAgencyResultDTO>().ok(factIndexService.rootAgency(formDTO));
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -103,12 +103,12 @@ public class IndexController {
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description  组织月度指数得分
      * @author sun
      */
     @PostMapping("month/indexscore")
-    public Result<IndexScoreResultDTO> indexScore(@LoginUser TokenDto tokenDTO, @RequestBody IndexScoreFormDTO formDTO) {
+    public Result<IndexScoreResultDTO> indexScore(@RequestBody IndexScoreFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, IndexScoreFormDTO.AddUserInternalGroup.class);
         return new Result<IndexScoreResultDTO>().ok(indexService.indexScore(formDTO));
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java

@@ -30,23 +30,23 @@ public class ScreenUserController {
     private ScreenUserService screenUserService;
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description  热心市民积分排行列表
      * @author sun
      */
     @PostMapping("userpointrank")
-    public Result<List<UserPointRankListResultDTO>> userPointRank(@LoginUser TokenDto tokenDTO, @RequestBody UserPointRankFormDTO formDTO) {
+    public Result<List<UserPointRankListResultDTO>> userPointRank(@RequestBody UserPointRankFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, UserPointRankFormDTO.AddUserInternalGroup.class);
         return new Result<List<UserPointRankListResultDTO>>().ok(screenUserService.userPointRank(formDTO));
     }
 
     /**
-     * @param tokenDTO
+     * @param formDTO
      * @Description  党员（指标得分）排行
      * @author sun
      */
     @PostMapping("partindexscroerank")
-    public Result<List<PartIndexScroeRankResultDTO>> partIndexScroeRank(@LoginUser TokenDto tokenDTO, @RequestBody PartIndexScroeRankFormDTO formDTO) {
+    public Result<List<PartIndexScroeRankResultDTO>> partIndexScroeRank(@RequestBody PartIndexScroeRankFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, PartIndexScroeRankFormDTO.AddUserInternalGroup.class);
         return new Result<List<PartIndexScroeRankResultDTO>>().ok(screenUserService.partIndexScroeRank(formDTO));
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -19,6 +19,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * 数据改版api
@@ -447,6 +448,9 @@ public class FactIndexServiceImpl implements FactIndexService {
      * @author sun
      */
     public String getDate(String newDate) {
+        if (!validDateEffecitive(newDate)) {
+            throw new RenException(String.format("monthId格式错误,monthId:%s", newDate));
+        }
         String date = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyymm");
         try {
@@ -460,6 +464,32 @@ public class FactIndexServiceImpl implements FactIndexService {
         return date;
     }
 
+    /**
+     * @param newDate
+     * @Description 校验日期格式是否正确
+     * @author sun
+     */
+    public boolean validDateEffecitive(String newDate) {
+        //yyyy-MM-dd格式
+        //String DATE_REGEX = "^([1-9]\\d{3}-)(([0]{0,1}[1-9]-)|([1][0-2]-))(([0-3]{0,1}[0-9]))$";
+        //yyyymm格式
+        String DATE_REGEX = "^([1-9]\\d{3})(([0]{0,1}[1-9])|([1][0-2]))$";
+        boolean matches = Pattern.matches(DATE_REGEX, newDate);
+        if (!matches) {
+            return matches;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyymm");
+        //设置日期格式转的严谨性
+        sdf.setLenient(false);
+        try {
+            sdf.parse(newDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return matches;
+    }
+
     /**
      * @param formDTO
      * @Description 同级对比各项数据查询