diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java index b28093e5..a24c6656 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java @@ -14,6 +14,7 @@ import com.chanko.yunxi.mes.module.heli.service.dataacquisition.DataAcquisitionS import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -91,7 +92,7 @@ public class DataAcquisitionController { BeanUtils.toBean(list, DataAcquisitionRespVO.class)); } -// @Scheduled(cron = "0/5 * * * * ?") + @Scheduled(cron = "0/5 * * * * ?") public void updateDataCollection(){ dataAcquisitionService.updateDataCollection(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java index 26692b88..94daf592 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java @@ -158,7 +158,7 @@ public class StorageLogServiceImpl implements StorageLogService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MaterialDO::getStatus, 1); queryWrapper.like(logDO.getMatName() != null, MaterialDO::getName, logDO.getMatName()); - queryWrapper.like(logDO.getMatSpec() != null, MaterialDO::getSpec, logDO.getMatSpec()); +// queryWrapper.like(logDO.getMatSpec() != null, MaterialDO::getSpec, logDO.getMatSpec()); List materialDOS = materialMapper.selectList(queryWrapper); logDO.setMaterialDOList(materialDOS); if (idSet.contains(logDO.getId()) && materialDOS.size() == 1) { diff --git a/mes-ui/mes-echarts/src/utils/requestConfig.js b/mes-ui/mes-echarts/src/utils/requestConfig.js index e669b463..8f08e240 100644 --- a/mes-ui/mes-echarts/src/utils/requestConfig.js +++ b/mes-ui/mes-echarts/src/utils/requestConfig.js @@ -10,6 +10,6 @@ const devBaseURL = 'http://218.75.46.166:8889' // const proBaseURL = 'http://192.168.0.169:9002/' // const devBaseURL = 'http://218.75.46.166:8889/' const proBaseURL = 'http://218.75.46.166:8889/' -export const BASE_URL = process.env.NODE_ENV === 'development' ? devBaseURL : proBaseURL +export const BASE_URL = process.env.NODE_ENV === 'development' ? devBaseURL : devBaseURL export const TIMEOUT = 5000