diff --git a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java index 049d408..d848e4c 100644 --- a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java +++ b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java @@ -62,7 +62,7 @@ public class TestReportController { if (!StpUtil.hasRole("admin")) { testReport.setCreateBy(LoginHelper.getUsername()); } - testReport.setTaskType("data_atlas"); +// testReport.setTaskType("data_atlas"); QueryWrapper query = Wrappers.query(testReport); // query.isNotNull("data_atlas"); return getCommonPage(pageQuery,query); @@ -265,7 +265,7 @@ public class TestReportController { @PostMapping(value = "/uploadTestData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R uploadTestData( @RequestPart("file") MultipartFile file, @RequestPart("taskName") String taskName,@RequestPart("companyName") String companyName, - @RequestPart("dataAtlas") String dataAtlas,String taskDesc) { + @RequestPart("dataAtlas") String dataAtlas,String taskDesc,@RequestPart("taskType") String taskType) { if (StrUtil.isEmpty(taskName)) { return R.fail("测试任务名称不能为空!"); @@ -285,7 +285,7 @@ public class TestReportController { testReport.setCompanyName(companyName); testReport.setDataAtlas(dataAtlas); testReport.setTaskDesc(taskDesc); - testReport.setTaskType("data_atlas"); + testReport.setTaskType(taskType); testReport.setCreateTime(new Date()); testReportService.save(testReport); return R.ok("操作成功!"); diff --git a/tp-system/src/main/java/com/inscloudtech/system/domain/IpFilter.java b/tp-system/src/main/java/com/inscloudtech/system/domain/IpFilter.java index a58fa0c..a919055 100644 --- a/tp-system/src/main/java/com/inscloudtech/system/domain/IpFilter.java +++ b/tp-system/src/main/java/com/inscloudtech/system/domain/IpFilter.java @@ -5,6 +5,8 @@ import com.inscloudtech.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * IP黑名单管理对象 ip_filter @@ -13,12 +15,33 @@ import lombok.EqualsAndHashCode; * @date 2024-09-02 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("ip_filter") -public class IpFilter extends BaseEntity { +public class IpFilter { private static final long serialVersionUID=1L; + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + /** * 主键 */