yangys
2024-04-13 0a583efe2ddead0cdd37fd83deff43d43745a05f
删除无用注释
已修改31个文件
140 ■■■■■ 文件已修改
smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/MessageUtils.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArchiveDirectoryController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArchiveDirectoryFileController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtBagController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtBagLogController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtFileController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtProductController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncDirectorySettingsController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncFactoryFileController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncFixedSpaceController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncOperationLogController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncProcessCatalogueController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncWsRelationTdController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DockingFtpController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/FileController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/FolderController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/HmiDncController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/TransferDirectorController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/TransferDirectoryFileController.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsAbnormalController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsDeviceAnalysisController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsInstructionRecordController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsProductionStatisticsController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsScheduleController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsWorkStationRecordController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessToolServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/MessageUtils.java
@@ -4,7 +4,6 @@
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/utils/MessageUtils.class */
public class MessageUtils {
    public static String message(String code, Object... args) {
        MessageSource messageSource = (MessageSource) SpringUtil.getBean(MessageSource.class);
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainItemServiceImpl.java
@@ -1,26 +1,23 @@
package com.qianwen.smartman.modules.cps.service.impl;
import com.alibaba.excel.write.merge.AbstractMergeStrategy;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.ExcelConstant;
import com.qianwen.smartman.common.enums.StatusType;
import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.common.utils.ValidatorUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.excel.write.merge.AbstractMergeStrategy;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
@@ -31,6 +28,11 @@
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.ExcelConstant;
import com.qianwen.smartman.common.enums.StatusType;
import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.modules.cps.convert.MaintainItemConvert;
import com.qianwen.smartman.modules.cps.dto.MaintainItemExportDTO;
import com.qianwen.smartman.modules.cps.dto.MaintainItemUpdateVO;
@@ -46,9 +48,6 @@
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.tpm.service.IMaintainPlanItemService;
import com.qianwen.smartman.modules.tpm.service.IMaintainPlanService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
/**
 * 保养项的服务
@@ -68,7 +67,7 @@
        this.ossBuilder = ossBuilder;
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public MaintainItem createMaintainItem(MaintainItemAddVO maintainItemAddVO) {
        if (checkCodeIsExist(maintainItemAddVO.getCode(), null)) {
            throw new ServiceException(MessageUtils.message("cps.common.duplicate.code.can.not.add", new Object[0]));
@@ -82,7 +81,7 @@
        return maintainItem;
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public MaintainItem editMaintainItem(MaintainItemUpdateVO maintainItemUpdateVO) {
        MaintainItem maintainItem = (MaintainItem) getById(maintainItemUpdateVO.getId());
        if (Func.isNull(maintainItem)) {
@@ -103,12 +102,12 @@
        }
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public MaintainItemVO queryMaintainItem(Long id) {
        return MaintainItemConvert.INSTANCE.convert((MaintainItem) getById(id));
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public List<MaintainItemVO> queryMaintainItemList(String keyWord) {
        //MaintainItem::getName MaintainItem::getCode
        List<MaintainItem> list = list(Wrappers.<MaintainItem>query().lambda().eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainItem::getTenantId, AuthUtil.getTenantId())
@@ -119,7 +118,7 @@
        return MaintainItemConvert.INSTANCE.convert(list);
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService  MaintainItem::getCreateTime
    @Override
    public IPage<MaintainItemVO> queryMaintainItemListPage(String keyWord, Query query, Integer status) {
        IPage<MaintainItem> pages = page(Condition.getPage(query), Wrappers.<MaintainItem>query().lambda()
                .eq(Func.isNotEmpty(AuthUtil.getTenantId()), MaintainItem::getTenantId, AuthUtil.getTenantId())
@@ -135,7 +134,7 @@
        }).orElse(new Page<>());
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    @Transactional(rollbackFor = {Exception.class})
    public Boolean deleteMaintainItem(List<String> ids, Integer type) {
        if (StatusType.REMOVE.getType().equals(type)) {
@@ -145,12 +144,12 @@
        return Boolean.valueOf(changeStatus(Func.toLongList(ids), CommonConstant.DEACTIVATE));
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public List<MaintainItemVO> queryMaintainItemListCanRelate() {
        return this.baseMapper.queryMaintainItemListCanRelate(AuthUtil.getTenantId());
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public BladeFile exportMaintainItem(MaintainItemExportDTO maintainItemExportDTO, HttpServletResponse response) {
        List<MaintainItemExcel> list = this.baseMapper.export(maintainItemExportDTO, AuthUtil.getTenantId());
        String fileName = String.format("%s-%s.xlsx", "保养项数据", DateUtil.time());
@@ -159,7 +158,7 @@
        return bladeFile;
    }
    @Override // org.springblade.modules.cps.service.IMaintainItemService
    @Override
    public BladeFile importMaintainItem(List<MaintainItemImport> data) {
        if (Func.isEmpty(data)) {
            throw new ServiceException(MessageUtils.message("excel.import.data.can.not.be.null", new Object[0]));
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArchiveDirectoryController.java
@@ -30,7 +30,6 @@
@Api(value = "归档目录管理", tags = {"归档目录管理"})
@ApiResource({"blade-dnc/dnc-archive-directory"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncArchiveDirectoryController.class */
public class DncArchiveDirectoryController extends BladeController {
    private IDncArchiveDirectoryService dncArchiveDirectoryService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArchiveDirectoryFileController.java
@@ -33,7 +33,6 @@
@RestController
@ApiResource({"blade-dnc/dnc-archive-directory-file"})
@Validated
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncArchiveDirectoryFileController.class */
public class DncArchiveDirectoryFileController extends BladeController {
    private IDncArchiveDirectoryFileService dncArchiveDirectoryFileService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtBagController.java
@@ -30,7 +30,6 @@
@Api(value = "工艺包管理", tags = {"工艺包管理"})
@ApiResource({"blade-dnc/dnc-art-bag"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncArtBagController.class */
public class DncArtBagController extends BladeController {
    private final IDncArtBagService dncArtBagService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtBagLogController.java
@@ -23,7 +23,6 @@
@Api(value = "工艺包日志管理", tags = {"工艺包日志管理"})
@ApiResource({"blade-dnc/dnc-art-bag-log"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncArtBagLogController.class */
public class DncArtBagLogController extends BladeController {
    private final IDncArtBagLogService dncArtBagLogService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtFileController.java
@@ -36,7 +36,6 @@
@RestController
@ApiResource({"blade-dnc/dnc-art-file"})
@Validated
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncArtFileController.class */
public class DncArtFileController extends BladeController {
    private final IDncArtFileService dncArtFileService;
@@ -107,7 +106,7 @@
    private boolean existDuplicateFileInArtBag(SyncArtCatalogVO syncArtCatalogVO) {
        List<SyncArtBagVO> artBags = syncArtCatalogVO.getArtBag();
        return artBags.stream().anyMatch(item -> {
            Set<String> fileNames = (Set) item.getFileList().stream().map(x -> {
            Set<String> fileNames = item.getFileList().stream().map(x -> {
                return x.getFileName();
            }).collect(Collectors.toSet());
            boolean existDuplicateFile = item.getFileList().size() > fileNames.size();
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncArtProductController.java
@@ -26,7 +26,6 @@
@Api(value = "工艺包关联产品", tags = {"工艺包关联产品"})
@ApiResource({"blade-dnc/dnc-art-product"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncArtProductController.class */
public class DncArtProductController extends BladeController {
    private IDncArtProductService dncArtProductService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncDirectorySettingsController.java
@@ -16,7 +16,6 @@
@Api(value = "文件目录设置", tags = {"文件传输文件目录名称设置"})
@ApiResource({"blade-dnc/dnc-directory-settings"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncDirectorySettingsController.class */
public class DncDirectorySettingsController {
    private final IDncDirectorySettingsService directorySettingsService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncFactoryFileController.java
@@ -38,7 +38,6 @@
@Api(value = "工厂文件管理", tags = {"工厂文件管理"})
@ApiResource({"blade-dnc/dnc-factory-file"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncFactoryFileController.class */
public class DncFactoryFileController extends BladeController {
    private IDncFactoryFileService dncFactoryFileService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncFixedSpaceController.java
@@ -25,7 +25,6 @@
@Api(value = "工位目录关联固定空间表管理", tags = {"工位目录关联固定空间表管理"})
@ApiResource({"blade-dnc/dnc-fixed-space"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncFixedSpaceController.class */
public class DncFixedSpaceController extends BladeController {
    private final IDncFixedSpaceService dncFixedSpaceService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncOperationLogController.java
@@ -30,7 +30,6 @@
@ApiResource({"blade-dnc/operation-file"})
@Api(value = "dnc操作日志接口", tags = {"dnc日志"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncOperationLogController.class */
public class DncOperationLogController {
    private static final Logger log = LoggerFactory.getLogger(DncOperationLogController.class);
    private final IDncOperationLogService dncOperationLogService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncProcessCatalogueController.java
@@ -26,7 +26,6 @@
@Api(value = "工艺目录管理", tags = {"工艺目录"})
@ApiResource({"blade-dnc/dnc-process-catalogue"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncProcessCatalogueController.class */
public class DncProcessCatalogueController extends BladeController {
    private final IDncProcessCatalogueService dncProcessCatalogueService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DncWsRelationTdController.java
@@ -16,7 +16,6 @@
@Api(value = "FTP目录与工位关系表管理", tags = {"FTP目录与工位关系表管理"})
@ApiResource({"blade-dnc/dnc-ws-relation-td"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DncWsRelationTdController.class */
public class DncWsRelationTdController extends BladeController {
    private final IDncWsRelationTdService dncWsRelationTdService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/DockingFtpController.java
@@ -25,7 +25,6 @@
@Api(value = "ftp接口", tags = {"ftp接口controller"})
@ApiResource({"blade-dnc/ftp"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/DockingFtpController.class */
public class DockingFtpController {
    private static final Logger log = LoggerFactory.getLogger(DockingFtpController.class);
    private final IDockingFtpService dockingFtpService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/FileController.java
@@ -34,7 +34,6 @@
@RestController
@ApiResource({"blade-dnc/file"})
@Validated
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/FileController.class */
public class FileController extends BladeController {
    private static final Logger log = LoggerFactory.getLogger(FileController.class);
    private final IFileService fileService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/FolderController.java
@@ -28,7 +28,6 @@
@ApiResource({"blade-dnc/folder"})
@Api(value = "文件夹", tags = {"文件夹"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/FolderController.class */
public class FolderController extends BladeController {
    private static final Logger log = LoggerFactory.getLogger(FolderController.class);
    private final IFileService fileService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/HmiDncController.java
@@ -17,7 +17,6 @@
@ApiResource({"blade-dnc/hmi"})
@Api(value = "hmi", tags = {"hmi"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/HmiDncController.class */
public class HmiDncController {
    private static final Logger log = LoggerFactory.getLogger(HmiDncController.class);
    private final IMachineService machineService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/TransferDirectorController.java
@@ -23,7 +23,6 @@
@ApiResource({"blade-dnc/ftp-director"})
@Api(value = "director", tags = {"director"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/TransferDirectorController.class */
public class TransferDirectorController {
    private static final Logger log = LoggerFactory.getLogger(TransferDirectorController.class);
    private final ITransferDirectoryService transferDirectoryService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/controller/TransferDirectoryFileController.java
@@ -46,7 +46,6 @@
@ApiResource({"blade-dnc/transfer-directory"})
@Api(value = "传输目录文件增删接口", tags = {"传输目录文件增删controller"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/controller/TransferDirectoryFileController.class */
public class TransferDirectoryFileController {
    private static final Logger log = LoggerFactory.getLogger(TransferDirectoryFileController.class);
    private final ITransferDirectoryFileService transferDirectoryFileService;
@@ -119,20 +118,14 @@
    @PostResource({"/online-read-file"})
    @ApiOperation(value = "在线读文件", notes = "读取机床文件")
    public void onlineRead(@Valid @RequestBody DncReadFileVO dncReadFileVO, HttpServletResponse response) {
        try {
            InputStream objectStream = this.transferDirectoryFileService.readDncOnlineFile(dncReadFileVO);
        try (InputStream objectStream = this.transferDirectoryFileService.readDncOnlineFile(dncReadFileVO)) {
            response.setContentType("application/octet-stream; charset=UTF-8");
            response.addHeader("Expires", "0");
            response.addHeader("Pragma", "no-cache");
            response.addHeader("Cache-Control", "no-cache, no-store, must-revalidate");
            IoUtil.copy(objectStream, response.getOutputStream());
            if (objectStream != null) {
                if (0 != 0) {
                    objectStream.close();
                } else {
                    objectStream.close();
                }
            }
        } catch (IOException e) {
            e.printStackTrace();
        }
@@ -146,20 +139,14 @@
        dncReadFileVO.setFileName(fileName);
        log.error("------------------------------workstationId: {}", workstationId);
        log.error("------------------------------fileName: {}", fileName);
        try {
            InputStream objectStream = this.transferDirectoryFileService.readDncOnlineFile(dncReadFileVO);
        try (InputStream objectStream = this.transferDirectoryFileService.readDncOnlineFile(dncReadFileVO)) {
            response.setContentType("application/octet-stream; charset=UTF-8");
            response.addHeader("Expires", "0");
            response.addHeader("Pragma", "no-cache");
            response.addHeader("Cache-Control", "no-cache, no-store, must-revalidate");
            IoUtil.copy(objectStream, response.getOutputStream());
            if (objectStream != null) {
                if (0 != 0) {
                    objectStream.close();
                } else {
                    objectStream.close();
                }
            }
        } catch (IOException e) {
            e.printStackTrace();
        }
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsAbnormalController.java
@@ -16,7 +16,6 @@
@Api(value = "blade_fms_abnormal", tags = {"blade_fms_abnormal"})
@RequestMapping({"blade-fms/fms-abnormal"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/controller/FmsAbnormalController.class */
public class FmsAbnormalController extends BladeController {
    private final IFmsAbnormalService fmsAbnormalService;
    private final FmsVisualDataMessageHandler fmsVisualDataMessageHandler;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsDeviceAnalysisController.java
@@ -21,7 +21,6 @@
@Api("设备分析功能")
@ApiResource({"blade-fms/device-analysis"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/controller/FmsDeviceAnalysisController.class */
public class FmsDeviceAnalysisController extends BladeController {
    private final IFmsDeviceAnalysisService fmsDeviceAnalysisService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsInstructionRecordController.java
@@ -8,6 +8,5 @@
@Api(value = "fms-instruction-record", tags = {"fms-instruction-record"})
@RequestMapping({"blade-fms/fms-instruction-record"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/controller/FmsInstructionRecordController.class */
public class FmsInstructionRecordController extends BladeController {
}
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsProductionStatisticsController.java
@@ -19,7 +19,6 @@
@Api(tags = {"生产统计API"})
@RequestMapping({"blade-fms/produce"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/controller/FmsProductionStatisticsController.class */
public class FmsProductionStatisticsController {
    private final IFmsProductionStatisticsService fmsProductionStatisticsService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsScheduleController.java
@@ -14,7 +14,6 @@
@ApiResource({"blade-fms/schedule"})
@Api(value = "fms调度", tags = {"fms调度"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/controller/FmsScheduleController.class */
public class FmsScheduleController extends BladeController {
    private final IFmsScheduleService fmsScheduleService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsWorkStationRecordController.java
@@ -27,7 +27,6 @@
@Api(value = "工单开报工记录管理", tags = {"fms_work_station_record"})
@ApiResource({"blade-fms/order/fms-work-station-record"})
@RestController
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/controller/FmsWorkStationRecordController.class */
public class FmsWorkStationRecordController extends BladeController {
    private final IFmsWorkStationRecordService fmsWorkStationRecordService;
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java
@@ -30,7 +30,6 @@
import com.qianwen.smartman.modules.fms.vo.FmsVO;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsAbnormalServiceImpl.class */
public class FmsAbnormalServiceImpl extends BaseServiceImpl<FmsAbnormalMapper, FmsAbnormal> implements IFmsAbnormalService {
    private final IFmsOrderService fmsOrderService;
    private final IFmsInstructionRecordService fmsInstructionRecordService;
@@ -40,7 +39,7 @@
        this.fmsInstructionRecordService = fmsInstructionRecordService;
    }
    @Override // org.springblade.modules.fms.service.IFmsAbnormalService
    @Override
    public FmsVO getFms() {
        FmsVO fmsVO = new FmsVO();
        List<FmsInstructionRecordVO> instructionRecordVOList = Lists.newArrayList();
@@ -73,7 +72,7 @@
        return fmsVO;
    }
    @Override // org.springblade.modules.fms.service.IFmsAbnormalService
    @Override
    public FmsVisualDataResponseMessage pushMessage(FmsVisualDataRequestMessage visualData) {
        visualData.getFmsAreaList();
        visualData.getFmsCarryList();
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
@@ -68,7 +68,6 @@
import com.qianwen.smartman.modules.mdc.mapper.SuperAlarmMapper;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.class */
public class FmsDeviceAnalysisServiceImpl implements IFmsDeviceAnalysisService {
    private static final Logger log = LoggerFactory.getLogger(FmsDeviceAnalysisServiceImpl.class);
    private final TrayMapper trayMapper;
@@ -100,7 +99,7 @@
        this.workbenchService = workbenchService;
    }
    @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
    @Override
    public FMSWorkbenchInfoVO listFMSWorkbenchInfo(Long workstationId) {
        Workstation workstation = (Workstation) this.workstationService.getById(workstationId);
        String avatar = workstation.getAvatar();
@@ -180,7 +179,7 @@
                return v0.getId();
            }, orderIds));*/
            fmsOrders.forEach(item3 -> {
                FmsOrder fmsOrder = (FmsOrder) orderMap.put(item3.getId(), item3);
                FmsOrder fmsOrder = orderMap.put(item3.getId(), item3);
            });
        }
        Map<Long, FmsOrderProcess> orderProcessMap = new HashMap<>();
@@ -243,7 +242,7 @@
        return fmsWorkbenchInfoVO;
    }
    @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
    @Override
    public IPage<FmsAlarmVO> pageFmsAlarm(Long workstationId, Query query) {
        IPage<FmsAlarmVO> page = Condition.getPage(query);
        if (Func.isEmpty(workstationId)) {
@@ -268,7 +267,7 @@
        return page;
    }
    @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
    @Override
    public IPage<FmsWarehouseAreaTrayVO> pageTrayInfoList(Long areaId, Query query) {
        if (CommonGroupConstant.WARE_ROOT.equals(areaId)) {
            areaId = null;
@@ -283,16 +282,13 @@
        return result;
    }
    @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
    @Override
    @Transactional
    public Boolean reduction(Long areaId, String areaCode) {
        List<TrayWarehouseAreaDTO> result = this.trayMapper.getWarehouseAreaTray();
        if (Func.isNotEmpty(result)) {
            Map<String, List<String>> areaMap = result.stream().collect(Collectors.groupingBy((v0) -> {
                return v0.getAreaCode();
            }, Collectors.mapping((v0) -> {
                return v0.getTrayCode();
            }, Collectors.toList())));
            Map<String, List<String>> areaMap = result.stream().collect(Collectors.groupingBy(TrayWarehouseAreaDTO::getAreaCode, Collectors.mapping(TrayWarehouseAreaDTO::getTrayCode, Collectors.toList())));
            for (Map.Entry<String, List<String>> stringListEntry : areaMap.entrySet()) {
                this.fmsRealTimeTrayMapper.updateReduction(stringListEntry.getValue(), stringListEntry.getKey());
            }
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java
@@ -12,17 +12,12 @@
import com.qianwen.smartman.modules.fms.service.IFmsInstructionRecordService;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsInstructionRecordServiceImpl.class */
public class FmsInstructionRecordServiceImpl extends BaseServiceImpl<FmsInstructionRecordMapper, FmsInstructionRecord> implements IFmsInstructionRecordService {
    
    @Override // org.springblade.modules.fms.service.IFmsInstructionRecordService
    public FmsInstructionRecord getLastRecord() {
    @Override    public FmsInstructionRecord getLastRecord() {
        List<FmsInstructionRecord> list = list(Wrappers.<FmsInstructionRecord>lambdaQuery().orderByDesc(FmsInstructionRecord::getCreateTime));
        /*
        List<FmsInstructionRecord> list = list((Wrapper) Wrappers.lambdaQuery().orderByDesc((v0) -> {
            return v0.getCreateTime();
        }));*/
        if (Func.isNotEmpty(list)) {
            return list.get(0);
        }
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
@@ -44,7 +44,6 @@
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderProcessServiceImpl.class */
public class FmsOrderProcessServiceImpl extends BaseServiceImpl<FmsOrderProcessMapper, FmsOrderProcess> implements IFmsOrderProcessService {
    private final FmsOrderMapper fmsOrderMapper;
    private final IProductionCraftVersionService productionCraftVersionService;
@@ -67,7 +66,7 @@
        this.fmsForestClient = fmsForestClient;
    }
    @Override // org.springblade.modules.fms.service.IFmsOrderProcessService
    @Override
    public List<FmsWorkStationProcessVO> listWorkstation(String orderId) {
        List<FmsOrderProcess> fmsOrderProcesses = this.baseMapper.selectList(Wrappers.<FmsOrderProcess>query().lambda().eq(FmsOrderProcess::getOrderId, orderId));
        /*
@@ -126,7 +125,7 @@
        return fmsWorkStationProcessVOList;
    }
    @Override // org.springblade.modules.fms.service.IFmsOrderProcessService
    @Override
    public void programIssuanceDmp(ProgramIssuanceDTO programIssuanceDTO) {
        DncArtFile dncArtFile;
        String orderProcessId = programIssuanceDTO.getOrderProcessId();
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessToolServiceImpl.java
@@ -7,6 +7,5 @@
import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderProcessToolServiceImpl.class */
public class FmsOrderProcessToolServiceImpl extends BaseServiceImpl<FmsOrderProcessToolMapper, FmsOrderProcessTool> implements IFmsOrderProcessToolService {
}