From 444b1808d73d21f9df361e64f44381b910947792 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 27 九月 2024 11:05:08 +0800
Subject: [PATCH] 去掉tdedgine，去掉一部分rocketmq，去掉dmplog模块
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
index d6d7c6d..0ce4edc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
@@ -3,12 +3,15 @@
import cn.hutool.core.lang.Tuple;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -74,25 +77,36 @@
import com.qianwen.smartman.modules.mdc.vo.WorkstationShiftSearchVO;
import com.qianwen.smartman.modules.mdc.vo.excel.ProcessParamExcelVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@Service
public class ProcessParameterServiceImpl implements IProcessParameterService {
private static final Logger log = LoggerFactory.getLogger(ProcessParameterServiceImpl.class);
- private final SuperCollectJsonMapper collectJsonMapper;
- private final IWorkstationService workstationService;
- private final OssBuilder ossBuilder;
- private final SuperProcessParameterMapper parameterMapper;
- private final ICalendarService calendarService;
-
+ @Autowired
+ private SuperCollectJsonMapper collectJsonMapper;
+ @Autowired
+ private IWorkstationService workstationService;
+ @Autowired
+ private OssBuilder ossBuilder;
+ @Autowired
+ private SuperProcessParameterMapper parameterMapper;
+ @Autowired
+ private ICalendarService calendarService;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+ /*
public ProcessParameterServiceImpl(final SuperCollectJsonMapper collectJsonMapper, final IWorkstationService workstationService, final OssBuilder ossBuilder, final SuperProcessParameterMapper parameterMapper, final ICalendarService calendarService) {
this.collectJsonMapper = collectJsonMapper;
this.workstationService = workstationService;
this.ossBuilder = ossBuilder;
this.parameterMapper = parameterMapper;
this.calendarService = calendarService;
- }
+ }*/
@Override
public ProcessParameterResVO queryProcessParameterChart(ProcessParameterSearchVO vo) {
@@ -652,6 +666,7 @@
return vos;
}
+ /*
@Override
public List<WorkstationCollectData> lastParameter(long workstationId) {
//yys
@@ -672,7 +687,7 @@
});
return result;
- }
+ }*/
/**
* 鑾峰彇宸ヤ綅鏈�鏂板弬鏁板��
@@ -731,4 +746,21 @@
return vo;
}
+
+ @DS("iotdb")
+ @Override
+ public List<WorkstationCollectData> queryLastParameter(long workstationId) {
+ String sql ="select max_time(n) as ts,last_value(n) as n,last_value(v) as v,last_value(workstation_id) as workstationId from root.f2.process_param_"+workstationId+"_* align by device";
+ List<WorkstationCollectData> list = jdbcTemplate.query(sql, new RowMapper<WorkstationCollectData>() {
+
+ @Override
+ public WorkstationCollectData mapRow(ResultSet rs, int rowNum) throws SQLException {
+ WorkstationCollectData data = WorkstationCollectData.builder().ts(rs.getLong("ts")).n(rs.getString("n")).v(rs.getString("v")).workstationId(workstationId).build();
+
+ return data;
+ }
+
+ });
+ return list;
+ }
}
--
Gitblit v1.9.3