root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 马钢看板v2,获取压机设备数据

Browse Source
This commit is contained in:
liyongde
2024-07-29 10:32:16 +08:00
parent ca0ec38b1a
commit 49c5107d38
3 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java
View File

@@ -32,6 +32,7 @@ public class CockPitController {
}
@PostMapping("/v2/press")
@Log("压制看板")
@SaIgnore
public ResponseEntity<Object> PressedMonitorV2() {
return new ResponseEntity<>(cockpitService.PressedMonitorV2(), HttpStatus.OK);
}

25
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -132,18 +132,21 @@ public class CockpitServiceImpl implements CockpitService {
.stream()
.map(p -> DeviceInfoDto.buildDevice(p.getPoint_code()))
.collect(Collectors.toList());
// AcsResponse statusByCode = wmsToAcsService.getDeviceStatusByCode(deviceCodes);
AcsResponse statusByCode = wmsToAcsService.getDeviceStatusByCode(deviceCodes);
List<PressDeviceInfoVo> allPressInfo = cockPitMapper.getAllPressInfo(dayShift);
// 便利allPressInfo 赋值
// if (HttpStatus.HTTP_OK == statusByCode.getCode()) {
// JSONArray datas = statusByCode.getData();
// JSONObject data = datas.getJSONObject(0);
// // 赋值
// allPressInfo.forEach(pi -> {
// pi.setPoint_status(data.getString("status"));
// pi.setBlj_weight(data.getString("remainingweight"));
// });
// }
if (HttpStatus.HTTP_OK == statusByCode.getCode()) {
JSONArray datas = statusByCode.getData();
// 赋值
allPressInfo.forEach(pi -> {
// 根据code从datas获取数据
JSONObject data = (JSONObject) datas.stream()
.filter(o -> ((JSONObject) o).getString("device_code").equals(pi.getPoint_code()))
.findFirst().orElse(new JSONObject());
pi.setPoint_status(data.getString("status"));
pi.setBlj_weight(data.getString("remainingweight"));
});
}
return allPressInfo;
}, pool);
pressDeviceInfoVoListFuture.thenAccept(result -> {
@@ -194,7 +197,7 @@ public class CockpitServiceImpl implements CockpitService {
// 泥料数据
List<LoamInfoVo> loamInfoVos = cockPitMapper.getAllDayLoamsInfo();
// 泥料种类
long count = loamInfoVos.stream().distinct().count();
long count = loamInfoVos.stream().map(LoamInfoVo::getRedundance_material_code).distinct().count();
// 重量之和
double sum = loamInfoVos.stream().mapToDouble(p -> Double.parseDouble(p.getMaterial_weight())).sum();
res.put("dataInfo", loamInfoVos);

77
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -227,22 +227,87 @@ https://juejin.cn/post/6844903775631572999
<!--测试环境:打印控制台-->
<springProfile name="test">
<root level="INFO">
<root level="info">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="CONSOLE"/>
</root>
<logger name="jdbc.audit" level="ERROR" additivity="true">
<logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="ERROR" additivity="false">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.redisson.command.RedisExecutor" level="ERROR" additivity="false">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.reflections.Reflections" level="ERROR" additivity="false">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.redisson.connection.ClientConnectionsEntry" level="ERROR" additivity="false">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.mybatis.spring.mapper.ClassPathMapperScanner" level="ERROR" additivity="false">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.nl.config.thread.ThreadMonitorCollector" level="ERROR" additivity="false">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.springframework" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.resultset" level="ERROR" additivity="true">
<logger name="com.baomidou.dynamic.datasource.DynamicRoutingDataSource" level="INFO" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="springfox.documentation" level="ERROR" additivity="true">
<logger name="org.redisson.connection.pool.MasterPubSubConnectionPool" level="INFO" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.resultsettable" level="ERROR" additivity="true">
<logger name="org.redisson.connection.pool.MasterConnectionPool" level="INFO" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.sqlonly" level="ERROR" additivity="true">
<logger name="org.redisson.Version" level="INFO" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="com.alibaba.druid.pool.DruidDataSource" level="INFO" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.nl.config.RedisConfig" level="INFO" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.apache" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="io.netty" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="io.lettuce" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="com.fasterxml" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.quartz" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="com.google" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="springfox" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="log4jdbc" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="nl.basjes" level="ERROR" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
</springProfile>