canshujiaoyan

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

@@ -6,6 +6,7 @@ import com.epmet.dto.indexcollect.*;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.service.evaluationindex.indexcoll.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,65 +25,95 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("project")
 public class ScreenProjectDataCollController {
 
-	@Autowired
+    @Autowired
-	private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
+    private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
-	@Autowired
+    @Autowired
-	private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
+    private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
-	@Autowired
+    @Autowired
-	private ScreenProjectGridDailyService projectGridDailyService;
+    private ScreenProjectGridDailyService projectGridDailyService;
-	@Autowired
+    @Autowired
-	private ScreenProjectOrgDailyService projectOrgDailyService;
+    private ScreenProjectOrgDailyService projectOrgDailyService;
-	@Autowired
+    @Autowired
-	private ScreenProjectQuantityGridMonthlyService projectQuantityGridMonthlyService;
+    private ScreenProjectQuantityGridMonthlyService projectQuantityGridMonthlyService;
-	@Autowired
+    @Autowired
-	private ScreenProjectQuantityOrgMonthlyService projectQuantityOrgMonthlyService;
+    private ScreenProjectQuantityOrgMonthlyService projectQuantityOrgMonthlyService;
 
-	@RequestMapping("category-grid-daily")
+    /**
-	public Result categoryGridDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param){
+     * @author wangc
-		if(null == param || CollectionUtils.isEmpty(param.getDataList()))
+     * @description 【事件/项目分析】按类别统计-网格
-			throw new ValidateException("传入数据不可为空");
+     **/
-		projectCategoryGridDailyService.collect(customerId,param);
+    @RequestMapping("category-grid-daily")
-		return new Result();
+    public Result categoryGridDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param) {
-	}
+        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
+            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
+        }
+        projectCategoryGridDailyService.collect(customerId, param);
+        return new Result();
+    }
 
-	@RequestMapping("category-org-daily")
+    /**
-	public Result categoryOrgDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param){
+     * @author wangc
-		if(null == param || CollectionUtils.isEmpty(param.getDataList()))
+     * @description 【事件/项目分析】按类别统计-组织
-			throw new ValidateException("传入数据不可为空");
+     **/
-		projectCategoryOrgDailyService.collect(customerId,param);
+    @RequestMapping("category-org-daily")
-		return new Result();
+    public Result categoryOrgDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param) {
-	}
+        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
+            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
+        }
+        projectCategoryOrgDailyService.collect(customerId, param);
+        return new Result();
+    }
 
-	@RequestMapping("quantity-grid-monthly")
+    /**
-	public Result quantityGridMonthly(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> param){
+     * @author wangc
-		if(null == param || CollectionUtils.isEmpty(param.getDataList()))
+     * @description 【事件/项目分析】网格内月度数量统计
-			throw new ValidateException("传入数据不可为空");
+     **/
-		projectQuantityGridMonthlyService.collect(customerId,param);
+    @RequestMapping("quantity-grid-monthly")
-		return new Result();
+    public Result quantityGridMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> param) {
-	}
+        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getMonthId())) {
+            throw new ValidateException("参数错误:dataList不能为空且monthId不能为空");
+        }
+        projectQuantityGridMonthlyService.collect(customerId, param);
+        return new Result();
+    }
 
-	@RequestMapping("quantity-org-monthly")
+    /**
-	public Result quantityOrgMonthly(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> param){
+     * @author wangc
-		if(null == param || CollectionUtils.isEmpty(param.getDataList()))
+     * @description 【事件/项目分析】组织内月度数量统计
-			throw new ValidateException("传入数据不可为空");
+     **/
-		projectQuantityOrgMonthlyService.collect(customerId,param);
+    @RequestMapping("quantity-org-monthly")
-		return new Result();
+    public Result quantityOrgMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> param) {
-	}
+        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getMonthId())) {
+            throw new ValidateException("参数错误:dataList不能为空且monthId不能为空");
+        }
+        projectQuantityOrgMonthlyService.collect(customerId, param);
+        return new Result();
+    }
 
-	@RequestMapping("project-grid-daily")
+    /**
-	public Result projectGridDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectGridDailyDTO> param){
+     * @author wangc
-		if(null == param || CollectionUtils.isEmpty(param.getDataList()))
+     * @description 【事件/项目分析】网格内事件
-			throw new ValidateException("传入数据不可为空");
+     **/
-		projectGridDailyService.collect(customerId,param);
+    @RequestMapping("project-grid-daily")
-		return new Result();
+    public Result projectGridDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectGridDailyDTO> param) {
-	}
+        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
+            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
+        }
+        projectGridDailyService.collect(customerId, param);
+        return new Result();
+    }
 
-	@RequestMapping("project-org-daily")
+    /**
-	public Result projectOrgDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectOrgDailyDTO> param){
+     * @author wangc
-		if(null == param || CollectionUtils.isEmpty(param.getDataList()))
+     * @description 【事件/项目分析】组织内事件
-			throw new ValidateException("传入数据不可为空");
+     **/
-		projectOrgDailyService.collect(customerId,param);
+    @RequestMapping("project-org-daily")
-		return new Result();
+    public Result projectOrgDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<ScreenProjectOrgDailyDTO> param) {
-	}
+        if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) {
+            throw new ValidateException("参数错误:dataList不能为空且dataId不能为空");
+        }
+        projectOrgDailyService.collect(customerId, param);
+        return new Result();
+    }
 
 }

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

@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyDao;
 import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO;
@@ -113,7 +111,6 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> data) {
-        if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
         if(data.getIsFirst()){
             baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
         }

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

@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyDao;
 import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO;
@@ -113,7 +111,6 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> data) {
-        if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
         if(data.getIsFirst()){
             baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
         }

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

@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectGridDailyDao;
 import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO;
@@ -114,7 +112,6 @@ public class ScreenProjectGridDailyServiceImpl extends BaseServiceImpl<ScreenPro
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectGridDailyDTO> data) {
-        if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
         if(data.getIsFirst()){
             baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
         }

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

@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectOrgDailyDao;
 import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO;
@@ -115,7 +113,6 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectOrgDailyDTO> data) {
-        if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
         if(data.getIsFirst()){
             baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
         }

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

@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyDao;
 import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO;
@@ -114,7 +112,6 @@ public class ScreenProjectQuantityGridMonthlyServiceImpl extends BaseServiceImpl
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> data) {
-        if(StringUtils.isBlank(data.getMonthId())) data.setMonthId(DateUtils.getBeforeNMonth(NumConstant.ONE));
         if(data.getIsFirst()){
             baseDao.deleteByDateIdAndCustomerId(customerId,data.getMonthId());
         }

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

@@ -21,11 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyDao;
 import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO;
@@ -113,7 +111,6 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> data) {
-        if(StringUtils.isBlank(data.getMonthId())) data.setMonthId(DateUtils.getBeforeNMonth(NumConstant.ONE));
         if(data.getIsFirst()){
             baseDao.deleteByDateIdAndCustomerId(customerId,data.getMonthId());
         }