diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/DataRoleController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/DataRoleController.java
deleted file mode 100644
index 1c35390..0000000
--- a/etl-cleaning/src/main/java/com/etl/cleaning/controller/DataRoleController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.etl.cleaning.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 规则表 前端控制器
- *
- *
- * @author test
- * @since 2024-06-30
- */
-@RestController
-@RequestMapping("/data-role")
-public class DataRoleController {
-
-}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/DataTaskController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/DataTaskController.java
deleted file mode 100644
index e775a2c..0000000
--- a/etl-cleaning/src/main/java/com/etl/cleaning/controller/DataTaskController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.etl.cleaning.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 任务表 前端控制器
- *
- *
- * @author test
- * @since 2024-06-30
- */
-@RestController
-@RequestMapping("/data-task")
-public class DataTaskController {
-
-}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleController.java
new file mode 100644
index 0000000..48f78fc
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleController.java
@@ -0,0 +1,39 @@
+package com.etl.cleaning.controller;
+
+
+import com.etl.cleaning.domian.pojo.DataRole;
+import com.etl.cleaning.service.RoleService;
+import com.etl.common.result.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 规则表 前端控制器
+ *
+ *
+ * @author test
+ * @since 2024-06-30
+ */
+@RestController
+@RequestMapping("/data-role")
+public class RoleController {
+ private final RoleService roleService;
+
+ public RoleController(RoleService roleService) {
+ this.roleService = roleService;
+ }
+
+ /**
+ * 添加规则
+ * @param dataRole
+ * @return
+ */
+ @PostMapping("/insertRole")
+ public Result insertRole(@RequestBody DataRole dataRole){
+ boolean save = roleService.save(dataRole);
+ return Result.success(save);
+ }
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java
index 6e5fbf1..d2ad1d8 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/RoleTypeController.java
@@ -1,10 +1,16 @@
package com.etl.cleaning.controller;
+import com.etl.cleaning.domian.pojo.RoleType;
+import com.etl.cleaning.service.RoleTypeService;
+import com.etl.common.result.Result;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
*
* 规则类型表 前端控制器
@@ -16,5 +22,19 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/role-type")
public class RoleTypeController {
+ private final RoleTypeService roleTypeService;
+ public RoleTypeController(RoleTypeService roleTypeService) {
+ this.roleTypeService = roleTypeService;
+ }
+
+ /**
+ * 规则类型列表
+ * @return
+ */
+ @GetMapping("/showTypeList")
+ public Result showTypeList(){
+ List list = roleTypeService.list();
+ return Result.success(list);
+ }
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/controller/TaskController.java b/etl-cleaning/src/main/java/com/etl/cleaning/controller/TaskController.java
new file mode 100644
index 0000000..6e5b116
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/controller/TaskController.java
@@ -0,0 +1,97 @@
+package com.etl.cleaning.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.etl.cleaning.domian.pojo.DataTask;
+import com.etl.cleaning.domian.request.InsertTaskRequest;
+import com.etl.cleaning.domian.request.TaskRequest;
+import com.etl.cleaning.mapper.TaskMapper;
+import com.etl.cleaning.service.TaskService;
+import com.etl.common.result.Result;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ *
+ * 任务表 前端控制器
+ *
+ *
+ * @author test
+ * @since 2024-06-30
+ */
+@Log4j2
+@RestController
+@RequestMapping("/data-task")
+public class TaskController {
+ private final TaskMapper taskMapper;
+ private final TaskService taskService;
+
+ public TaskController(TaskMapper taskMapper, TaskService taskService) {
+ this.taskMapper = taskMapper;
+ this.taskService = taskService;
+ }
+
+ private final ReentrantLock lock = new ReentrantLock();
+
+ /**
+ * 展示任务列表
+ * @param taskRequest
+ * @return
+ */
+ @PostMapping("/showListPage")
+ public Result showListPage(@RequestBody TaskRequest taskRequest){
+ LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>();
+ if(taskRequest.getId() != null){
+ wrapper.eq(DataTask::getTaskId, taskRequest.getId());
+ }
+ if(StringUtils.isNotBlank(taskRequest.getUrgentLevel())){
+ wrapper.like(DataTask::getWeight, taskRequest.getUrgentLevel());
+ }
+ Page dataTaskPage = new Page<>(taskRequest.getPageNum(), taskRequest.getPageSize());
+ List records = dataTaskPage.getRecords();
+ long total = dataTaskPage.getTotal();
+ HashMap hashMap = new HashMap<>();
+ hashMap.put("total",total);
+ hashMap.put("data",records);
+ return Result.success(hashMap);
+ }
+
+ /**
+ * 添加任务管理
+ * @param insertTaskRequest
+ * @return
+ */
+ @PostMapping("/insertTask")
+ public Result insertTask(@RequestBody @Validated InsertTaskRequest insertTaskRequest){
+ //获取锁
+ lock.lock();
+ try {
+ DataTask task = taskService.getOne(new LambdaQueryWrapper().eq(DataTask::getTaskName, insertTaskRequest.getTaskName()));
+ if(task != null){
+ throw new RuntimeException("任务名称已存在");
+ }
+ DataTask dataTask = DataTask.builder().taskId(insertTaskRequest.getTaskCode()).taskName(insertTaskRequest.getTaskName())
+ .statue(1L).remark(insertTaskRequest.getRemark()).updateTime(new Date()).build();
+ boolean save = taskService.save(dataTask);
+ return Result.success(save);
+ }catch (Exception e){
+ log.info(e.getMessage());
+ return Result.error();
+ }finally {
+ lock.unlock();
+ }
+ }
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java
index 219518a..2ab1a0d 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/pojo/DataTask.java
@@ -32,11 +32,16 @@ public class DataTask {
/**
* 权重
*/
- private Double weight;
+ private String weight;
/**
* 状态
*/
private Long statue;
+ /**
+ * 备注
+ */
+ private String remark;
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java
new file mode 100644
index 0000000..613bd88
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertTaskRequest.java
@@ -0,0 +1,40 @@
+package com.etl.cleaning.domian.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 添加任务
+ */
+@Data
+public class InsertTaskRequest {
+ /**
+ * 任务名称
+ */
+
+ @NotBlank(message = "任务名称不能为空")
+ private String taskName;
+
+ /**
+ * 任务编号
+ */
+
+ @NotNull(message = "任务编号不能为空")
+ private Long taskCode;
+
+ /**
+ * 任务权重
+ */
+
+ @NotBlank(message = "任务权重不能为空")
+ private String taskWeight;
+
+ /**
+ * 备注
+ */
+
+ @NotBlank(message = "任务备注不能为空")
+ private String remark;
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java
new file mode 100644
index 0000000..e49ea98
--- /dev/null
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/TaskRequest.java
@@ -0,0 +1,24 @@
+package com.etl.cleaning.domian.request;
+
+import lombok.Data;
+
+/**
+ * 任务管理列表查询参数
+ */
+@Data
+public class TaskRequest {
+ /**
+ * 配置ID说明
+ */
+ private Long id;
+ /**
+ * 紧急程度
+ */
+ private String urgentLevel;
+ /**
+ * 状态
+ */
+ private Integer statue;
+ private Integer pageNum;
+ private Integer pageSize;
+}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/mapper/DataRoleMapper.java b/etl-cleaning/src/main/java/com/etl/cleaning/mapper/RoleMapper.java
similarity index 78%
rename from etl-cleaning/src/main/java/com/etl/cleaning/mapper/DataRoleMapper.java
rename to etl-cleaning/src/main/java/com/etl/cleaning/mapper/RoleMapper.java
index 9c2b872..effb5de 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/mapper/DataRoleMapper.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/mapper/RoleMapper.java
@@ -13,6 +13,6 @@ import com.etl.cleaning.domian.pojo.DataRole;
* @author test
* @since 2024-06-30
*/
-public interface DataRoleMapper extends BaseMapper {
+public interface RoleMapper extends BaseMapper {
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/mapper/DataTaskMapper.java b/etl-cleaning/src/main/java/com/etl/cleaning/mapper/TaskMapper.java
similarity index 78%
rename from etl-cleaning/src/main/java/com/etl/cleaning/mapper/DataTaskMapper.java
rename to etl-cleaning/src/main/java/com/etl/cleaning/mapper/TaskMapper.java
index c3aa303..4caabcc 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/mapper/DataTaskMapper.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/mapper/TaskMapper.java
@@ -12,6 +12,6 @@ import com.etl.cleaning.domian.pojo.DataTask;
* @author test
* @since 2024-06-30
*/
-public interface DataTaskMapper extends BaseMapper {
+public interface TaskMapper extends BaseMapper {
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/service/DataRoleService.java b/etl-cleaning/src/main/java/com/etl/cleaning/service/RoleService.java
similarity index 78%
rename from etl-cleaning/src/main/java/com/etl/cleaning/service/DataRoleService.java
rename to etl-cleaning/src/main/java/com/etl/cleaning/service/RoleService.java
index 3bfa6ee..b171ff1 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/service/DataRoleService.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/service/RoleService.java
@@ -12,6 +12,6 @@ import com.etl.cleaning.domian.pojo.DataRole;
* @author test
* @since 2024-06-30
*/
-public interface DataRoleService extends IService {
+public interface RoleService extends IService {
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/service/DataTaskService.java b/etl-cleaning/src/main/java/com/etl/cleaning/service/TaskService.java
similarity index 78%
rename from etl-cleaning/src/main/java/com/etl/cleaning/service/DataTaskService.java
rename to etl-cleaning/src/main/java/com/etl/cleaning/service/TaskService.java
index 98abe19..4849333 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/service/DataTaskService.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/service/TaskService.java
@@ -12,6 +12,6 @@ import com.etl.cleaning.domian.pojo.DataTask;
* @author test
* @since 2024-06-30
*/
-public interface DataTaskService extends IService {
+public interface TaskService extends IService {
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
index 8f5d44f..2bac5f4 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
@@ -60,12 +60,14 @@ public class PlaceServiceImpl extends ServiceImpl implem
List dataPlaceList = records.stream().map(item -> {
Long typeId = item.getTypeId();
DateType dateType = typeMap.get(typeId);
- if (dateType == null) {
- PlaceResponse.builder().typeName(EnumMsg.NO_TYPE.getMessage());
- }else{
- PlaceResponse.builder().typeName(dateType.getName());
- }
- return PlaceResponse.builder().name(item.getName()).bank(item.getBank()).statue(item.getStatue()).updateTime(item.getUpdateTime()).build();
+ String typeName = dateType == null ? EnumMsg.NO_TYPE.getMessage() : dateType.getName();
+ return PlaceResponse.builder()
+ .typeName(typeName)
+ .name(item.getName())
+ .bank(item.getBank())
+ .statue(item.getStatue()) // 注意：这里可能是status的拼写错误，请检查
+ .updateTime(item.getUpdateTime())
+ .build();
}).collect(Collectors.toList());
//查询总条数
long total = dataPlacePage.getTotal();
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/DataRoleServiceImpl.java b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/RoleServiceImpl.java
similarity index 60%
rename from etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/DataRoleServiceImpl.java
rename to etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/RoleServiceImpl.java
index b3540a1..cad24b5 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/DataRoleServiceImpl.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/RoleServiceImpl.java
@@ -3,8 +3,8 @@ package com.etl.cleaning.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.etl.cleaning.domian.pojo.DataRole;
-import com.etl.cleaning.mapper.DataRoleMapper;
-import com.etl.cleaning.service.DataRoleService;
+import com.etl.cleaning.mapper.RoleMapper;
+import com.etl.cleaning.service.RoleService;
import org.springframework.stereotype.Service;
/**
@@ -16,6 +16,6 @@ import org.springframework.stereotype.Service;
* @since 2024-06-30
*/
@Service
-public class DataRoleServiceImpl extends ServiceImpl implements DataRoleService {
+public class RoleServiceImpl extends ServiceImpl implements RoleService {
}
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/DataTaskServiceImpl.java b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/TaskServiceImpl.java
similarity index 60%
rename from etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/DataTaskServiceImpl.java
rename to etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/TaskServiceImpl.java
index ef49aad..6ef0057 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/DataTaskServiceImpl.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/TaskServiceImpl.java
@@ -3,8 +3,8 @@ package com.etl.cleaning.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.etl.cleaning.domian.pojo.DataTask;
-import com.etl.cleaning.mapper.DataTaskMapper;
-import com.etl.cleaning.service.DataTaskService;
+import com.etl.cleaning.mapper.TaskMapper;
+import com.etl.cleaning.service.TaskService;
import org.springframework.stereotype.Service;
/**
@@ -16,6 +16,6 @@ import org.springframework.stereotype.Service;
* @since 2024-06-30
*/
@Service
-public class DataTaskServiceImpl extends ServiceImpl implements DataTaskService {
+public class TaskServiceImpl extends ServiceImpl implements TaskService {
}