diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/ExamineTaskController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/ExamineTaskController.java deleted file mode 100644 index 0c128b3..0000000 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/ExamineTaskController.java +++ /dev/null @@ -1,73 +0,0 @@ -package tech.unissense.pms.web.controller.business.examine.task; - -import tech.unissense.pms.business.examine.task.domain.ExamineTask; -import tech.unissense.pms.business.examine.task.service.ExamineTaskService; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 考核任务表 (ExamineTask)表控制层 - * - * @author makejava - * @since 2025-01-02 10:18:28 - */ -@RestController -@RequestMapping("examineTask") -public class ExamineTaskController { - /** - * 服务对象 - */ - @Resource - private ExamineTaskService examineTaskService; - - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.examineTaskService.queryById(id)); - } - - /** - * 新增数据 - * - * @param examineTask 实体 - * @return 新增结果 - */ - @PostMapping - public ResponseEntity add(ExamineTask examineTask) { - return ResponseEntity.ok(this.examineTaskService.insert(examineTask)); - } - - /** - * 编辑数据 - * - * @param examineTask 实体 - * @return 编辑结果 - */ - @PutMapping - public ResponseEntity edit(ExamineTask examineTask) { - return ResponseEntity.ok(this.examineTaskService.update(examineTask)); - } - - /** - * 删除数据 - * - * @param id 主键 - * @return 删除是否成功 - */ - @DeleteMapping - public ResponseEntity deleteById(Integer id) { - return ResponseEntity.ok(this.examineTaskService.deleteById(id)); - } - -} - diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java new file mode 100644 index 0000000..0288b39 --- /dev/null +++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java @@ -0,0 +1,63 @@ +package tech.unissense.pms.web.controller.business.examine.task; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import tech.unissense.pms.business.examine.task.domain.ExamineTask; +import tech.unissense.pms.business.examine.task.domain.TaskQueryDto; +import tech.unissense.pms.business.examine.task.service.TaskService; +import tech.unissense.pms.business.project.domain.Project; +import tech.unissense.pms.common.core.controller.BaseController; +import tech.unissense.pms.common.core.domain.AjaxResult; +import tech.unissense.pms.common.core.page.TableDataInfo; + +import java.util.List; + +import static tech.unissense.pms.common.utils.PageUtils.startPage; + +@RestController +@RequestMapping("/task") +public class TaskSetUpController extends BaseController { + + @Autowired + private TaskService taskService; + + // 新增任务 + @PostMapping("/add") + public AjaxResult addTask(@RequestBody ExamineTask task) { + return AjaxResult.success(taskService.addTask(task)); + } + + // 分页查询+模糊查询 + @GetMapping("/get") + public TableDataInfo getTasks(@RequestBody TaskQueryDto queryDto) { + startPage(); + List tasks = taskService.getTasks(queryDto); + return getDataTable(tasks); + } + + // 编辑任务 + @PutMapping("/update") + public AjaxResult updateTask( @RequestBody ExamineTask updatedTask) { + Integer id = updatedTask.getId(); + if (id == null) { + return AjaxResult.error("任务 ID 不能为空"); + } + return AjaxResult.success(taskService.updateTask(updatedTask)); + } + + // 删除任务 + @DeleteMapping("/{id}") + public AjaxResult deleteTask(@PathVariable Integer id) { + taskService.deleteTask(id); + return AjaxResult.success(); + } + + //指标配置 + @PostMapping("/target") + public AjaxResult getTarget(@PathVariable Integer id){ + taskService.getTarget(id); + return AjaxResult.success(); + } +} diff --git a/pms-admin/src/main/resources/application.yml b/pms-admin/src/main/resources/application.yml index fb06871..660ffc2 100644 --- a/pms-admin/src/main/resources/application.yml +++ b/pms-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.124.103 + host: 192.168.124.202 # 端口,默认为6379 port: 6379 # 数据库索引 diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java index 0b7f8ee..5adea30 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java @@ -12,7 +12,7 @@ import java.io.Serializable; * @since 2025-01-02 10:18:29 */ @Data -public class ExamineTask implements Serializable { +public class ExamineTask implements Serializable { private static final long serialVersionUID = -72205614757391876L; private Integer id; @@ -20,10 +20,14 @@ public class ExamineTask implements Serializable { * 考核任务名 */ private String taskName; + + private Integer peopleNumber; + + private String peopleNumberDetail; /** * 考核任务状态 0:进行中 2:已过期 */ - private String taskStatus; + private Integer taskStatus; /** * 创建时间 */ @@ -32,8 +36,5 @@ public class ExamineTask implements Serializable { * 截止时间 */ private Date endTime; - - - } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java new file mode 100644 index 0000000..169b852 --- /dev/null +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java @@ -0,0 +1,10 @@ +package tech.unissense.pms.business.examine.task.domain; + +import lombok.Data; + +@Data +public class TaskQueryDto { + private String taskName; + + private Integer taskStatus; +} diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java index 2ba784a..fd1e33d 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java @@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper; import tech.unissense.pms.business.examine.task.domain.ExamineTask; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; +import tech.unissense.pms.business.examine.task.domain.TaskQueryDto; import java.util.List; @@ -16,71 +17,12 @@ import java.util.List; @Mapper public interface ExamineTaskMapper { - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - ExamineTask queryById(Integer id); + void addTask(ExamineTask task); - /** - * 查询指定行数据 - * - * @param examineTask 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(ExamineTask examineTask, @Param("pageable") Pageable pageable); + List getTasks(TaskQueryDto queryDto); - /** - * 统计总行数 - * - * @param examineTask 查询条件 - * @return 总行数 - */ - long count(ExamineTask examineTask); - - /** - * 新增数据 - * - * @param examineTask 实例对象 - * @return 影响行数 - */ - int insert(ExamineTask examineTask); - - /** - * 批量新增数据(MyBatis原生foreach方法) - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据(MyBatis原生foreach方法) - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - - /** - * 修改数据 - * - * @param examineTask 实例对象 - * @return 影响行数 - */ - int update(ExamineTask examineTask); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 影响行数 - */ - int deleteById(Integer id); + void updateTask(ExamineTask updatedTask); + void deleteTask(Integer id); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/ExamineTaskService.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/ExamineTaskService.java deleted file mode 100644 index 24c33d7..0000000 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/ExamineTaskService.java +++ /dev/null @@ -1,48 +0,0 @@ -package tech.unissense.pms.business.examine.task.service; - -import tech.unissense.pms.business.examine.task.domain.ExamineTask; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; - -/** - * 考核任务表 (ExamineTask)表服务接口 - * - * @author makejava - * @since 2025-01-02 10:18:29 - */ -public interface ExamineTaskService { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - ExamineTask queryById(Integer id); - - - /** - * 新增数据 - * - * @param examineTask 实例对象 - * @return 实例对象 - */ - ExamineTask insert(ExamineTask examineTask); - - /** - * 修改数据 - * - * @param examineTask 实例对象 - * @return 实例对象 - */ - ExamineTask update(ExamineTask examineTask); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - boolean deleteById(Integer id); - -} diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java new file mode 100644 index 0000000..eecf9f0 --- /dev/null +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java @@ -0,0 +1,18 @@ +package tech.unissense.pms.business.examine.task.service; + +import tech.unissense.pms.business.examine.task.domain.ExamineTask; +import tech.unissense.pms.business.examine.task.domain.TaskQueryDto; + +import java.util.List; + +public interface TaskService { + ExamineTask addTask(ExamineTask task); + + List getTasks(TaskQueryDto queryDto); + + ExamineTask updateTask(ExamineTask updatedTask); + + void deleteTask(Integer id); + + void getTarget(Integer id); +} diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java deleted file mode 100644 index 41c6974..0000000 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -package tech.unissense.pms.business.examine.task.service.impl; - -import tech.unissense.pms.business.examine.task.domain.ExamineTask; -import tech.unissense.pms.business.examine.task.mapper.ExamineTaskMapper; -import tech.unissense.pms.business.examine.task.service.ExamineTaskService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * 考核任务表 (ExamineTask)表服务实现类 - * - * @author makejava - * @since 2025-01-02 10:18:29 - */ -@Service("examineTaskService") -public class ExamineTaskServiceImpl implements ExamineTaskService { - @Resource - private ExamineTaskMapper examineTaskMapper; - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - @Override - public ExamineTask queryById(Integer id) { - return this.examineTaskMapper.queryById(id); - } - - - - /** - * 新增数据 - * - * @param examineTask 实例对象 - * @return 实例对象 - */ - @Override - public ExamineTask insert(ExamineTask examineTask) { - this.examineTaskMapper.insert(examineTask); - return examineTask; - } - - /** - * 修改数据 - * - * @param examineTask 实例对象 - * @return 实例对象 - */ - @Override - public ExamineTask update(ExamineTask examineTask) { - this.examineTaskMapper.update(examineTask); - return this.queryById(examineTask.getId()); - } - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - @Override - public boolean deleteById(Integer id) { - return this.examineTaskMapper.deleteById(id) > 0; - } -} diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java new file mode 100644 index 0000000..8087d84 --- /dev/null +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java @@ -0,0 +1,47 @@ +package tech.unissense.pms.business.examine.task.service.impl; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import tech.unissense.pms.business.examine.task.domain.ExamineTask; +import tech.unissense.pms.business.examine.task.domain.TaskQueryDto; +import tech.unissense.pms.business.examine.task.mapper.ExamineTaskMapper; +import tech.unissense.pms.business.examine.task.service.TaskService; + +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +public class TaskServiceImpl implements TaskService { + + @Autowired + private ExamineTaskMapper examineTaskDao; + + @Override + public ExamineTask addTask(ExamineTask task) { + examineTaskDao.addTask(task); + return task; + } + + @Override + public List getTasks(TaskQueryDto queryDto) { + return examineTaskDao.getTasks(queryDto); + } + + @Override + public ExamineTask updateTask(ExamineTask updatedTask) { + examineTaskDao.updateTask(updatedTask); + return updatedTask; + } + + @Override + public void deleteTask(Integer id) { + examineTaskDao.deleteTask(id); + } + + @Override + public void getTarget(Integer id) { + + } +} diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml index e9deb53..eb5b0bd 100644 --- a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml @@ -5,122 +5,47 @@ - + + + - - + + + INSERT INTO pms_examine_task (task_name, people_number, people_number_detail, task_status, create_time, end_time) + VALUES (#{taskName}, #{peopleNumber}, #{peopleNumberDetail}, #{taskStatus}, #{createTime}, #{endTime}) + - - + SELECT * FROM pms_examine_task - - and id = #{id} - - and task_name = #{taskName} + AND task_name LIKE CONCAT('%', #{taskName}, '%') - - and task_status = #{taskStatus} - - - and create_time = #{createTime} - - - and end_time = #{endTime} - - - limit #{pageable.offset}, #{pageable.pageSize} - - - - - - - insert into pms_examine_task(task_name, task_status, create_time, end_time) - values (#{taskName}, #{taskStatus}, #{createTime}, #{endTime}) - - - - insert into pms_examine_task(task_name, task_status, create_time, end_time) - values - - (#{entity.taskName}, #{entity.taskStatus}, #{entity.createTime}, #{entity.endTime}) - - - - - insert into pms_examine_task(task_name, task_status, create_time, end_time) - values - - (#{entity.taskName}, #{entity.taskStatus}, #{entity.createTime}, #{entity.endTime}) - - on duplicate key update - task_name = values(task_name), - task_status = values(task_status), - create_time = values(create_time), - end_time = values(end_time) - - - - - update pms_examine_task + + UPDATE pms_examine_task - - task_name = #{taskName}, - - - task_status = #{taskStatus}, - - - create_time = #{createTime}, - - - end_time = #{endTime}, - + task_name = #{taskName}, + people_number = #{peopleNumber}, + people_number_detail = #{peopleNumberDetail}, + task_status = #{taskStatus}, + create_time = #{createTime}, + end_time = #{endTime}, - where id = #{id} + WHERE id = #{id} - - - delete - from pms_examine_task - where id = #{id} + + DELETE FROM pms_examine_task + WHERE id = #{id}