代码迁移bug解决

chenrui

2025-03-04 c6a5968dfaab373b6178670aa058f5525e6447ec

代码迁移bug解决

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.ruoyi.inspect.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.system.service.InformationNotificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

/**
 * <p>
 * æ¶ˆæ¯é€šçŸ¥ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-04-23 02:14:30
 */
@Api(tags = "消息通知")
@RestController
@RequestMapping("/informationNotification")
public class InformationNotificationController {

    @Autowired
    private InformationNotificationService informationNotificationService;

    @ApiOperation(value = "消息通知-滚动分页查询")
    @GetMapping("page")
    public Result<?> getPage(Long size, Long current, String messageType) {
        return Result.success(informationNotificationService.getPage(new Page<>(current, size), messageType));
    }

    @ApiOperation(value = "消息通知-滚动查询")
    @GetMapping("msgRoll")
    public Result<?> msgRoll(Page page) {
        return Result.success(informationNotificationService.msgRoll(page));
    }
}

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java

@@ -255,7 +255,7 @@


    @ApiOperation(value = "删除特殊检验项绑定信息")
    @GetMapping("/delProductTreeByProductId")
    @DeleteMapping("/delProductTreeByProductId")
    public Result<?> delProductTreeByProductId(Integer productId) {
        return Result.success(insProductService.removeBindingProductTree(productId));
    }

 inspect-server/src/main/java/com/ruoyi/inspect/controller/ReportController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.inspect.controller;


import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.service.ReportService;
import com.ruoyi.performance.dto.AuxiliaryOriginalHoursLookDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@RestController
@AllArgsConstructor
@RequestMapping("/report")
@Api(tags = "报表模块")
public class ReportController {

    private ReportService reportService;

    @ApiOperation(value = "查询日历任务图")
    @GetMapping("/calendarWorkByWeek")
    public Result calendarWorkByWeek(){
        return Result.success(reportService.calendarWorkByWeek());
    }

    @ApiOperation(value = "当前用户工时统计")
    @GetMapping("/currentUserWorkHourCount")
    public Result currentUserWorkHourCount(AuxiliaryOriginalHoursLookDto dto){
        return Result.success(reportService.currentUserWorkHourCount(dto));
    }

}

 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java

@@ -211,4 +211,8 @@
    @ApiModelProperty("第一次提交时间")
    private LocalDateTime firstSubmitDate;

    @ApiModelProperty("样机员(除了其他成品外这个字段必选,用于企业微信推送)")
    @TableField(exist = false)
    private Integer issueUser;

}

 inspect-server/src/main/java/com/ruoyi/inspect/service/ReportService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.ruoyi.inspect.service;

import com.ruoyi.performance.dto.AuxiliaryAllDto;
import com.ruoyi.performance.dto.AuxiliaryOriginalHoursLookDto;

import java.util.Map;

public interface ReportService {
    //首页-->日历任务图
    Map<String, Object> calendarWorkByWeek();

    AuxiliaryAllDto currentUserWorkHourCount(AuxiliaryOriginalHoursLookDto dto);
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReportServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,129 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.inspect.mapper.*;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.pojo.InsSampleUser;
import com.ruoyi.inspect.service.ReportService;
import com.ruoyi.performance.dto.AuxiliaryAllDto;
import com.ruoyi.performance.dto.AuxiliaryOriginalHoursLookDto;
import com.ruoyi.performance.service.AuxiliaryOriginalHoursService;
import com.ruoyi.system.mapper.UserMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
@AllArgsConstructor
public class ReportServiceImpl implements ReportService {

    @Autowired
    private InsOrderMapper insOrderMapper;

    @Autowired
    private InsSampleMapper insSampleMapper;

    @Autowired
    private UserMapper userMapper;

    @Autowired
    private InsSampleUserMapper insSampleUserMapper;

    @Autowired
    private AuxiliaryOriginalHoursService auxiliaryOriginalHoursService;

    //首页-->日历任务图
    @Override
    public Map<String, Object> calendarWorkByWeek() {
        Integer userId = SecurityUtils.getUserId().intValue();
        //
        List<SysRole> roleList = SecurityUtils.getLoginUser().getUser().getRoles();

//        String name = roleMapper.selectById(userMapper.selectById(userId).getRoleId()).getName();
        String name = roleList.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
        Map<String, Object> map = new HashMap<>();
        List<Integer> insState = new ArrayList<>();
        insState.add(0);
        insState.add(1);
        /*获取后一周日期*/
        LocalDate currentDate = LocalDate.now();
        List<LocalDate> weekDays = new ArrayList<>();
        for (int i = 6, j = 0; i >= 0; i--, j++) {
            weekDays.add(currentDate.minusDays(i));
            //查询当天需要检测的委托订单
            List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
                    .eq(InsOrder::getState, 1)
                    .in(InsOrder::getInsState, insState)
                    .apply("DATE(create_time) = CURDATE() - INTERVAL " + j + " DAY"));
            //如果当前登录人是测试工程师或者是检测组长,需要过滤出检验人是他们的订单或者是还没检验的订单
            if (name.contains("测试工程师") || name.contains("检测组长")) {
                insOrders = insOrders.stream().filter(insOrder -> {
                    List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insOrder.getId()));
                    List<Integer> sampleId = insSamples.stream().map(InsSample::getId).collect(Collectors.toList());
                    List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
                            .in(InsSampleUser::getInsSampleId, sampleId)
                            .eq(InsSampleUser::getState, 0)  //检验人
                    );
                    return insSampleUsers.size() == 0 || insSampleUsers.stream().map(InsSampleUser::getUserId).collect(Collectors.toList()).contains(userId);
                }).collect(Collectors.toList());
            }
            //如果当前登录人是送样员,需过滤出单子的送样员是当前人的订单
            else if (name.contains("送样员")) {
                insOrders = insOrders.stream().filter(insOrder ->
                        ObjectUtils.isNotEmpty(insOrder.getIssueUser()) && insOrder.getIssueUser().equals(userId)
                ).collect(Collectors.toList());
            }
            List<Map<String, Object>> works = insOrders.stream().map(insOrder -> {
                List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insOrder.getId()));
                HashMap<String, Object> hashMap = new HashMap<>();
                hashMap.put("text", insOrder.getEntrustCode());
                hashMap.put("sample", insSamples.stream().map(InsSample::getSample).collect(Collectors.joining(",")));
                hashMap.put("type", insOrder.getType());
                hashMap.put("state", insOrder.getState());
                User user = userMapper.selectById(insOrder.getCreateUser());
                hashMap.put("name", user.getName());
                return hashMap;
            }).collect(Collectors.toList());
            map.put("work" + i, works);
        }
        map.put("weekDays", weekDays);
        return map;
    }

    @Override
    public AuxiliaryAllDto currentUserWorkHourCount(AuxiliaryOriginalHoursLookDto dto) {
        List<AuxiliaryAllDto> auxiliaryAllDtos = auxiliaryOriginalHoursService.selectAuxiliaryAllByMonth(dto);
        int userId = SecurityUtils.getUserId().intValue();
        // è¿‡æ»¤æŽ‰éžå½“前用户数据
        AuxiliaryAllDto auxiliaryAllDto = null;
        for (AuxiliaryAllDto allDto : auxiliaryAllDtos) {
            if(userId == allDto.getUserId()){
                auxiliaryAllDto = allDto;
                break;
            }
        }
        if(ObjectUtils.isEmpty(auxiliaryAllDto)){
            auxiliaryAllDto = new AuxiliaryAllDto(
                new BigDecimal(0),
                new BigDecimal(0),
                new BigDecimal(0),
                userId,SecurityUtils.getUsername(),
                dto.getMonth()
            );
        }
        return auxiliaryAllDto;
    }
}

 performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryAllDto.java

@@ -1,7 +1,9 @@
package com.ruoyi.performance.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.math.BigDecimal;

@@ -12,6 +14,8 @@
 * @Date 2024/10/25
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class AuxiliaryAllDto {

    @ApiModelProperty("产量工时")

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

@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.InformationNotificationDto;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -17,4 +20,12 @@
public interface InformationNotificationMapper extends BaseMapper<InformationNotification> {

    IPage<InformationNotificationDto> getPage(Page page, String messageType, Integer userId);

    /**
     * æ¶ˆæ¯é€šçŸ¥-滚动查询
     *
     * @param userId
     * @return
     */
    IPage<InformationNotificationDto> msgRoll(Page page,@Param("userId") Integer userId);
}

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

@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.InformationNotificationDto;

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

/**
@@ -30,5 +31,10 @@

    Map<String, Object> getNumberFourTypesMessagesHomePage();


    /**
     * æ¶ˆæ¯é€šçŸ¥-滚动查询
     *
     * @return
     */
    IPage<InformationNotificationDto> msgRoll(Page page);
}

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

@@ -13,6 +13,7 @@

import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -95,4 +96,14 @@
        map.put("totalNumberOfMessagesInThePastSevenDays", totalNumberOfMessagesInThePastSevenDays);
        return map;
    }

    /**
     * æ¶ˆæ¯é€šçŸ¥-滚动查询
     *
     * @return
     */
    @Override
    public IPage<InformationNotificationDto> msgRoll(Page page) {
        return baseMapper.msgRoll(page,SecurityUtils.getUserId().intValue());
    }
}

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

@@ -13,4 +13,14 @@
        </if>
        order by i.create_time desc
    </select>

    <select id="msgRoll" resultType="com.ruoyi.common.core.domain.entity.InformationNotificationDto">
        select i.*, u.name senderUser, u2.name consigneeUser
        from information_notification i
        left join user u on i.sender_id = u.id
        left join user u2 on u2.id = i.consignee_id
        where i.consignee_id = #{userId}
        order by i.create_time desc
    </select>

</mapper>