检验下单代码迁移3

zouyu

2025-03-10 6e8e81028bd24a5b08f774ecf8fca10580be830c

检验下单代码迁移3

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java

@@ -14,7 +14,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalCheckDto;
import com.ruoyi.manage.mapper.InternalCheckMapper;
import com.ruoyi.manage.pojo.InternalCheck;

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java

@@ -13,7 +13,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalImplementDto;
import com.ruoyi.manage.mapper.InternalImplementMapper;
import com.ruoyi.manage.pojo.InternalImplement;

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java

@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalMeetingDto;
import com.ruoyi.manage.dto.InternalMeetingParticipantDto;
import com.ruoyi.manage.mapper.InternalMeetingMapper;

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java

@@ -12,7 +12,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalPlanDto;
import com.ruoyi.manage.mapper.InternalPlanMapper;
import com.ruoyi.manage.pojo.InternalPlan;

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java

@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageControlPlanListMapper;
import com.ruoyi.manage.pojo.ManageControlPlanList;
import com.ruoyi.manage.service.ManageControlPlanListService;

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java

@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.ManageMeetingDto;
import com.ruoyi.manage.dto.ManageMeetingParticipantsDto;
import com.ruoyi.manage.mapper.ManageMeetingMapper;

 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java

@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageRiskAssessmentResultsMapper;
import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonSupervisePlanServiceImpl.java

@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.personnel.dto.PersonSupervisePlanDto;
import com.ruoyi.personnel.excel.PersonSupervisePlanDetailsListener;
import com.ruoyi.personnel.excel.PersonSupervisePlanDetailsUpload;
@@ -30,7 +30,6 @@
import com.ruoyi.personnel.service.PersonSupervisePlanDetailsService;
import com.ruoyi.personnel.service.PersonSupervisePlanService;
import com.ruoyi.system.mapper.UserMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.usermodel.*;
@@ -43,7 +42,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.apache.poi.xwpf.usermodel.XWPFDocument;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java

@@ -13,7 +13,7 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.performance.mapper.AuxiliaryWorkingHoursDayMapper;
import com.ruoyi.performance.mapper.PerformanceShiftMapper;
import com.ruoyi.performance.pojo.AuxiliaryWorkingHoursDay;

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java

@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.personnel.dto.*;
import com.ruoyi.personnel.excel.PersonTrainingDetailedListener;
import com.ruoyi.personnel.excel.PersonTrainingDetailedUpload;

 cnas-process/pom.xml

@@ -18,9 +18,25 @@

    <dependencies>
        <!--业务模块-->
<!--        <dependency>-->
<!--            <groupId>com.ruoyi</groupId>-->
<!--            <artifactId>inspect-server</artifactId>-->
<!--        </dependency>-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>inspect-server</artifactId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-framework</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>performance-server</artifactId>
        </dependency>
        <dependency>
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
        </dependency>

        <dependency>

 cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java

@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.process.dto.InconsistentDistributionDto;
import com.ruoyi.process.dto.InconsistentDistributionProportionDto;
import com.ruoyi.process.mapper.InconsistentDistributionMapper;

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java

@@ -14,8 +14,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.XWPFDocumentUtils;
import com.ruoyi.process.utils.UserUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.ProcessMethodVerifyDto;

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java

@@ -12,8 +12,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.XWPFDocumentUtils;
import com.ruoyi.process.dto.InspectionOrderDetail;
import com.ruoyi.process.dto.InspectionOrderExportDto;
import com.ruoyi.process.dto.ProcessOrderDto;

 cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java

@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.XWPFDocumentUtils;
import com.ruoyi.process.dto.QualityMonitorDetailsEvaluateDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.excel.QualityMonitorDetailsUpload;

 cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java

@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.XWPFDocumentUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.QualitySuperviseDetailsAccordingDto;
import com.ruoyi.process.dto.QualitySuperviseDetailsCorrectDto;

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeIlluminationServiceImpl.java

@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.requier.dto.FeIlluminationDto;
import com.ruoyi.requier.dto.FeIlluminationExportDto;

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/FePowerStableServiceImpl.java

@@ -9,7 +9,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.requier.dto.FePowerStableDto;
import com.ruoyi.requier.dto.FePowerStableExportDto;

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeTempHumDateServiceImpl.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.requier.dto.FeTempHumDateDto;
import com.ruoyi.requier.dto.FeTempHumRecordDto;
import com.ruoyi.requier.mapper.FeTempHumDateMapper;

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/ForeignRegisterServiceImpl.java

@@ -8,7 +8,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.requier.dto.ForeignRegisterDto;
import com.ruoyi.requier.mapper.ForeignRegisterMapper;

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.java

@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.requier.dto.InternalWastesDto;
import com.ruoyi.requier.mapper.InternalWastesMapper;
import com.ruoyi.requier.pojo.InternalWastes;

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java

@@ -14,6 +14,7 @@
import com.ruoyi.inspect.vo.SampleVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;

import java.time.LocalDateTime;
import java.util.List;
@@ -46,7 +47,7 @@

    List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);

    List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids);
    List<SampleProductDto3> selectSampleProductListByOrderId3(@Param("ids") List<Integer> ids);

    List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);


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

@@ -1198,8 +1198,7 @@
    @Override
    public void exportChecked(Map<String, Object> data, HttpServletResponse response) {
//        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        Integer userId = Integer.valueOf(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
        User user = userMapper.selectById(userId);
        User user = userMapper.selectById(SecurityUtils.getLoginUser().getUserId());
        List<String> names = null;
        String startTime = "";
        String endTime = "";
@@ -1708,7 +1707,7 @@
        }
        temperatureCyclingList = temperatureCyclingList.stream().distinct().collect(Collectors.toList());
        //查询全色谱，过滤色标并排序
        List<String> colorList = dictTypeService.selectDictDataByType("color_type").stream()
        List<String> colorList = dictTypeService.selectDictDataByType("fiber_color_type").stream()
                .sorted(Comparator.comparing(SysDictData::getDictSort))
                .map(SysDictData::getDictLabel)
                .collect(Collectors.toList());

 pom.xml

@@ -389,8 +389,6 @@
        <module>ruoyi-admin</module>
        <module>ruoyi-framework</module>
        <module>ruoyi-system</module>
        <module>ruoyi-quartz</module>
        <module>ruoyi-generator</module>
        <module>ruoyi-common</module>
        <module>basic-server</module>
        <module>inspect-server</module>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -2,6 +2,9 @@

import java.util.List;
import java.util.Set;

import com.ruoyi.common.core.vo.SysUserVO;
import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +42,9 @@
    @Autowired
    private TokenService tokenService;

    @Autowired
    private UserMapper userMapper;

    /**
     * ç™»å½•æ–¹æ³•
     *
@@ -66,6 +72,9 @@
    {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        SysUser user = loginUser.getUser();
        //查询用户信息
        //TODO:重写查询用户信息sql
//        SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
        // è§’色集合
        Set<String> roles = permissionService.getRolePermission(user);
        // æƒé™é›†åˆ

 ruoyi-common/src/main/java/com/ruoyi/common/core/vo/SysUserVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.ruoyi.common.core.vo;

import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.ApiModelProperty;

public class SysUserVO extends SysUser {

    /**
     * å§”托客户单位名称
     */
    @ApiModelProperty("委托客户单位名称")
    private String companyName;

    public String getCompanyName() {
        return companyName;
    }

    public void setCompanyName(String companyName) {
        this.companyName = companyName;
    }
}

 ruoyi-framework/pom.xml

@@ -52,6 +52,10 @@
            <groupId>com.github.oshi</groupId>
            <artifactId>oshi-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
        </dependency>

        <!-- ç³»ç»Ÿæ¨¡å—-->
        <dependency>

 ruoyi-framework/src/main/java/com/ruoyi/framework/util/HackLoopTableRenderPolicy.java

ÎļþÃû´Ó inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java ÐÞ¸Ä
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.ruoyi.inspect.util;
package com.ruoyi.framework.util;

import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.exception.RenderException;

 ruoyi-framework/src/main/java/com/ruoyi/framework/util/SheetWriteHandlerUtil.java

ÎļþÃû´Ó inspect-server/src/main/java/com/ruoyi/inspect/util/SheetWriteHandlerUtil.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.util;
package com.ruoyi.framework.util;

import com.alibaba.excel.write.handler.SheetWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;

 ruoyi-framework/src/main/java/com/ruoyi/framework/util/XWPFDocumentUtils.java

ÎļþÃû´Ó inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.util;
package com.ruoyi.framework.util;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import org.apache.poi.xwpf.usermodel.*;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.core.vo.SysUserVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -45,5 +46,6 @@
     */
    User getUserNow(@Param("userId") int userId);

    SysUserVO selectUserInfo(Long userId);
}


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

@@ -60,4 +60,7 @@
                 left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>
    <select id="selectUserInfo" resultType="com.ruoyi.common.core.vo.SysUserVO">
        select * from user
    </select>
</mapper>