From 0b5340c35d91c44f63625b4380b463525b6ec950 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 10 十月 2024 00:30:43 +0800
Subject: [PATCH] appId同步
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsVO.java | 12 ++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java | 30 +++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationDatapoints.java | 15 ++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationAppMapping.java | 59 +++++++++++++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/WorkstationAppMappingMapper.java | 9 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsSubmitVO.java | 10 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java | 1
7 files changed, 132 insertions(+), 4 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationAppMapping.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationAppMapping.java
new file mode 100644
index 0000000..9e52a42
--- /dev/null
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationAppMapping.java
@@ -0,0 +1,59 @@
+package com.qianwen.smartman.modules.cps.entity;
+
+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/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationDatapoints.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationDatapoints.java
index 03e7deb..f2d7296 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationDatapoints.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/WorkstationDatapoints.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.qianwen.core.mp.base.BaseEntity;
-import com.qianwen.core.tenant.mp.TenantEntity;
import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +24,11 @@
*/
private long workstationId;
-
+ /**
+ * IOT骞冲彴appId
+ */
+ private String appId;
+
public Integer getType() {
return type;
}
@@ -50,5 +53,13 @@
this.workstationId = workstationId;
}
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/WorkstationAppMappingMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/WorkstationAppMappingMapper.java
new file mode 100644
index 0000000..299b275
--- /dev/null
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/WorkstationAppMappingMapper.java
@@ -0,0 +1,9 @@
+package com.qianwen.smartman.modules.cps.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qianwen.smartman.modules.cps.entity.WorkstationAppMapping;
+
+
+public interface WorkstationAppMappingMapper extends BaseMapper<WorkstationAppMapping> {
+
+}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java
index 53cf091..08de860 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java
@@ -7,14 +7,18 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.mp.base.BaseServiceImpl;
+import com.qianwen.smartman.common.mqtt.MqttMessageSender;
import com.qianwen.smartman.modules.cps.entity.CollectDeviceType;
+import com.qianwen.smartman.modules.cps.entity.WorkstationAppMapping;
import com.qianwen.smartman.modules.cps.entity.WorkstationDatapoints;
import com.qianwen.smartman.modules.cps.mapper.CollectDeviceTypeMapper;
+import com.qianwen.smartman.modules.cps.mapper.WorkstationAppMappingMapper;
import com.qianwen.smartman.modules.cps.mapper.WorkstationDatapointsMapper;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsSubmitVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsVO;
@@ -25,6 +29,15 @@
@Autowired
private CollectDeviceTypeMapper typeMapper;
+ //@Autowired
+ //private JdbcTemplate jdbcTemplate;
+
+ @Autowired
+ private WorkstationAppMappingMapper mpmapper;
+ @Autowired
+ private MqttMessageSender mqttSender;
+
+ private final String WORKSTATION_APP_MAPPING_CHANGED_TOPIC = "mdc/workstation_app_mapping_changed";
/**
* 鏂板鎴栬�呬慨鏀瑰伐浣嶇偣浣嶉厤缃�
* @param tplVO
@@ -36,20 +49,34 @@
if (dp == null) {
//鏂板
- //throw new ServiceException(StringUtil.format("妯℃澘鍚嶇О [{}] 宸插瓨鍦�!", new Object[]{tplVO.getName()}));
dp = new WorkstationDatapoints();
dp.setDpConfig(dpVO.getDpConfig());
dp.setIsDeleted(0);
dp.setWorkstationId(dpVO.getWorkstationId());
dp.setType(dpVO.getType());
+ dp.setAppId(dpVO.getAppId());
}else {
dp.setDpConfig(dpVO.getDpConfig());
dp.setIsDeleted(0);
dp.setWorkstationId(dpVO.getWorkstationId());
dp.setType(dpVO.getType());
+ dp.setAppId(dpVO.getAppId());
}
saveOrUpdate(dp);
+
+ WorkstationAppMapping appMap = mpmapper.selectById(dpVO.getWorkstationId());
+ if(appMap == null) {
+ appMap = new WorkstationAppMapping();
+ appMap.setAppId(dpVO.getAppId());
+ appMap.setWorkstationId(dpVO.getWorkstationId());
+ mpmapper.insert(appMap);
+ }else {
+ appMap.setAppId(dpVO.getAppId());
+ mpmapper.updateById(appMap);
+ }
+
+ mqttSender.sendMessage(WORKSTATION_APP_MAPPING_CHANGED_TOPIC, dpVO.getWorkstationId()+"");
}
/**
@@ -69,6 +96,7 @@
dpVO.setDpConfig(dp.getDpConfig());
dpVO.setType(dp.getType());
+ dpVO.setAppId(dp.getAppId());
Charset utf8charset = Charset.forName("utf8");
String startJsonStr= "[]";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
index 41f4c0d..11366a6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
@@ -258,6 +258,7 @@
}
private void updateCalendarDayTime(List<CalendarDateDTO> dateDTOList, ProductionCalendar calenadar) {
+
Long calendarId = calenadar.getId();
Integer year = calenadar.getYear();
Integer currentYear = Integer.valueOf(LocalDate.now().getYear());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsSubmitVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsSubmitVO.java
index b3ad883..df33cfa 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsSubmitVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsSubmitVO.java
@@ -21,7 +21,7 @@
*/
private long workstationId;
-
+ private String appId;
public Integer getType() {
return type;
}
@@ -46,4 +46,12 @@
this.workstationId = workstationId;
}
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsVO.java
index abce50d..43cf7cf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationDatapointsVO.java
@@ -23,6 +23,10 @@
*/
private long workstationId;
+ /**
+ * IOT骞冲彴appId
+ */
+ private String appId;
public Integer getType() {
return type;
@@ -56,5 +60,13 @@
this.dpHead = dpHead;
}
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
}
--
Gitblit v1.9.3