报表中心

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/HiveDataDownloadDTO.java

@@ -2,27 +2,40 @@ package com.gic.enterprise.dto;
 
 import com.gic.enterprise.constant.ExcelExtensionEnum;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 public class HiveDataDownloadDTO implements Serializable {
+    public interface hiveData{
+
+    }
+
+    @NotNull(message = "企业id不能为空", groups = hiveData.class)
     private Integer enterpriseId;
     /**表名**/
+    @NotNull(message = "表名不能为空", groups = hiveData.class)
     private String tableName;
     /**查询条件**/
+    @NotEmpty(message = "查询字段不能为空", groups = hiveData.class)
     private List<HiveQueryCondition> queryConditionList;
     /**申请人用户id*/
+    @NotNull(message = "申请人不能为空", groups = hiveData.class)
     private Integer applyUserId;
     /**数据源（频道页），用  "-" 隔开上级和本级**/
     private String dataContent;
     /**报告类型 1：完整数据， 2：脱敏数据， 3：二维码***/
+    @NotNull(message = "报告类型不能为空", groups = hiveData.class)
     private Integer dataType;
     /**可以尝试用request.getHeader("Referer")获取dataUrl**/
     private String dataUrl;
     /**下载文件名*/
+    @NotNull(message = "文件名称不能为空", groups = hiveData.class)
     private String fileName;
     /**文件扩展 1.xlsx  2.xls  3.csv**/
+    @NotNull(message = "文件类型不能为空", groups = hiveData.class)
     private Integer excelExtension;
     /**待下载数据的开始时间**/
     private String reportStartTime;

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/HiveDataDownloadApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.gic.enterprise.service.HiveDataDownloadApiService;
 import com.gic.enterprise.utils.FileUtils;
 import com.gic.enterprise.utils.HiveConnUtils;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.store.utils.valid.ValidUtil;
 import com.gic.thirdparty.BucketNameEnum;
 import com.gic.thirdparty.FileOperateUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -77,6 +78,11 @@ public class HiveDataDownloadApiServiceImpl implements HiveDataDownloadApiServic
 
     @Override
     public ServiceResponse<Integer> createDownloadTask(HiveDataDownloadDTO hiveDataDownloadDTO) {
+        //校验参数
+        ServiceResponse paramResult = ValidUtil.allCheckValidate(hiveDataDownloadDTO, HiveDataDownloadDTO.hiveData.class);
+        if(!paramResult.isSuccess()){
+            return paramResult;
+        }
         DownloadReportDTO downloadReportDTO = EntityUtil.changeEntityByJSON(DownloadReportDTO.class, hiveDataDownloadDTO);
         downloadReportDTO.setDataCount(0);
         String sql = "";
@@ -251,38 +257,4 @@ public class HiveDataDownloadApiServiceImpl implements HiveDataDownloadApiServic
         return sql.toString();
     }
 
-
-    public static void main(String[] args){
-        HiveDataDownloadDTO dataDownloadDTO = new HiveDataDownloadDTO();
-        dataDownloadDTO.setEnterpriseId(1166);
-        dataDownloadDTO.setApplyUserId(13805);
-        dataDownloadDTO.setDataContent("用户-用户列表");
-        dataDownloadDTO.setDataType(DownloadReportDataTypeEnum.DESENSITIZATION_DATA.getCode());
-        dataDownloadDTO.setDataUrl("https://four.gicdev.com/member-tag/member-tag/tag-val-edit?id=264137629747888139&name=111111");
-        //dataDownloadDTO.setDesenField();
-        dataDownloadDTO.setExcelExtension(ExcelExtensionEnum.CSV.getCode());
-        dataDownloadDTO.setFileName("boomhivetest");
-        //dataDownloadDTO.setSql("SELECT order_id AS `订单号` FROM extract_order_information;");
-        dataDownloadDTO.setTableName("extract_order_information");
-        List<HiveQueryCondition> list = new ArrayList<>();
-        HiveQueryCondition queryCondition = new HiveQueryCondition();
-        queryCondition.setFieldName("order_id");
-        queryCondition.setFieldMark("订单号");
-        list.add(queryCondition);
-        HiveQueryCondition queryCondition1 = new HiveQueryCondition();
-        queryCondition1.setFieldName("enterprise_id");
-        queryCondition1.setFieldMark("企业id");
-        queryCondition1.setFieldFilterOptEnum(FieldFilterOptEnum.EQ);
-        queryCondition1.setFieldTypeEnum(FieldTypeEnum.STRING);
-        queryCondition1.setFilterValue(Arrays.asList("ff8080816a36326c016a53380d8b5f52"));
-        list.add(queryCondition1);
-        dataDownloadDTO.setQueryConditionList(list);
-        try{
-            String sql = new HiveDataDownloadApiServiceImpl().getSql(dataDownloadDTO);
-            System.out.println("sql = " + sql);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
-    }
 }