Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 1cebcbd79fd408e17aa59e434b396476e117fc1c

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java

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

@@ -2,32 +2,21 @@


import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditUserDto;
import com.ruoyi.system.dto.TAppUserDTO;
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.dto.UserIdDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TUserMajor;
import com.ruoyi.system.query.TAppUserQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TUserMajorService;
import com.ruoyi.system.vo.TAppUserPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
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.List;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -211,6 +200,18 @@
    }


    /**
     * 详情
     */
    //    @PreAuthorize("@ss.hasPermi('system:user:auditUser')")
    @ApiOperation(value = "人员详情", response = AuditUserDto.class)
    @GetMapping(value = "/api/t-app-user/detailUser")
    public R<TAppUser> detailUser(@RequestBody String param) {
        UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
        TAppUser tAppUser = appUserService.getById(dto.getId());
        return R.ok(tAppUser);
    }


}


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

@@ -1,12 +1,17 @@
package com.ruoyi.web.controller.api;


import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.dto.EquipmentDto;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.IndexDataDetailVo;
import com.ruoyi.system.vo.IndexDataRankVo;
import com.ruoyi.system.vo.IndexDataVo;
import com.tencentcloudapi.iot.v20180123.models.AppUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +25,12 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static java.util.stream.Collectors.groupingBy;

/**
 * <p>
@@ -38,14 +47,26 @@

    private final TMissionService missionService;
    private final TokenService tokenService;
    private final TMissionUserService missionUserService;
    private final TAppUserService appUserService;
    private final TDivisionTeamService divisionTeamService;
    private final TMissionAssignRuleService missionReassignService;
    private final TAppUserEquipmentService appUserEquipmentService;
    private final TEquipmentService equipmentService;
    @Autowired
    public TDataStatisticsController( TMissionService missionService, TokenService tokenService) {
    public TDataStatisticsController(TMissionService missionService, TokenService tokenService, TMissionUserService missionUserService, TAppUserService appUserService, TDivisionTeamService divisionTeamService, TMissionAssignRuleService missionReassignService1, TAppUserEquipmentService appUserEquipmentService, TEquipmentService equipmentService) {
        this.missionService = missionService;
        this.tokenService = tokenService;
        this.missionUserService = missionUserService;
        this.appUserService = appUserService;
        this.divisionTeamService = divisionTeamService;
        this.missionReassignService = missionReassignService1;
        this.appUserEquipmentService = appUserEquipmentService;
        this.equipmentService = equipmentService;
    }

    @ApiOperation(value = "获取数据")
    @GetMapping(value = "/api/t-data-statistics/getData")
    @ApiOperation(value = "获取数据-第一部分")
    @GetMapping(value = "/open/t-data-statistics/getData")
    public R<IndexDataVo> getData() {
        IndexDataVo indexDataVo = new IndexDataVo();
        List<TMission> list = missionService.list();
@@ -87,17 +108,131 @@


        List<TMission> tMissions1 = list.stream().filter(e -> e.getFinishTime() != null).collect(Collectors.toList());
        long count = tMissions1.stream().filter(e -> e.getStatus() == 4).count();
        String finishRate = new BigDecimal(count).divide(new BigDecimal(tMissions1.size()), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString();
        indexDataVo.setFinishRate(finishRate);
        if(!tMissions1.isEmpty()){
            long count = tMissions1.stream().filter(e -> e.getStatus() == 4).count();
            String finishRate = new BigDecimal(count).divide(new BigDecimal(tMissions1.size()), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString();
            indexDataVo.setFinishRate(finishRate);
        }


        double avgFinishTime = tMissions1.stream().mapToDouble(TMission::getSuccessTime).average().orElse(0);
        indexDataVo.setAvgFinishTime(String.valueOf(avgFinishTime));

        // 平了分的
        List<TMission> tMissions2 = list.stream().filter(e -> e.getAddressScore() != null ).collect(Collectors.toList());
        long count1 = tMissions2.stream().filter(e -> e.getTimeScore() + e.getAddressScore() + e.getPersonCountScore() + e.getEquipmentScore() + e.getAttemptScore() > 30).count();
        if(!tMissions2.isEmpty()){
            long count1 = tMissions2.stream().filter(e -> e.getTimeScore() + e.getAddressScore() + e.getPersonCountScore() + e.getEquipmentScore() + e.getAttemptScore() > 30).count();
            String enemyAccuracyRate = new BigDecimal(count1).divide(new BigDecimal(tMissions2.size()), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString();
            indexDataVo.setEnemyAccuracyRate(enemyAccuracyRate);
        }

        List<TMissionUser> list1 = missionUserService.list(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getUserType, 1).isNotNull(TMissionUser::getSuccessTime));
        if(!list1.isEmpty()){
            double setDamageRate = list1.stream().mapToDouble(TMissionUser::getDamageRate).average().orElse(0);
            indexDataVo.setDamageRate(String.valueOf(setDamageRate));
        }

        return R.ok(indexDataVo);
    }

    @ApiOperation(value = "获取数据-第二部分")
    @GetMapping(value = "/open/t-data-statistics/getDataTwo")
    public R<IndexDataVo> getDataTwo() {
        IndexDataVo indexDataVo = new IndexDataVo();
        List<TMission> listAll = missionService.list();

        List<TMission> list = listAll.stream().filter(item -> item.getStatus() == 4).collect(Collectors.toList());
        if(listAll.isEmpty()){
            return R.ok(indexDataVo);
        }

        if (!list.isEmpty()) {
            List<String> missionIds = list.stream().map(TMission::getId).collect(Collectors.toList());
            List<TMissionUser> missionUsers = missionUserService.list(new LambdaQueryWrapper<TMissionUser>().in(TMissionUser::getMissionId, missionIds));
            List<String> userIds = missionUsers.stream().map(TMissionUser::getAppUserId).collect(Collectors.toList());
            List<TAppUser> appUsers = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, userIds));
            Map<String, List<TAppUser>> collect = appUsers.stream().collect(groupingBy(TAppUser::getTeamId));

            ArrayList<IndexDataRankVo> indexDataRankVos = new ArrayList<>();
            for (Map.Entry<String, List<TAppUser>> entry : collect.entrySet()) {
                IndexDataRankVo indexDataRankVo = new IndexDataRankVo();
                indexDataRankVo.setId(entry.getKey());
                List<String> userIds1 = entry.getValue().stream().map(TAppUser::getId).collect(Collectors.toList());
                long count = missionUsers.stream().filter(e -> userIds1.contains(e.getAppUserId())).count();
                indexDataRankVo.setCount((int) count);
                indexDataRankVos.add(indexDataRankVo);
            }
            List<String> teamIds = indexDataRankVos.stream().map(IndexDataRankVo::getId).collect(Collectors.toList());
            List<TDivisionTeam> list2 = divisionTeamService.list(new LambdaQueryWrapper<TDivisionTeam>().in(TDivisionTeam::getId, teamIds));
            indexDataRankVos.forEach(e -> {
                TDivisionTeam tDivisionTeam = list2.stream().filter(s -> s.getId().equals(e.getId())).findFirst().get();
                e.setName(tDivisionTeam.getTeamName());
            });

            // indexDataRankVos取出count排名前5的 若没有5个全取
            if(indexDataRankVos.size()>5){
                List<IndexDataRankVo> collect1 = indexDataRankVos.stream().sorted(Comparator.comparingInt(IndexDataRankVo::getCount).reversed()).limit(5).collect(Collectors.toList());
                indexDataVo.setRank(collect1);
            }else {
                List<IndexDataRankVo> collect1 = indexDataRankVos.stream().sorted(Comparator.comparingInt(IndexDataRankVo::getCount).reversed()).collect(Collectors.toList());
                indexDataVo.setRank(collect1);
            }

        }


        Map<String, List<TMission>> collect = listAll.stream().collect(groupingBy(TMission::getMissionTypeId));

        List<IndexDataRankVo> indexDataDetailVos = new ArrayList<>();
        for (Map.Entry<String, List<TMission>> entry : collect.entrySet()) {
            IndexDataRankVo indexDataDetailVo = new IndexDataRankVo();
            indexDataDetailVo.setId(entry.getKey());
            indexDataDetailVo.setCount(entry.getValue().size());
            indexDataDetailVos.add(indexDataDetailVo);
        }
        if(!indexDataDetailVos.isEmpty()){
            List<String> typeIds = indexDataDetailVos.stream().map(IndexDataRankVo::getId).collect(Collectors.toList());
            List<TMissionAssignRule> tMissionAssignRules = missionReassignService.list(new LambdaQueryWrapper<TMissionAssignRule>().in(TMissionAssignRule::getId, typeIds));
            indexDataDetailVos.forEach(e -> {
                TMissionAssignRule tMissionAssignRule = tMissionAssignRules.stream().filter(s -> s.getId().equals(e.getId())).findFirst().get();
                e.setName(tMissionAssignRule.getTypeName());
            });

        }
        indexDataVo.setMissionType(indexDataDetailVos);


        // 装备库统计
        List<TAppUserEquipment> list1 = appUserEquipmentService.list();
        ArrayList<EquipmentDto> equipmentDtos = new ArrayList<>();

        if (!list1.isEmpty()) {
            List<String> equipments = list1.stream().map(TAppUserEquipment::getEquipmentCount).collect(Collectors.toList());
            for (String equipment : equipments) {
                List<EquipmentDto> dtos = JSONArray.parseArray(equipment, EquipmentDto.class);
                dtos =  dtos.stream().filter(e->!e.getId().equals("0")).collect(Collectors.toList());
                equipmentDtos.addAll(dtos);
            }
        }
        Map<String, List<EquipmentDto>> listMap = equipmentDtos.stream().collect(groupingBy(EquipmentDto::getId));
        List<IndexDataRankVo> indexDataRankVos = new ArrayList<>();
        for (Map.Entry<String, List<EquipmentDto>> entry : listMap.entrySet()) {
            IndexDataRankVo indexDataRankVo = new IndexDataRankVo();
            indexDataRankVo.setId(entry.getKey());
            indexDataRankVo.setCount(entry.getValue().stream().mapToInt(EquipmentDto::getCount).sum());
            indexDataRankVos.add(indexDataRankVo);
        }
        if(!indexDataRankVos.isEmpty()){
            List<String> equipIds = indexDataRankVos.stream().map(IndexDataRankVo::getId).collect(Collectors.toList());
            List<TEquipment> equipmentList = equipmentService.list(new LambdaQueryWrapper<TEquipment>().in(TEquipment::getId, equipIds));
            indexDataRankVos.forEach(e -> {
                TEquipment tEquipment = equipmentList.stream().filter(s -> s.getId().equals(e.getId())).findFirst().orElse(null);
                if(tEquipment!=null){
                    e.setName(tEquipment.getEquipmentName());
                }
            });
        }
        indexDataVo.setEquip(indexDataRankVos);


        return R.ok(indexDataVo);

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -118,7 +118,7 @@
                        "/applet/changepwd", "/captchaImage","/getCode","/loginCode",
                        "/operations/getBySingleNum/**",
                        "/user/getUserInfoByNumber/**",
                        "/wxLogin/**","/cos/get/**","/t-mission/**","/api/t-app-user/**","/open/file/**"
                        "/wxLogin/**","/cos/get/**","/t-mission/**","/api/t-app-user/**","/open/file/**","/open/t-data-statistics/**"
                ).permitAll()
                // 静态资源，可匿名访问
                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

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

@@ -88,4 +88,9 @@
    @ApiModelProperty(value = "接受时间")
    @TableField("accept_time")
    private LocalDateTime acceptTime;


    @ApiModelProperty(value = "战损率")
    @TableField("damage_rate")
    private Double damageRate;
}

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

@@ -163,7 +163,7 @@
        TMissionUser user = missionUserMapper.selectById(dto.getId());
        user.setSuccessTime(new Date());
        BeanUtils.copyProperties(dto, user);
        missionUserMapper.updateById(user);

        // 判断这个任务还有正在执行的不
        Long l = missionUserMapper.selectCount(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getMissionId, user.getMissionId()).eq(TMissionUser::getStatus, 0));
        if (l == 0){
@@ -181,9 +181,16 @@
            tMission.setSuccessTime((double) Duration.between(assignTime, tMission.getFinishTime()).toHours());
            this.updateById(tMission);
        }



        // 更新装备
        TAppUserEquipment tAppUserEquipment = appUserEquipmentMapper.selectOne(new LambdaQueryWrapper<TAppUserEquipment>().eq(TAppUserEquipment::getAppUserId, userId).eq(TAppUserEquipment::getAppUserId, userId));

        if (Objects.nonNull(tAppUserEquipment)) {

            String equipmentCount1 = tAppUserEquipment.getEquipmentCount();
            List<EquipmentDto> dtos = JSONArray.parseArray(equipmentCount1, EquipmentDto.class);
            String lossText = dto.getLossText();
            String victoryText = dto.getVictoryText();
            List<EquipmentDto> victoryTextDtos = JSONArray.parseArray(victoryText, EquipmentDto.class);
@@ -214,6 +221,19 @@
            EquipmentDtoList.addAll(notHaveEquipment);
            tAppUserEquipment.setEquipmentCount(JSON.toJSONString(EquipmentDtoList));
            appUserEquipmentMapper.updateById(tAppUserEquipment);


            int winSum = victoryTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
            int oldSum = dtos.stream().mapToInt(EquipmentDto::getCount).sum();
            winSum = winSum + oldSum;
            int lossSum = lossTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
            if(winSum!=0){
                user.setDamageRate(new BigDecimal(lossSum).divide(BigDecimal.valueOf(winSum), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).doubleValue());
            }




        } else {
            tAppUserEquipment = new TAppUserEquipment();
            tAppUserEquipment.setAppUserId(userId);
@@ -237,7 +257,16 @@
            }
            tAppUserEquipment.setEquipmentCount(JSON.toJSONString(victoryTextDtos));
            appUserEquipmentMapper.insert(tAppUserEquipment);

            int winSum = victoryTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
            int lossSum = lossTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
            if(winSum!=0){
                user.setDamageRate(new BigDecimal(lossSum).divide(BigDecimal.valueOf(winSum), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).doubleValue());
            }

        }

        missionUserMapper.updateById(user);
    }

    @Override

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

@@ -9,4 +9,6 @@
    private String name;

    private Integer count;

    private String id;
}

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

@@ -46,7 +46,7 @@
    private String damageRate="0";

    @ApiModelProperty("敌情准确率")
    private String enemyAccuracy="0";
    private String enemyAccuracyRate="0";

    @ApiModelProperty("本月分队排名")
    private List<IndexDataRankVo> rank;