Browse Source

代码更新:修改生产统计数据量。

master
龚宝雄 2 years ago
parent
commit
046aafed4f
  1. 4
      lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
  2. 2
      lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/CockpitService.java
  3. 2
      lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceStatusDto.java
  4. 2
      lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/ProductionStatisticsDto.java
  5. 7
      lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java

4
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java

@ -1,5 +1,6 @@
package org.nl.wms.cockpit.rest; package org.nl.wms.cockpit.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.nl.modules.common.api.CommonResult; import org.nl.modules.common.api.CommonResult;
import org.nl.modules.common.api.RestBusinessTemplate; import org.nl.modules.common.api.RestBusinessTemplate;
@ -19,7 +20,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 大屏数据1 * 大屏数据
* *
* @author gbx * @author gbx
* @since 2023/2/27 * @since 2023/2/27
@ -29,6 +30,7 @@ import java.util.Map;
@Api(tags = "大屏数据") @Api(tags = "大屏数据")
@RequestMapping("/api/cockpit") @RequestMapping("/api/cockpit")
@Slf4j @Slf4j
@SaIgnore
public class CockpitController{ public class CockpitController{
private final CockpitService cockpitService; private final CockpitService cockpitService;

2
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/CockpitService.java

@ -9,7 +9,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
* 大屏服务接口1 * 大屏服务接口
* *
* @author gbx * @author gbx
* @date 2023-02-27 * @date 2023-02-27

2
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/DeviceStatusDto.java

@ -11,7 +11,7 @@ import java.math.BigDecimal;
/** /**
* @author gbx * @author gbx
* 设备状态1 * 设备状态
* @date 2023-02-28 * @date 2023-02-28
**/ **/
@Data @Data

2
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/ProductionStatisticsDto.java

@ -10,7 +10,7 @@ import java.math.BigDecimal;
/** /**
* @author gbx * @author gbx
* 成品完成情况1 * 成品完成情况
* @since 2023/2/27 * @since 2023/2/27
*/ */
@Data @Data

7
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java

@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
/** /**
* 大屏服务实现1 * 大屏服务实现
* *
* @author gbx * @author gbx
* @date 2023-02-27 * @date 2023-02-27
@ -281,8 +281,9 @@ public class CockpitServiceImpl implements CockpitService{
runningStatusList.add(DeviceStatisticsDto.builder().workorder_procedure("包装").deviceQty(9).faultyDevice(3).build()); runningStatusList.add(DeviceStatisticsDto.builder().workorder_procedure("包装").deviceQty(9).faultyDevice(3).build());
//近一个月故障次数 //近一个月故障次数
List<DeviceStatisticsDto> faultyStatusList = new ArrayList<>(); List<DeviceStatisticsDto> faultyStatusList = new ArrayList<>();
faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机4").faultyFrequency(91).build()); faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机4").faultyFrequency(90).build());
faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机9").faultyFrequency(82).build()); faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机9").faultyFrequency(85).build());
faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机11").faultyFrequency(83).build());
faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("混料机5").faultyFrequency(71).build()); faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("混料机5").faultyFrequency(71).build());
faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机3").faultyFrequency(33).build()); faultyStatusList.add(DeviceStatisticsDto.builder().deviceName("压制机3").faultyFrequency(33).build());
//最近5个故障设备 //最近5个故障设备

Loading…
Cancel
Save