appId映射修改

yangys

2024-10-24 16f093ea132a823e255f446c225ce6b63fdb9eeb

appId映射修改

 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 {//订阅了几个topic就会接收到几个，其他的不会进来
                logger.warn("topic={},msg={},无对应的处理器",topic,message.getPayload());

 collect/src/main/java/com/qianwen/mdc/collect/controller/WorkstationAppMappingController.java

ÎļþÒÑɾ³ý

 collect/src/main/java/com/qianwen/mdc/collect/entity/mgr/WorkstationAppMapping.java

ÎļþÒÑɾ³ý

 collect/src/main/java/com/qianwen/mdc/collect/mapper/mgr/WorkstationAppMappingMapper.java

ÎļþÒÑɾ³ý

 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("设备已存在锚点");

 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);
            } 
            
        }

 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: è¿™é‡Œï¼ŒåŽŸç³»ç»Ÿè¿›è¡Œäº†è¿‡æ»¤ã€‚WorkstationCollectDataServiceImpl.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中packWorkstationCalendarInfo
        //------------start
        Boolean isDefaultCalendar = true;
        boolean isDefaultCalendar = true;
        if (!"#default#".equals(pdata.getCalendarCode())) {
            CalendarShiftTimeSlicesDTO calendarShiftTimeSlicesDTO = timeSliceCache.getTimeSliceShift(pdata.getCalendarCode(), collectTime);//从redis中获得日历的时间切片
            if (ObjectUtil.isEmpty(calendarShiftTimeSlicesDTO)) {//如果没有时间切片，则使用TimeSliceCache.build(cacheBuildDTO);构建
@@ -154,7 +152,7 @@
        }
        
        //无日历切片，使用采集时间填充factoryYear，month，date，week几个属性
        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)))

 collect/src/main/java/com/qianwen/mdc/collect/service/WorkstationAppMappingService.java

ÎļþÒÑɾ³ý

 collect/src/main/resources/application-dev.yml

@@ -35,7 +35,7 @@
#iotdb ä»¥åŠå…¶jdbc一起配置
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