From e44c211aab8da89e89657426460d44285de6959c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 09 五月 2025 00:36:16 +0800
Subject: [PATCH] 整理代码

---
 smart-man-boot/src/main/java/com/qianwen/smartman/common/config/MdcMqttConfig.java                       |    2 +-
 smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml  |   17 -----------------
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ProcessParameterHelperService.java |   37 +------------------------------------
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/MdcMqttConfig.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/MdcMqttConfig.java
index 129e4cf..e42ecd2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/MdcMqttConfig.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/config/MdcMqttConfig.java
@@ -155,7 +155,7 @@
                 MessageDO messageDO = new MessageDO();
                 messageDO.setNeedBroadcast(false);
                 String msgtxt =JSONUtil.toJsonStr(jsonWebSocketMessage);
-                logger.info("websockettxt={}",msgtxt);
+                logger.info("send_to_page_websockettxt={}",msgtxt);
                 messageDO.setMessageText(msgtxt);
                
                 messageDistributor.distribute(messageDO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ProcessParameterHelperService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ProcessParameterHelperService.java
index 618c106..d4ea3f9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ProcessParameterHelperService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ProcessParameterHelperService.java
@@ -24,15 +24,7 @@
     
 	@DS("iotdb")
 	public ProcessParameterVO queryLastParameterLessThenTime(long workstationId,String item,Long time) {
-		/**
-		 *tdengine瀹炵幇锛歰ldFirstStatue
-		 * select last(ts) as realTime,
-               last(v)  as value_collect
-        from iot_data.super_collect_data
-        where n = #{item}
-          and ts &lt; #{startTime}
-          and workstation_id = #{workstationId}
-		 */
+		
 		ProcessParameterVO vo = null;
 		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+"_"+item+" where time<"+time+" limit 1 align by device";
 		List<ProcessParameterVO> list =  jdbcTemplate.query(sql, new RowMapper<ProcessParameterVO>() {
@@ -64,34 +56,7 @@
 	 */
 	@DS("iotdb")
 	public ProcessParameterVO getLastParameterGreaterThenTime(long workstationId,String item,Long time) {
-		/*
-		 oldLastStatue
-        select last(ts) as realTime,
-               last(v)  as value_collect
-        from iot_data.super_collect_data
-        where n = #{item}
-          and ts &gt; #{endTime}
-          and workstation_id = #{workstationId}
-		 * */
-		/*
-		LastProcessParam lp = this.parameterMapper.lastParameterGreaterThanTime(workstationId,item,time);
-		if(lp == null) {
-			return null;
-		}
-		ProcessParameterVO vo = new ProcessParameterVO();
-		//瑙ｆ瀽json涓哄璞″垪琛�
-		JSONObject paramsObj = JSONObject.parseObject(lp.getParamJson());
 		
-		if(paramsObj.containsKey(item)) {
-			JSONObject itemObj = paramsObj.getJSONObject(item);
-			
-			Long lastTime = itemObj.getLong("time");
-			vo.setTime(new Timestamp(lastTime));
-			vo.setRealTime(lastTime);
-			vo.setValueCollect(itemObj.getString("value"));
-		}
-		
-		return vo;*/
 		
 		ProcessParameterVO vo = null;
 		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+"_"+item+" where time>"+time+" limit 1 align by device";
diff --git a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml
index 80f425b..60144c5 100644
--- a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml
+++ b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml
@@ -6,24 +6,7 @@
         insert into iot_data.aggregate_state_${workstationId}
         values ${sql}
     </insert>
-	<!-- 
-    <insert id="saveState">
-        insert into iot_data.aggregate_state_${workstationId} USING iot_data.super_aggregate_state
-        TAGS(${workstationId}) values
-        <foreach separator="," collection="list" item="item" index="index">
-            (#{item.startTime}, #{item.endTime}, #{item.durationCollect}, #{item.valueCollect}, #{item.calendarCode},
-            #{item.factoryYear}, #{item.factoryMonth}, #{item.factoryWeek}, #{item.factoryDate},
-            #{item.shiftIndex}, #{item.shiftTimeType}, #{item.wcs}, #{item.rps}, #{item.isDeleted},#{item.isPlan})
-        </foreach>
-    </insert>
 	
-    <update id="createTable">
-        create table if not exists iot_data.aggregate_state_${workstationId} using super_aggregate_state tags
-        (
-            #{workstationId}
-        )
-    </update>
- -->
     <select id="countStatsShiftEndTimeNotNull" resultType="com.qianwen.smartman.modules.mdc.dto.CountResult">
         select sum(duration_collect) as nums, value_collect status
         from iot_data.super_aggregate_state

--
Gitblit v1.9.3