From 120755e6874893d284fda5f617924d46960286c0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 11 四月 2025 01:27:15 +0800
Subject: [PATCH] 修改日志路径为/var/log/xxx
---
smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
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 1e9fa8e..80f425b 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,7 +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
@@ -16,14 +16,14 @@
#{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
@@ -422,7 +422,7 @@
#{week}
</foreach>
</select>
-
+ <!--
<select id="getDataByMonth" resultType="com.qianwen.smartman.modules.mdc.entity.SuperAggregateState">
select ts as startTime,
end_time as endTime,
@@ -452,7 +452,40 @@
#{month}
</foreach>
</select>
-
+ -->
+
+ <select id="getDataByMonth" resultType="com.qianwen.smartman.modules.mdc.entity.SuperAggregateState">
+ select
+ end_time as endTime,
+ duration_collect,
+ value_collect,
+ calendar_code as calendarCode,
+ factory_year as factoryYear,
+ factory_month as factoryMonth,
+ factory_week as factoryWeek,
+ factory_date as factoryDate,
+ shift_index as shiftIndex,
+ shift_time_type as shiftTimeType,
+ wcs,
+ rps,
+ is_deleted as isDeleted,
+ workstation_id as workstationId
+ from root.f2.aggregate_state_*
+ where is_deleted=false
+ and wcs > 0
+ and factory_year = #{year}
+ and workstation_id IN
+ <foreach collection="workstationIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ and factory_month IN
+ <foreach collection="monthList" item="month" open="(" separator="," close=")">
+ #{month}
+ </foreach>
+ align by device
+ </select>
+
+ <!-- 杩欎釜鏈夌敤鍚� -->
<select id="listCrossDay" resultType="com.qianwen.smartman.modules.mdc.entity.SuperAggregateState">
select ts as startTime,
end_time as endTime,
@@ -1008,7 +1041,7 @@
where factory_date = #{factoryDate}
and wcs > 0
and shift_index = #{shiftIndex}
- and calendar_code = '${calendarCode}'
+ and calendar_code = "#{calendarCode}"
and is_deleted = false
<if test="ids != null and ids.size() > 0">
AND workstation_id IN
--
Gitblit v1.9.3