lyh
2025-02-14 f2f8241dd52ef12ec109f6f4f0f13042055338ac
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
@@ -19,6 +19,9 @@
import org.jeecg.modules.dnc.utils.file.FileUtilS;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -39,6 +42,10 @@
    private String localFilePath;
    @Autowired
    private IDncPassLogService dncPassLogService;
    @Autowired
    private IMdcEquipmentService iMdcEquipmentService;
    @Autowired
    private IMdcProductionService iMdcProductionService;
    @Override
@@ -80,11 +87,12 @@
        if (b && docRel) {
            DocInfo info = docInfoMapper.selectById(docId);
            DeviceInfo deviceInfo = deviceInfoService.getById(attrId);
            List<String> strings =  deviceGroupService.findListParentTreeAll(deviceInfo.getGroupId());
            //todo 修改为mdc设备
            MdcEquipment mdcEquipment=iMdcEquipmentService.getById(attrId);
            List<String> strings =  iMdcProductionService.findListParentTreeAll(mdcEquipment.getId());
            if (strings != null && !strings.isEmpty()) {
                String path = StringUtils.join(strings.toArray(), "/");
                boolean deleteFile = FileUtilS.deleteFilePathZip(path + "/"+ deviceInfo.getDeviceNo(),
                boolean deleteFile = FileUtilS.deleteFilePathZip(path + "/"+ mdcEquipment.getEquipmentId(),
                        info.getDocName(), info.getDocSuffix());
                if (!deleteFile) {
                    return false;
@@ -110,8 +118,8 @@
                //处理文件名称  文件路径
                NcTxtFilePathInfo ncTxt = new NcTxtFilePathInfo();
                ncTxt.setEquipmentId(deviceInfo.getDeviceNo());
                ncTxt.setFilePath(path + "/"+ deviceInfo.getDeviceNo() + "/" );
                ncTxt.setEquipmentId(mdcEquipment.getEquipmentId());
                ncTxt.setFilePath(path + "/"+ mdcEquipment.getEquipmentId() + "/" );
                ncTxt.setFileTxtName("02A"+DateUtil.format(DateUtil.getNow(),DateUtil.STR_YEARMONTHDAY)+sequence);
                ncTxt.setOrigFileName(info.getDocName());
                ncTxt.setOrigFileSuffix(info.getDocSuffix());
@@ -150,7 +158,7 @@
    @Override
    @Transactional(rollbackFor = {Exception.class})
    public List<DeviceInfo> findDeviceByDocId(String docId) {
    public List<MdcEquipment> findDeviceByDocId(String docId) {
        if(!ValidateUtil.validateString(docId))
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        return super.getBaseMapper().findDeviceByDocId(docId);