任务管理

xuhy

2025-09-29 6ccace7e64bed880f9b8ecbc581e80c2616a6aa2

任务管理

 generator/src/test/java/com/laboratory/CodeGeneratorTests.java

@@ -144,7 +144,7 @@
//         strategy.setTablePrefix(pc.getModuleName() + "");
//        strategy.setLikeTable(new LikeTable("room"));
        //strategy.setLikeTable(new LikeTable("member"));
        strategy.setLikeTable(new LikeTable("t_user_major"));// 生成表名
        strategy.setLikeTable(new LikeTable("t_mission_reassign"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名
//        strategy.setNotLikeTable(new LikeTable("hotel_info"));// 不生成表名

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java

@@ -1,8 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TMissionReassignService;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.vo.TMissionVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -12,9 +25,56 @@
 * @author xiaochen
 * @since 2025-09-28
 */
@Api(tags = "任务管理")
@RestController
@RequestMapping("/t-mission")
@RequestMapping("")
public class TMissionController {


    private final TMissionService missionService;
    private final TMissionReassignService missionReassignService;
    private final TokenService tokenService;
    @Autowired
    public TMissionController(TMissionService missionService, TMissionReassignService missionReassignService, TokenService tokenService) {
        this.missionService = missionService;
        this.missionReassignService = missionReassignService;
        this.tokenService = tokenService;
    }

    /**
     * 任务管理列表
     */
    //@PreAuthorize("@ss.hasPermi('system:mission:list')")
    @ApiOperation(value = "任务管理分页列表", response = TMissionQuery.class)
    @PostMapping(value = "/api/t-mission/pageList")
    public R<PageInfo<TMissionVO>> pageList(@RequestBody String param) {
        TMissionQuery query = JSON.parseObject(param, TMissionQuery.class);
        return R.ok(missionService.pageList(query));
    }

    /**
     * 添加任务管理管理
     */
    //@PreAuthorize("@ss.hasPermi('system:mission:add')")
    @Log(title = "任务管理信息-新增任务管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加任务管理",response = TMission.class)
    @PostMapping(value = "/api/t-mission/add")
    public R<Boolean> add(@RequestBody String param) {
        TMission dto = JSON.parseObject(param,TMission.class);
        missionService.save(dto);
        return R.ok();
    }

    /**
     * 查看任务管理详情
     */
    //@PreAuthorize("@ss.hasPermi('system:mission:detail')")
    @ApiOperation(value = "查看任务管理详情")
    @GetMapping(value = "/open/t-mission/getDetailById")
    public R<TMission> getDetailById(@RequestParam String id) {
        TMission equipment = missionService.getById(id);
        return R.ok(equipment);
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionReassignController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 任务支援、改派 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-29
 */
@RestController
@RequestMapping("/t-mission-reassign")
public class TMissionReassignController {

}


 ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/ProjectApprovalReportStatusEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/ProjectStageEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/QAProduceReportStatusEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/QATestItemReportStatusEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/QATestItemStatusEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/QaReportFileEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/QaReportTypeEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/StateProcessActionEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/StudyReportTypeEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/SubmitStatusEnum.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskEventType.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/enums/UpdateTypeEnum.java

File was deleted

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TMissionReassignMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TMissionReassign;

/**
 * <p>
 * 任务支援、改派 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-29
 */
public interface TMissionReassignMapper extends BaseMapper<TMissionReassign> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -107,5 +108,10 @@
    @TableField("attempt_score")
    private Double attemptScore;

    @ApiModelProperty(value = "完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("finish_time")
    private LocalDateTime finishTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionReassign.java

New file
@@ -0,0 +1,63 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 任务支援、改派
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-29
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_mission_reassign")
@ApiModel(value="TMissionReassign对象", description="任务支援、改派")
public class TMissionReassign implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "任务id")
    @TableField("mission_id")
    private String missionId;

    @ApiModelProperty(value = "申请支援人数")
    @TableField("support_person_count")
    private Integer supportPersonCount;

    @ApiModelProperty(value = "改派、支援的备注")
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "类型 1=改派 2=支援")
    @TableField("reassign_type")
    private Integer reassignType;

    @ApiModelProperty(value = "提交人id")
    @TableField("commit_user_id")
    private String commitUserId;

    @ApiModelProperty(value = "提交人姓名")
    @TableField("commit_user_name")
    private String commitUserName;

    @ApiModelProperty(value = "提交时间")
    @TableField("commit_time")
    private LocalDateTime commitTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -27,7 +28,7 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "接单用户")
@@ -41,5 +42,8 @@
    @TableField("mission_id")
    private String missionId;

    @ApiModelProperty(value = "用户类型 1=负责人队伍 2=支援队伍")
    @TableField("user_type")
    private Integer userType;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,7 +27,7 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "用户id")

 ruoyi-system/src/main/java/com/ruoyi/system/query/TMissionQuery.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "任务管理查询参数query")
public class TMissionQuery extends BasePage {
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionReassignService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TMissionReassign;

/**
 * <p>
 * 任务支援、改派 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-29
 */
public interface TMissionReassignService extends IService<TMissionReassign> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java

@@ -1,7 +1,10 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.vo.TMissionVO;

/**
 * <p>
@@ -13,4 +16,10 @@
 */
public interface TMissionService extends IService<TMission> {

    /**
     * 任务管理分页列表
     * @param query
     * @return
     */
    PageInfo<TMissionVO> pageList(TMissionQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionReassignServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TMissionReassignMapper;
import com.ruoyi.system.model.TMissionReassign;
import com.ruoyi.system.service.TMissionReassignService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 任务支援、改派 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-29
 */
@Service
public class TMissionReassignServiceImpl extends ServiceImpl<TMissionReassignMapper, TMissionReassign> implements TMissionReassignService {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java

@@ -1,9 +1,12 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TMissionMapper;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.vo.TMissionVO;
import org.springframework.stereotype.Service;

/**
@@ -17,4 +20,8 @@
@Service
public class TMissionServiceImpl extends ServiceImpl<TMissionMapper, TMission> implements TMissionService {

    @Override
    public PageInfo<TMissionVO> pageList(TMissionQuery query) {
        return null;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TMissionVO.java

New file
@@ -0,0 +1,12 @@
package com.ruoyi.system.vo;


import com.ruoyi.system.model.TMission;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "任务管理对象TMissionVO")
public class TMissionVO extends TMission {

}

 ruoyi-system/src/main/resources/mapper/system/TMissionMapper.xml

@@ -24,6 +24,7 @@
        <result column="person_count_score" property="personCountScore" />
        <result column="equipment_score" property="equipmentScore" />
        <result column="attempt_score" property="attemptScore" />
        <result column="finish_time" property="finishTime" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -33,7 +34,10 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, urgency_level, address, mission_lon, mission_lat, mission_content, mission_audio, mission_pictures, mission_electronic, status, mission_type_id, commit_user_name, commit_time, commit_user_id, commit_type, address_score, time_score, person_count_score, equipment_score, attempt_score, create_time, update_time, create_by, update_by, disabled
        id, urgency_level, address, mission_lon, mission_lat, mission_content, mission_audio, mission_pictures,
          mission_electronic, status, mission_type_id, commit_user_name, commit_time, commit_user_id, commit_type,
          address_score, time_score, person_count_score, equipment_score, attempt_score,finish_time, create_time,
          update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TMissionReassignMapper.xml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TMissionReassignMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TMissionReassign">
        <id column="id" property="id" />
        <result column="mission_id" property="missionId" />
        <result column="support_person_count" property="supportPersonCount" />
        <result column="remark" property="remark" />
        <result column="reassign_type" property="reassignType" />
        <result column="commit_user_id" property="commitUserId" />
        <result column="commit_user_name" property="commitUserName" />
        <result column="commit_time" property="commitTime" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, mission_id, support_person_count, remark, reassign_type, commit_user_id, commit_user_name, commit_time
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TMissionUserMapper.xml

@@ -8,11 +8,12 @@
        <result column="app_user_id" property="appUserId" />
        <result column="create_time" property="createTime" />
        <result column="mission_id" property="missionId" />
        <result column="user_type" property="userType" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, create_time, mission_id
        id, app_user_id, create_time, mission_id,user_type
    </sql>

</mapper>