From 16f093ea132a823e255f446c225ce6b63fdb9eeb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 24 十月 2024 10:15:46 +0800
Subject: [PATCH] appId映射修改
---
/dev/null | 62 -------------------------------
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java | 8 ++--
collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java | 6 +--
collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java | 5 +-
collect/src/main/resources/application-dev.yml | 2
collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java | 6 --
6 files changed, 11 insertions(+), 78 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java b/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java
index 21800ca..e96c3f6 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java
@@ -24,7 +24,6 @@
import com.alibaba.fastjson.JSONObject;
import com.qianwen.mdc.collect.service.DeviceStateFixPointService;
import com.qianwen.mdc.collect.service.IOTMqttReceiveService;
-import com.qianwen.mdc.collect.service.WorkstationAppMappingService;
import com.qianwen.mdc.collect.service.WorkstationDatapointsService;
import com.qianwen.mdc.collect.service.feedback.WorkstationFeedbackService;
@@ -48,8 +47,6 @@
private DeviceStateFixPointService stateFixPointService;
@Autowired
private WorkstationFeedbackService workstationFeedbackService;
- @Autowired
- private WorkstationAppMappingService workstationAppMappingService;
@Autowired
private WorkstationDatapointsService dpService;
@@ -134,11 +131,10 @@
}else if(WORKSTATION_DATAPOINT_CHANGED_TOPIC.equals(topic)) {
String payload = (String)message.getPayload();
logger.info("宸ヤ綅appId鏄犲皠鍙樺寲娑堟伅={}",payload);
- workstationAppMappingService.saveToCache();
+ //workstationAppMappingService.saveToCache();
//娓呴櫎璇ュ伐浣嶇殑鏁版嵁鐐圭紦瀛�
JSONObject payloadObj = JSONObject.parseObject(payload);
//payloadObj.getLong("workstationId");
-
dpService.datapointsCacheEvict(payloadObj.getString("appId"));
} else {//璁㈤槄浜嗗嚑涓猼opic灏变細鎺ユ敹鍒板嚑涓紝鍏朵粬鐨勪笉浼氳繘鏉�
logger.warn("topic={},msg={},鏃犲搴旂殑澶勭悊鍣�",topic,message.getPayload());
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/controller/WorkstationAppMappingController.java b/collect/src/main/java/com/qianwen/mdc/collect/controller/WorkstationAppMappingController.java
deleted file mode 100644
index 3f1f603..0000000
--- a/collect/src/main/java/com/qianwen/mdc/collect/controller/WorkstationAppMappingController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.qianwen.mdc.collect.controller;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.qianwen.mdc.collect.common.OpResult;
-import com.qianwen.mdc.collect.entity.mgr.WorkstationAppMapping;
-import com.qianwen.mdc.collect.service.WorkstationAppMappingService;
-
-@RequestMapping("/workstation/appmapping")
-@RestController()
-public class WorkstationAppMappingController {
- Logger log = LoggerFactory.getLogger(this.getClass());
- @Autowired
- private WorkstationAppMappingService mappingService;;
-
-
-
- @PostMapping("create")
- public OpResult<Void> create(WorkstationAppMapping mapping) {
- try {
- mappingService.save(mapping);
- }catch(Exception e) {
- log.error("鏂板鏄犲皠澶辫触,",e);
- return OpResult.fail(e.getMessage());
- }
- return OpResult.success();
-
-
- }
-
- @PostMapping("update")
- public OpResult<Void> update(WorkstationAppMapping mapping) {
- try {
- mappingService.update(mapping);
- }catch(Exception e) {
- log.error("淇敼鏄犲皠澶辫触,",e);
- return OpResult.fail(e.getMessage());
- }
- mappingService.update(mapping);
- return OpResult.success();
-
- }
-
- @PostMapping("delete")
- public OpResult<Void> delete(long id) {
- try {
- mappingService.remove(id);
- }catch(Exception e) {
- log.error("鍒犻櫎鏄犲皠澶辫触,",e);
- return OpResult.fail(e.getMessage());
- }
-
- return OpResult.success();
-
- }
-
- @GetMapping("/saveCache")
- public void testsSaveCache() {
- mappingService.saveToCache();
- }
-
-
-}
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/entity/mgr/WorkstationAppMapping.java b/collect/src/main/java/com/qianwen/mdc/collect/entity/mgr/WorkstationAppMapping.java
deleted file mode 100644
index 076af2e..0000000
--- a/collect/src/main/java/com/qianwen/mdc/collect/entity/mgr/WorkstationAppMapping.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.qianwen.mdc.collect.entity.mgr;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-@TableName( "workstation_app_mapping")
-public class WorkstationAppMapping implements Serializable {
-
- /**
- * id
- */
- //@TableId(type=IdType.ASSIGN_ID)
- //private Long id;
-
-
- // @TableField("workstation_id")
- @TableId(type=IdType.ASSIGN_ID)
- private long workstationId;
-
- /**
- * IOTDB涓殑appid
- */
- @TableField("app_id")
- private String appId;
-
- private static final long serialVersionUID = 1L;
- /*
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }*/
-
- public long getWorkstationId() {
- return workstationId;
- }
-
- public void setWorkstationId(long workstationId) {
- this.workstationId = workstationId;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public void setAppId(String appId) {
- this.appId = appId;
- }
-
-
-}
\ No newline at end of file
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/mapper/mgr/WorkstationAppMappingMapper.java b/collect/src/main/java/com/qianwen/mdc/collect/mapper/mgr/WorkstationAppMappingMapper.java
deleted file mode 100644
index ba29ae2..0000000
--- a/collect/src/main/java/com/qianwen/mdc/collect/mapper/mgr/WorkstationAppMappingMapper.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.qianwen.mdc.collect.mapper.mgr;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qianwen.mdc.collect.entity.mgr.WorkstationAppMapping;
-
-public interface WorkstationAppMappingMapper extends BaseMapper<WorkstationAppMapping> {
-
-}
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java b/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java
index e97e613..771affd 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java
@@ -1,6 +1,8 @@
package com.qianwen.mdc.collect.runner;
import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,8 +17,6 @@
import com.qianwen.mdc.collect.dto.CacheBuildDTO;
import com.qianwen.mdc.collect.mapper.iotdb.DeviceStateMapper;
import com.qianwen.mdc.collect.service.DeviceStateFixPointService;
-import com.qianwen.mdc.collect.service.WorkstationAppMappingService;
-
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
@@ -61,6 +61,7 @@
//if (count <= 0) {
log.info("璁惧鏈墦杩囬敋鐐�,鍚姩鏃舵墦鐐�....... ");
//this.workStationStateFixPointService.workStationStateFixPoint(dateTime, null);
+ //List<String> wids = Arrays.asList("1656819188967653378");
stateFixPointService.deviceStateFixPoint(dateTime, null);
}else {
log.info("璁惧宸插瓨鍦ㄩ敋鐐�");
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java
index ada6c51..9301b0c 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java
@@ -202,17 +202,17 @@
tablet.addValue("rps", i, state.getRps());
tablet.addValue("is_fix_point", i, state.getIsFixPoint());
tablet.addValue("is_sync", i, state.getIsSync());
- tablet.addValue("is_plan", i, state.getIsPlan());
+ tablet.addValue("is_plan", i, state.getIsPlan()==null ? -1 : state.getIsPlan());
tablet.addValue("feedback_point_type", i, state.getFeedbackPointType());
- tablet.addValue("feedback_id", i, state.getFeedbackId());
+ tablet.addValue("feedback_id", i, state.getFeedbackId() == null?0:state.getFeedbackId());
tablet.addValue("is_deleted", i, state.getIsDeleted());
- tablet.addValue("employee_id", i, state.getEmployeeId());
+ tablet.addValue("employee_id", i, state.getEmployeeId() == null?0:state.getEmployeeId());
}
try {
this.iotdbConfig.getSessionPool().insertAlignedTablet(tablet);
} catch (Exception e) {
- log.error("淇濆瓨鍥哄畾鐐规暟鎹紓甯�",e);
+ log.error("淇濆瓨state鍥哄畾鐐规暟鎹紓甯�",e);
}
}
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
index 2e5d115..d4fde60 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
@@ -92,7 +92,6 @@
String[] keys = map.keySet().toArray(new String[0]);
for (int j = 0; j < keys.length; j++) {
- //TODO: 杩欓噷锛屽師绯荤粺杩涜浜嗚繃婊ゃ�俉orkstationCollectDataServiceImpl.handlerWorkstationCollectData閲�
PackedTelemetryData pkData = new PackedTelemetryData();
pkData.setWorkstationId(tdata.getWorkstationId());
@@ -102,7 +101,6 @@
pkData.setName(keys[j]);//鏁版嵁鐐瑰悕绉�
fillByCalendar(pkData);
-
result.add(pkData);
}
@@ -138,7 +136,7 @@
// TelemetryPropertyWrapper涓璸ackWorkstationCalendarInfo
//------------start
- Boolean isDefaultCalendar = true;
+ boolean isDefaultCalendar = true;
if (!"#default#".equals(pdata.getCalendarCode())) {
CalendarShiftTimeSlicesDTO calendarShiftTimeSlicesDTO = timeSliceCache.getTimeSliceShift(pdata.getCalendarCode(), collectTime);//浠巖edis涓幏寰楁棩鍘嗙殑鏃堕棿鍒囩墖
if (ObjectUtil.isEmpty(calendarShiftTimeSlicesDTO)) {//濡傛灉娌℃湁鏃堕棿鍒囩墖锛屽垯浣跨敤TimeSliceCache.build(cacheBuildDTO);鏋勫缓
@@ -154,7 +152,7 @@
}
//鏃犳棩鍘嗗垏鐗囷紝浣跨敤閲囬泦鏃堕棿濉厖factoryYear锛宮onth锛宒ate锛寃eek鍑犱釜灞炴��
- if (isDefaultCalendar.booleanValue()) {
+ if (isDefaultCalendar) {
log.info("鏃犳棩鍘嗗垏鐗�");
LocalDate localDate = Instant.ofEpochMilli(pdata.getTime().longValue()).atZone(ZoneOffset.systemDefault()).toLocalDate();
pdata.setFactoryDate(Integer.valueOf(DatePattern.PURE_DATE_FORMAT.format(collectTime)))
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationAppMappingService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationAppMappingService.java
deleted file mode 100644
index df63146..0000000
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationAppMappingService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.qianwen.mdc.collect.service;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qianwen.mdc.collect.entity.mgr.WorkstationAppMapping;
-import com.qianwen.mdc.collect.mapper.mgr.WorkstationAppMappingMapper;
-import com.qianwen.mdc.collect.utils.redis.RedisUtil;
-
-@Service
-public class WorkstationAppMappingService{
- private static final Logger log = LoggerFactory.getLogger(WorkstationAppMappingService.class);
-
- public static final String MAPPING_REDIS_KEY = "workstation-appid-map";
-
- @Autowired
- private WorkstationAppMappingMapper mapper;
- @Autowired
- private RedisUtil redisUtil;
-
- @Transactional
- public void save(WorkstationAppMapping mapping) {
- mapper.insert(mapping);
- }
-
- @Transactional
- public void update(WorkstationAppMapping mapping) {
- mapper.updateById(mapping);
- }
- @Transactional
- public void remove(long id) {
- mapper.deleteById(id);
- }
-
-
- /**
- * 鎵�鏈夋暟鎹殑鍒楄〃
- * @return
- */
- public List<WorkstationAppMapping> allList(){
- return mapper.selectList(Wrappers.emptyWrapper());
- }
-
-
- /**
- * 灏嗘墍鏈夋槧灏勬暟鎹兘淇濆瓨鍒皉edis缂撳瓨锛寋appId1=workstationId1,appId2=workstationId2}
- */
- public void saveToCache() {
- List<WorkstationAppMapping> list = allList();
- redisUtil.del(MAPPING_REDIS_KEY);
- list.forEach(m ->{
- redisUtil.hset(MAPPING_REDIS_KEY, m.getAppId(), m.getWorkstationId());
- });
- }
-
-}
diff --git a/collect/src/main/resources/application-dev.yml b/collect/src/main/resources/application-dev.yml
index afd9ca6..72fb9ac 100644
--- a/collect/src/main/resources/application-dev.yml
+++ b/collect/src/main/resources/application-dev.yml
@@ -35,7 +35,7 @@
#iotdb 浠ュ強鍏秊dbc涓�璧烽厤缃�
iotdb:
driver: org.apache.iotdb.jdbc.IoTDBDriver
- host: localhost #120.46.212.231
+ host: 120.46.212.231 #120.46.212.231 localhost
port: 6667
maxSize: 100
username: root
--
Gitblit v1.9.3