打包测试

dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCollectMapper.java

+package com.zq.dataoperation.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.dataoperation.entity.DataCollectSetting;
+
+
+public interface DataCollectMapper extends BaseMapper<DataCollectSetting> {
+}

dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCollectTaskLogMapper.java

+package com.zq.dataoperation.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.dataoperation.entity.DataCollectTaskLog;
+
+public interface DataCollectTaskLogMapper extends BaseMapper<DataCollectTaskLog> {
+}

dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCollectSetting.java

+package com.zq.dataoperation.entity;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "data_collect_setting")
+public class DataCollectSetting {
+
+    /**
+     * 数据类型
+     * 1.数据库 2.文件 3.接口 4网站
+     */
+    private Integer dataType;
+
+    /**
+     * 汇聚类型
+     * 1.一次性导入 2.增量导入
+     */
+    private Integer collectType;
+
+    /**
+     * 是否手工导入
+     * 0否 1是
+     */
+    private Boolean isManually;
+
+    /**
+     * 汇聚到的数据库名
+     * 如果是非结构化文件，可以不存入数据表
+     */
+    private Integer toDbId;
+
+    /**
+     * 汇聚到的数据表名
+     * 如果是非结构化文件，可以不存入数据表
+     */
+    private String toTable;
+
+    /**
+     * 表不存在时创建表（0否 1是）
+     */
+    private Integer createTable = 0;
+
+    /**
+     * 汇聚任务的名称
+     */
+    private String taskName;
+
+    /**
+     * 使用序列
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 执行计划的corn表达式
+     * 写执行的corn表达式
+     */
+    private String cron;
+
+    /**
+     * 是否运行的开关
+     * 0否 1是
+     */
+    private Boolean runFlag;
+
+    /**
+     * 模型创建用户
+     *
+     */
+    private Long userId;
+
+    /**
+     * 模型创建部门
+     *
+     */
+    private Long deptId;
+
+    /**
+     *  createTime
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     *  updateTime
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}

dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCollectTaskLog.java

+package com.zq.dataoperation.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "data_collect_task_log")
+public class DataCollectTaskLog {
+
+    /**
+     * 汇聚设置id
+     */
+    private Integer dataCollectSettingId;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 花费多少秒
+     */
+    private Integer duration;
+
+    /**
+     * 状态
+     * 1运行中 2正常结束 3异常终止
+     */
+    private Integer status;
+
+    /**
+     * 错误信息
+     * 异常终止时记录异常信息
+     */
+    private String error;
+
+    /**
+     * 使用序列
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * createTime
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * updateTime
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    public DataCollectTaskLog(Integer dataCollectSettingId, Date startTime, Date endTime, Integer duration, Integer status, String error) {
+        this.dataCollectSettingId = dataCollectSettingId;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.duration = duration;
+        this.status = status;
+        this.error = error;
+    }
+}
+

dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanRecordService.java

@@ -9,13 +9,13 @@ import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.common.vo.ResultVo;
-import com.zq.datacollect.entity.DataCollectSetting;
-import com.zq.datacollect.entity.DataCollectTaskLog;
-import com.zq.datacollect.mapper.DataCollectMapper;
-import com.zq.datacollect.mapper.DataCollectTaskLogMapper;
 import com.zq.dataoperation.dao.DataCleanRecordDao;
 import com.zq.dataoperation.dao.DataCleanRecordDao;
+import com.zq.dataoperation.dao.DataCollectMapper;
+import com.zq.dataoperation.dao.DataCollectTaskLogMapper;
 import com.zq.dataoperation.dao.QueryDbDao;
 import com.zq.dataoperation.dao.QueryDbDao;
 import com.zq.dataoperation.entity.DataCleanRecord;
 import com.zq.dataoperation.entity.DataCleanRecord;
+import com.zq.dataoperation.entity.DataCollectSetting;
+import com.zq.dataoperation.entity.DataCollectTaskLog;
 import com.zq.dataoperation.entity.QueryDb;
 import com.zq.dataoperation.entity.QueryDb;
 import com.zq.dataoperation.vo.DataCleanRecordReq;
 import com.zq.dataoperation.vo.DataCleanRecordReq;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;

model-server/src/main/java/com.zq.model/service/FfzdService.java

@@ -11,7 +11,6 @@ import com.zq.model.entity.CityManageEnforceLaw;
 import com.zq.model.entity.NonLitigationForceCase;
 import com.zq.model.entity.NonLitigationForceCase;
 import com.zq.model.mapper.CgzfInfoDao;
 import com.zq.model.mapper.CgzfInfoDao;
 import com.zq.model.mapper.FsxzqzzxCaseDao;
 import com.zq.model.mapper.FsxzqzzxCaseDao;
-import com.zq.system.utils.FileUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -125,11 +124,7 @@ public class FfzdService {
             map.put("裁定结果", cases.getRuleResult());
             map.put("裁定结果", cases.getRuleResult());
             list.add(map);
             list.add(map);
         }
         }
-        try {
-            FileUtil.downloadNameExcel(list, response,"怠于申请强制执行线索数据");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        //            FileUtil.downloadNameExcel(list, response,"怠于申请强制执行线索数据");
         return null;
         return null;
     }
     }
 }
 }