From afeedb200d9620c7926003bc387b952111af9142 Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Thu, 7 Mar 2024 10:01:55 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A4=A7=E5=B1=8F=E3=80=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E3=80=81=E5=BC=B9=E7=AA=97=E6=8E=A5=E5=8F=A3=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/controller/CockPitController.java | 14 +-- .../cockpit/service/dao/ErrorRecordVo.java | 15 +++ .../nl/wms/cockpit/service/dao/MixingVo.java | 4 +- .../service/dao/PressProductHeaderVo.java | 3 +- .../cockpit/service/dao/ProductTaskVo.java | 1 + .../service/impl/CockpitServiceImpl.java | 24 +++-- .../cockpit/service/mapper/CockPitMapper.java | 1 + .../cockpit/service/mapper/CockPitMapper.xml | 100 +++++++++--------- .../service/IDasDeviceErrorRecordService.java | 2 +- .../IDasDeviceErrorRecordServiceImpl.java | 7 -- .../main/resources/config/application-dev.yml | 2 +- 11 files changed, 98 insertions(+), 75 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ErrorRecordVo.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java index 16641a5..310bbc1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java @@ -22,7 +22,7 @@ import java.util.Map; */ @Slf4j @RestController -@Api(tags = "看板接口") +@Api(tags = "大屏接口") @RequestMapping("/api/cockpit") @SaIgnore public class CockPitController { @@ -30,7 +30,7 @@ public class CockPitController { @Autowired private CockpitService cockpitService; - @GetMapping("/press") + @PostMapping("/press") @Log("压制看板") @ApiOperation("压制看板") public ResponseEntity pressedMonitor(){ @@ -38,21 +38,21 @@ public class CockPitController { } - @GetMapping("/sorting") + @PostMapping("/sorting") @Log("分拣看板") @ApiOperation("分拣看板") public ResponseEntity sortingMonitor(){ return new ResponseEntity<>(cockpitService.sortingMonitor(), HttpStatus.OK); } - @GetMapping("/screenTableData") + @PostMapping("/screenTableData") @Log("大屏-两侧图表") @ApiOperation("大屏-两侧图表") public ResponseEntity screenLeftData(){ return new ResponseEntity<>(cockpitService.screenTableData(), HttpStatus.OK); } - @GetMapping("/deviceCondition") + @PostMapping("/deviceCondition") @Log("大屏-中间设备运行情况") @ApiOperation("大屏-中间设备运行情况") public ResponseEntity deviceCondition(){ @@ -66,13 +66,13 @@ public class CockPitController { // return new ResponseEntity<>(cockpitService.selectMixingDetail(whereJson), HttpStatus.OK); // } - @GetMapping("/inOutKilnDetail") + @PostMapping("/inOutKilnDetail") @Log("出、入窑输送线弹窗") @ApiOperation("出、入窑输送线弹窗") public ResponseEntity selectInOutKilnDetail(){ return new ResponseEntity<>(cockpitService.selectInOutKilnDetail(), HttpStatus.OK); } - @GetMapping("/kilnDetail") + @PostMapping("/kilnDetail") @Log("窑弹出框") @ApiOperation("窑弹出框") public ResponseEntity selectKilnDetail(){ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ErrorRecordVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ErrorRecordVo.java new file mode 100644 index 0000000..ced52e5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ErrorRecordVo.java @@ -0,0 +1,15 @@ +package org.nl.wms.cockpit.service.dao; + +import lombok.Data; + +/** + * @author Administrator + * 设备报警信息 + */ +@Data +public class ErrorRecordVo { + private String deviceCode; + private String deviceName; + private String errorInfo; + private String errorTime; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingVo.java index 2649b70..dd37bcd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MixingVo.java @@ -8,6 +8,6 @@ import lombok.Data; @Data public class MixingVo { private String materialName; - private String planWeight; - private String realWeight; + private String planQty; + private String realQty; } \ No newline at end of file diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PressProductHeaderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PressProductHeaderVo.java index 3453fae..044e7e8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PressProductHeaderVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/PressProductHeaderVo.java @@ -15,7 +15,8 @@ public class PressProductHeaderVo { private String qualifiedQty; private String team; - public String getaTeam() { + public String getTeam() { return "白班"; } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ProductTaskVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ProductTaskVo.java index 0537189..b1977ea 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ProductTaskVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ProductTaskVo.java @@ -13,6 +13,7 @@ public class ProductTaskVo { private String workorderCode; private String team; private String materialName; + private String customer; private String planproducestartDate; private String planQty; private String realQty; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 8139515..d373b52 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -48,10 +48,10 @@ public class CockpitServiceImpl implements CockpitService { CompletableFuture> listCompletableFuture = CompletableFuture.supplyAsync( () -> cockPitMapper.getPressProductHeaderList(), pool); listCompletableFuture.thenAccept(result -> { - map.put("DayShiftList", result); + map.put("DayShiftInfo", result); }).exceptionally((e) -> { log.error("获取当班信息: {}", e.getMessage(), e); - map.put("DayShiftList", null); + map.put("DayShiftInfo", null); return null; }); // 2、当班生产 @@ -248,8 +248,8 @@ public class CockpitServiceImpl implements CockpitService { }); //设备报警信息 - CompletableFuture> errorRecordCompletableFuture = CompletableFuture.supplyAsync( - () -> dasDeviceErrorRecordService.queryRecord(), pool); + CompletableFuture> errorRecordCompletableFuture = CompletableFuture.supplyAsync( + () -> cockPitMapper.queryRecord(), pool); errorRecordCompletableFuture.thenAccept(result -> { resultMap.put("deviceErrorRecordList", result); }).exceptionally((e) -> { @@ -283,7 +283,7 @@ public class CockpitServiceImpl implements CockpitService { CompletableFuture stackingPositionTask = CompletableFuture.supplyAsync(() -> { List points = cockPitMapper.selectYzPoint(); if (points.isEmpty()) { - throw new RuntimeException("压制码垛位点位为空"); + return null; } JSONArray param = new JSONArray(Collections.singletonList(points)); AcsResponse deviceStatus = wmsToAcsService.getDeviceStatus(param); @@ -321,7 +321,7 @@ public class CockpitServiceImpl implements CockpitService { CompletableFuture pressMachineTask = CompletableFuture.supplyAsync(() -> { List yjPoints = cockPitMapper.selectYjPoint(); if (yjPoints.isEmpty()) { - throw new RuntimeException("压机点位为空"); + return null; } JSONArray yjPointsParam = new JSONArray(Collections.singletonList(yjPoints)); AcsResponse yjStatus = wmsToAcsService.getDeviceStatus(yjPointsParam); @@ -347,7 +347,7 @@ public class CockpitServiceImpl implements CockpitService { CompletableFuture mixMachineTask = CompletableFuture.supplyAsync(() -> { List hnjPoints = cockPitMapper.selectHnjPoints(); if (hnjPoints.isEmpty()) { - throw new RuntimeException("设备点位为空"); + return null; } JSONArray hnjPointsParam = new JSONArray(Collections.singletonList(hnjPoints)); AcsResponse hnjStatus = wmsToAcsService.getDeviceStatus(hnjPointsParam); @@ -393,7 +393,7 @@ public class CockpitServiceImpl implements CockpitService { CompletableFuture manipulatorInfoTask = CompletableFuture.supplyAsync(() -> { List jxsPoints = cockPitMapper.selectJxsPoints(); if (jxsPoints.isEmpty()) { - throw new RuntimeException("设备点位为空"); + return null; } JSONArray jxsPointsParam = new JSONArray(Collections.singletonList(jxsPoints)); AcsResponse jxsStatus = wmsToAcsService.getDeviceStatus(jxsPointsParam); @@ -416,6 +416,8 @@ public class CockpitServiceImpl implements CockpitService { List fjcmdPoints = new ArrayList<>(); fjcmdPoints.add("FJ01CDW01"); fjcmdPoints.add("FJ01CDW02"); + fjcmdPoints.add("FJ01MDW01"); + fjcmdPoints.add("FJ01MDW02"); JSONArray fjcmdPointsParam = new JSONArray(Collections.singletonList(fjcmdPoints)); AcsResponse fjcmdStatus = wmsToAcsService.getDeviceStatus(fjcmdPointsParam); JSONArray fjcmdData = ObjectUtil.isNotEmpty(fjcmdStatus) ? fjcmdStatus.getData() : fjcmdPointsParam; @@ -483,6 +485,12 @@ public class CockpitServiceImpl implements CockpitService { @Override public List selectInOutKilnDetail() { +// List points = new ArrayList<>(); +// points.add("RYHCX01"); +// points.add("CYHCX01"); +// JSONArray pointsParam = new JSONArray(Collections.singletonList(points)); +// AcsResponse response = wmsToAcsService.getDeviceStatus(pointsParam); +// JSONArray data = ObjectUtil.isNotEmpty(response) ? response.getData() : pointsParam; //todo 确定每托盘数量 List res = new ArrayList<>(); InOutKilnVo in = cockPitMapper.selectInKilnInfo(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java index 75e0215..66647b1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java @@ -50,4 +50,5 @@ public interface CockPitMapper { List selectJxsPoints(); + List queryRecord(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml index 450262a..8c04bac 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml @@ -60,31 +60,29 @@ END AS workorderStatus, w.operator, IF(LENGTH(w.realproducestart_date) > 0, w.realproducestart_date, '-') AS realproducestartDate, - IF(LENGTH(w.realproduceend_date) > 0, w.realproduceend_date, '-') AS realproduceendDate + IF(LENGTH(w.realproduceend_date) > 0, w.realproduceend_date, '-') AS realproduceendDate, + c.cust_name as customer FROM `pdm_bd_workorder` w LEFT JOIN md_base_material m ON m.material_id = w.material_id + LEFT JOIN md_cs_customerbase c ON w.customer = c.cust_id WHERE w.region_code = 'YZ' ORDER BY w.team DESC, w.workorder_status SELECT m.material_name AS materialName, - SUM(w.plan_weight) AS planWeight, - SUM(w.real_weight) AS realWeight + SUM(w.plan_qty) AS planQty, + SUM(w.real_qty) AS realQty FROM pdm_bd_workorder w LEFT JOIN md_base_material m ON m.material_id = w.material_id WHERE w.region_code = 'HN' @@ -146,14 +147,11 @@ + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java index 378280c..bdda9bb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/IDasDeviceErrorRecordService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.cockpit.service.dao.DeviceErrorVo; +import org.nl.wms.cockpit.service.dao.ErrorRecordVo; import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; @@ -29,5 +30,4 @@ public interface IDasDeviceErrorRecordService extends IService queryErrorVo(); - List queryRecord(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java index ab90d69..613c998 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/impl/IDasDeviceErrorRecordServiceImpl.java @@ -51,11 +51,4 @@ public class IDasDeviceErrorRecordServiceImpl extends ServiceImpl queryRecord() { - LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - lam.orderByDesc(DasDeviceErrorRecord::getRecord_time); - lam.last("LIMIT 100"); - return dasDeviceCheckRecordMapper.selectList(lam); - } } diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 08fbc85..4b9b037 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -15,7 +15,7 @@ spring: # password: ${DB_PWD:123456} url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ndhh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:12356} + password: ${DB_PWD:123456} type: com.alibaba.druid.pool.DruidDataSource redis: #数据库索引