Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_d...

liujie

4 天以前 31bf3fe30c14ca5d27c470499877a2875cbfc613

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching

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

@@ -63,7 +63,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('system:missionAssignRule:add')")
    @Log(title = "任务指派规则信息-新增任务指派规则", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加任务指派规则",response = TMissionAssignRuleDTO.class)
    @ApiOperation(value = "添加任务指派规则",notes = "",response = TMissionAssignRuleDTO.class)
    @PostMapping(value = "/api/t-mission-assign-rule/add")
    public R<Boolean> add(@RequestBody String param) {
        TMissionAssignRuleDTO dto = JSON.parseObject(param,TMissionAssignRuleDTO.class);

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

@@ -7,6 +7,7 @@
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.TAppUser;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TMissionReassignService;
@@ -17,6 +18,9 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -99,5 +103,15 @@
        return R.ok(equipment);
    }

    /**
     * 通过任务计算规则分数获取队伍
     */
    //@PreAuthorize("@ss.hasPermi('system:mission:detail')")
    @ApiOperation(value = "通过任务计算规则分数获取队伍")
    @PostMapping(value = "/api/t-mission/getTeamScores")
    public R<Map<String, List<TAppUser>>> getTeamScores(@RequestParam(value = "missionId") String missionId) {
        return R.ok();
    }

}


 ruoyi-system/src/main/java/com/ruoyi/system/dto/TMissionAssignRuleDTO.java

@@ -12,7 +12,11 @@
@ApiModel(value="TMissionAssignRuleDTO对象", description="任务指派规则DTO")
public class TMissionAssignRuleDTO extends TMissionAssignRule {

    @ApiModelProperty(value = "规则详情集合")
    @ApiModelProperty(value = "规则详情集合  json传参  装备指标：[{\"equipmentId\":\"123456\",\"value\":2,\"score\":5}]" +
            "人员指标：[{\"value\":2,\"score\":5}]" +
            "人员专业指标：[{\"majorId\":\"123456\",\"value\":2,\"score\":5}]" +
            "训练指标：[{\"value\":2,\"score\":5}]" +
            "距离指标：[{\"value1\":0,\"value2\":1.5,\"score\":5},{\"value1\":1.5,\"value2\":5,\"score\":5},{\"value1\":5,\"value2\":0,\"score\":5}]")
    private List<TMissionAssignRuleIndicator> missionAssignRuleIndicators;

}

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

@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -75,6 +76,10 @@
    @TableField("level")
    private Integer level;

    @ApiModelProperty(value = "执行任务状态 1=空闲 2=任务中")
    @TableField("mission_state")
    private Integer missionState;

    @ApiModelProperty(value = "经度")
    @TableField(exist = false)
    private String lon;
@@ -82,8 +87,16 @@
    @TableField(exist = false)
    private String lat;


    @TableField(exist = false)
    @ApiModelProperty(value = "用户专业")
    private List<TUserMajor> userMajors;

    @ApiModelProperty(value = "距离")
    @TableField(exist = false)
    private String userDistance;

    @ApiModelProperty(value = "评分")
    @TableField(exist = false)
    private BigDecimal userScore;

}

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

@@ -14,6 +14,7 @@
        <result column="status" property="status" />
        <result column="practical_train_count" property="practicalTrainCount" />
        <result column="other_count" property="otherCount" />
        <result column="mission_state" property="missionState" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -23,12 +24,13 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, nick_name, phone, account, password, team_name, team_id, status, practical_train_count, other_count, create_time, update_time, create_by, update_by, disabled
        id, nick_name, phone, account, password, team_name, team_id, status, practical_train_count, other_count,
          mission_state,create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TAppUserPageVo">
        SELECT
        t1.id, t1.nick_name, t1.phone, t1.account, t1.password, t1.team_name, t1.team_id, t1.status,
        t1.practical_train_count,
        t1.practical_train_count,t1.mission_state,
        t1.other_count, t1.create_time, t1.update_time, t1.create_by, t1.update_by, t1.disabled,t2.team_name
        FROM
        t_app_user t1 left join t_division_team t2 on t1.team_id = t2.id
@@ -49,7 +51,7 @@
    <select id="pageAuditList" resultType="com.ruoyi.system.vo.TAppUserPageVo">
        SELECT
        t1.id, t1.nick_name, t1.phone, t1.account, t1.password, t1.team_name, t1.team_id, t1.status,
        t1.practical_train_count,
        t1.practical_train_count,t1.mission_state,
        t1.other_count, t1.create_time, t1.update_time, t1.create_by, t1.update_by, t1.disabled,t2.team_name
        FROM
        t_app_user t1 left join t_division_team t2 on t1.team_id = t2.id