任务管理基本操作

etl-cleaning/src/main/java/com/etl/cleaning/controller/DataRoleController.java

@@ -1,20 +0,0 @@
-package com.etl.cleaning.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 规则表 前端控制器
- * </p>
- *
- * @author test
- * @since 2024-06-30
- */
-@RestController
-@RequestMapping("/data-role")
-public class DataRoleController {
-
-}

etl-cleaning/src/main/java/com/etl/cleaning/controller/DataTaskController.java

@@ -1,20 +0,0 @@
-package com.etl.cleaning.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 任务表 前端控制器
- * </p>
- *
- * @author test
- * @since 2024-06-30
- */
-@RestController
-@RequestMapping("/data-task")
-public class DataTaskController {
-
-}

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;
+
+/**
+ * <p>
+ * 规则表 前端控制器
+ * </p>
+ *
+ * @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);
+    }
+}

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;
+
 /**
  * <p>
  * 规则类型表 前端控制器
@@ -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<RoleType> list = roleTypeService.list();
+        return Result.success(list);
+    }
 }

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;
+
+/**
+ * <p>
+ * 任务表 前端控制器
+ * </p>
+ *
+ * @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<DataTask> 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<DataTask> dataTaskPage = new Page<>(taskRequest.getPageNum(), taskRequest.getPageSize());
+        List<DataTask> records = dataTaskPage.getRecords();
+        long total = dataTaskPage.getTotal();
+        HashMap<String, Object> 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<DataTask>().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();
+        }
+    }
+}

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;
+
 
 
 

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;
+}

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;
+}

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<DataRole> {
+public interface RoleMapper extends BaseMapper<DataRole> {
 
 }

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<DataTask> {
+public interface TaskMapper extends BaseMapper<DataTask> {
 
 }

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<DataRole> {
+public interface RoleService extends IService<DataRole> {
 
 }

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<DataTask> {
+public interface TaskService extends IService<DataTask> {
 
 }

etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java

@@ -60,12 +60,14 @@ public class PlaceServiceImpl extends ServiceImpl<PlaceMapper, DataPlace> implem
         List<PlaceResponse> dataPlaceList = records.stream().map(item -> {
             Long typeId = item.getTypeId();
             DateType dateType = typeMap.get(typeId);
-            if (dateType == null) {
+            String typeName = dateType == null ? EnumMsg.NO_TYPE.getMessage() : dateType.getName();
-               PlaceResponse.builder().typeName(EnumMsg.NO_TYPE.getMessage());
+            return PlaceResponse.builder()
-            }else{
+                    .typeName(typeName)
-               PlaceResponse.builder().typeName(dateType.getName());
+                    .name(item.getName())
-            }
+                    .bank(item.getBank())
-            return PlaceResponse.builder().name(item.getName()).bank(item.getBank()).statue(item.getStatue()).updateTime(item.getUpdateTime()).build();
+                    .statue(item.getStatue()) // 注意：这里可能是status的拼写错误，请检查
+                    .updateTime(item.getUpdateTime())
+                    .build();
         }).collect(Collectors.toList());
         //查询总条数
         long total = dataPlacePage.getTotal();

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.mapper.RoleMapper;
-import com.etl.cleaning.service.DataRoleService;
+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<DataRoleMapper, DataRole> implements DataRoleService {
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, DataRole> implements RoleService {
 
 }

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.mapper.TaskMapper;
-import com.etl.cleaning.service.DataTaskService;
+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<DataTaskMapper, DataTask> implements DataTaskService {
+public class TaskServiceImpl extends ServiceImpl<TaskMapper, DataTask> implements TaskService {
 
 }