From 9c5cc5bbc7a882fd5bb466621ea10bd5f73b2fd1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 19 十月 2024 20:19:44 +0800
Subject: [PATCH] 增加首页卡片的布局设置字段layoutConfig；lincense去掉原版文字
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/WorkstationDatapointsService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 deletions(-)
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 08de860..454886b 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
@@ -2,24 +2,26 @@
import java.io.IOException;
import java.nio.charset.Charset;
+import java.util.List;
import org.apache.commons.io.IOUtils;
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.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qianwen.core.log.exception.ServiceException;
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.Workstation;
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.mapper.WorkstationMapper;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsSubmitVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsVO;
@@ -28,16 +30,16 @@
private Logger log = LoggerFactory.getLogger(this.getClass());
@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";
+ @Autowired
+ private WorkstationMapper workstationMapper;
+ /**
+ * mqtt topic锛岀敤浜庨�氱煡collect搴旂敤锛屾暟鎹偣鏀瑰彉
+ */
+ private final String WORKSTATION_DATAPOINT_CHANGED_TOPIC = "mdc/workstation_datapoint_changed";
/**
* 鏂板鎴栬�呬慨鏀瑰伐浣嶇偣浣嶉厤缃�
* @param tplVO
@@ -45,8 +47,15 @@
@Transactional
public void submit(WorkstationDatapointsSubmitVO dpVO) {
+
+ Workstation usingWorkstation = appIdUsingWorkstation(dpVO.getAppId(),dpVO.getWorkstationId());
+ if(usingWorkstation != null) {
+ //appId琚娇鐢�
+ String err = "搴旂敤ID琚崰鐢紝宸ヤ綅鍚嶇О+缂栧彿:"+usingWorkstation.getName()+"-"+usingWorkstation.getCode();
+ throw new ServiceException(err);
+ }
+
WorkstationDatapoints dp = this.baseMapper.selectOne(Wrappers.<WorkstationDatapoints>lambdaQuery().eq(WorkstationDatapoints::getWorkstationId, dpVO.getWorkstationId()));
-
if (dp == null) {
//鏂板
dp = new WorkstationDatapoints();
@@ -65,6 +74,7 @@
saveOrUpdate(dp);
+ /*
WorkstationAppMapping appMap = mpmapper.selectById(dpVO.getWorkstationId());
if(appMap == null) {
appMap = new WorkstationAppMapping();
@@ -74,11 +84,32 @@
}else {
appMap.setAppId(dpVO.getAppId());
mpmapper.updateById(appMap);
- }
+ }*/
- mqttSender.sendMessage(WORKSTATION_APP_MAPPING_CHANGED_TOPIC, dpVO.getWorkstationId()+"");
+ //鍙戦�佸彉鏇存秷鎭�
+ JSONObject payloadObj = new JSONObject();
+ payloadObj.put("appId", dpVO.getAppId());
+ payloadObj.put("workstationId", dpVO.getWorkstationId());
+ mqttSender.sendMessage(WORKSTATION_DATAPOINT_CHANGED_TOPIC, payloadObj.toJSONString());
}
-
+ /**
+ * appId鏄惁琚叾浠栧伐浣嶄娇鐢紝濡傛灉浣跨敤杩斿洖浣跨敤鐨勫伐浣嶆暟鎹�
+ * @param appId
+ * @param workstationId
+ * @return 浣跨敤璇ppId鐨勫伐浣�
+ */
+ Workstation appIdUsingWorkstation(String appId,long workstationId) {
+ //long cnt = baseMapper.selectCount(Wrappers.<WorkstationDatapoints>lambdaQuery().ne(WorkstationDatapoints::getWorkstationId, workstationId).eq(WorkstationDatapoints::getAppId, appId));
+ //return cnt > 0;
+ List<WorkstationDatapoints> dpList = baseMapper.selectList(Wrappers.<WorkstationDatapoints>lambdaQuery().ne(WorkstationDatapoints::getWorkstationId, workstationId).eq(WorkstationDatapoints::getAppId, appId));
+
+ if(dpList.isEmpty()) {
+ return null;
+ }
+
+ Workstation ws = workstationMapper.selectById(dpList.get(0).getWorkstationId());
+ return ws;
+ }
/**
* 鑾峰彇宸ヤ綅鏁版嵁鐐归厤缃�
* @param workstationId
--
Gitblit v1.9.3