Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yangwl:4e01d486a65fd92dc597a411080db6bdd430ebb5
Branches Tags
Yangwl:master
...
compare: Yangwl:ad8939f1cd456714b3adec97eb80e60816b28f0e
Branches Tags
Yangwl:master

2 Commits
4e01d486a6 ... ad8939f1cd

Author SHA1 Message Date
黄锦贤 ad8939f1cd Merge remote-tracking branch 'origin/master' 1 month ago
黄锦贤 0985925479 feat(能耗统计): 修改查询和新增字段 1 month ago
4 changed files with 175 additions and 36 deletions
Show Stats

11
op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
Unescape Escape View File

@ -662,17 +662,6 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
} else if (energyType.equals("3")) {
energyList = reportPointWaterMapper.energyStatisticsData(paramMap);
}
// Map<String, String> sumMap = new HashMap<>();
// if (energyList.size() > 0){
// sumMap.put("monitorName","合计：");
// BigDecimal expend = new BigDecimal("0.00");
// for (Map<String, String> stringStringMap : energyList) {
// expend = expend.add(new BigDecimal(String.valueOf(stringStringMap.get("expend"))));
// sumMap.put("timeRange", String.valueOf(stringStringMap.get("timeRange")));
// }
// sumMap.put("expend", expend.toPlainString());
// energyList.add(sumMap);
// }
} catch (Exception e) {
System.out.println("能耗统计返回数据:" + e.getMessage());
}

72
op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
Unescape Escape View File

@ -229,34 +229,50 @@
<select id="energyStatisticsData" resultType="java.util.Map">
select m.parentMonitorId,
m.parentName,
m.is_ammeter,
rpd.monitor_id monitorId,
m.monitor_name monitorName,
m.monitor_addr address,
sum(isnull(rpd.expend,0)) expend,
max(rpd.meter_value) meterValue,
concat(#{beginCollectTime},' 至 ',#{endCollectTime}) timeRange,
m.monitor_hierarchy monitorHierarchy,
m.grade
m.parentName,
m.is_ammeter,
rpd.monitor_id monitorId,
m.monitor_name monitorName,
m.monitor_addr address,
sum(isnull(rpd.expend,0)) expend,
max(rpd.meter_value) meterValue,
concat(#{beginCollectTime},' 至 ',#{endCollectTime}) timeRange,
m.monitor_hierarchy monitorHierarchy,
m.grade,
m.subentry_id as subentryId,
m.subentry_name as subentryName,
m.public_share_type as publicShareType,
rdd.kwh1,
rdd.kwh2,
rdd.kwh3,
rdd.kwh4,
rdd.total_kwh
from report_point_dnb rpd
left join (SELECT blm.monitor_id parentMonitorId,
blm.monitor_name parentName,
bmi.monitor_id,
bmi.monitor_name,
bmi.monitor_addr,
bmi.monitor_hierarchy,
bl.grade,
CASE WHEN bmi.is_ammeter = 'true' THEN '是' ELSE '否' END is_ammeter
FROM base_monitor_info bmi
LEFT JOIN base_line_monitor bl ON bl.monitor_id = bmi.monitor_id
LEFT JOIN base_line_monitor blm ON blm.objid = bl.parent_id) m
on m.monitor_id = rpd.monitor_id
INNER JOIN (
SELECT blm.monitor_id parentMonitorId,
blm.monitor_name parentName,
bmi.monitor_id,
bmi.monitor_name,
bmi.monitor_addr,
bmi.monitor_hierarchy,
bl.grade,
bmi.is_ammeter,
bmi.subentry_id,
bst.subentry_name,
bmi.public_share_type
FROM base_monitor_info bmi
LEFT JOIN base_line_monitor bl ON bl.monitor_id = bmi.monitor_id
LEFT JOIN base_line_monitor blm ON blm.objid = bl.parent_id
LEFT JOIN base_subentry_type bst on TRY_CAST(bmi.subentry_id AS BIGINT) = bst.objid
) m ON m.monitor_id = rpd.monitor_id
left join base_monitor_public bmp on m.monitor_id = bmp.monitor_id
left join base_public_user bpu on bmp.public_share_id = bpu.id
left join report_day_dnb rdd on rdd.monitor_id = rpd.monitor_id
and DATEDIFF(day, rdd.collect_time, rpd.record_time) = 0
<where>
<if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
and left(CONVERT(VARCHAR(19), rpd.begin_time, 120),10) between #{beginCollectTime} and #{endCollectTime}
and rpd.begin_time >= #{beginCollectTime} AND rpd.begin_time
<![CDATA[ < ]]> DATEADD(day, 1, #{endCollectTime})
</if>
<if test="monitorIdList != null and monitorIdList.size > 0">
and rpd.monitor_id IN
@ -270,8 +286,14 @@
#{monitorHierarchy}
</if>
</where>
group by m.parentMonitorId, m.parentName, m.is_ammeter,
rpd.monitor_id, m.monitor_name, m.monitor_addr, m.monitor_hierarchy, m.grade
group by m.parentMonitorId, m.parentName, m.is_ammeter, rpd.monitor_id,
m.monitor_name, m.monitor_addr, m.monitor_hierarchy, m.grade,
m.subentry_id,m.subentry_name,m.public_share_type,
rdd.kwh1,
rdd.kwh2,
rdd.kwh3,
rdd.kwh4,
rdd.total_kwh
order by m.parentName, m.monitor_name
</select>
<select id="OrderEnergyList" resultMap="ReportOrderEnergyDTOResult">

1
op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
Unescape Escape View File

@ -663,6 +663,7 @@
unit
from pro_medication_order_detail
where order_code like concat('%', #{orderCode}, '%') and production_date = #{productDate}
</select>
</mapper>

127
sql/factory/26.0520.01.sql
Unescape Escape View File

@ -0,0 +1,127 @@
/*
Navicat Premium Data Transfer
Source Server : MES
Source Server Type : SQL Server
Source Server Version : 15002000 (15.00.2000)
Source Host : 192.168.202.21:1433
Source Catalog : lanju_op_xiaolan_ds
Source Schema : dbo
Target Server Type : SQL Server
Target Server Version : 15002000 (15.00.2000)
File Encoding : 65001
Date: 20/05/2026 16:36:44
*/
-- ----------------------------
-- Table structure for report_day_dnb
-- ----------------------------
IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[report_day_dnb]') AND type IN ('U'))
DROP TABLE [dbo].[report_day_dnb]
GO
CREATE TABLE [dbo].[report_day_dnb] (
[objid] int IDENTITY(1,1) NOT NULL,
[dept_id] int NULL,
[user_id] int NULL,
[monitor_id] varchar(64) COLLATE Chinese_PRC_CI_AS NULL,
[collect_time] datetime NULL,
[kwh1] decimal(18,2) NULL,
[kwh2] decimal(18,2) NULL,
[kwh3] decimal(18,2) NULL,
[kwh4] decimal(18,2) NULL,
[total_kwh] decimal(18,2) NULL
)
GO
ALTER TABLE [dbo].[report_day_dnb] SET (LOCK_ESCALATION = TABLE)
GO
EXEC sp_addextendedproperty
'MS_Description', N'自增标识',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'objid'
GO
EXEC sp_addextendedproperty
'MS_Description', N'权限标识（部门）',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'dept_id'
GO
EXEC sp_addextendedproperty
'MS_Description', N'权限标识（用户）',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'user_id'
GO
EXEC sp_addextendedproperty
'MS_Description', N'计量设备编号',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'monitor_id'
GO
EXEC sp_addextendedproperty
'MS_Description', N'读取日期',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'collect_time'
GO
EXEC sp_addextendedproperty
'MS_Description', N'已用尖电能量',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'kwh1'
GO
EXEC sp_addextendedproperty
'MS_Description', N'已用峰电能量',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'kwh2'
GO
EXEC sp_addextendedproperty
'MS_Description', N'已用平电能量',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'kwh3'
GO
EXEC sp_addextendedproperty
'MS_Description', N'已用谷电能量',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'kwh4'
GO
EXEC sp_addextendedproperty
'MS_Description', N'总的已用冻结电量',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb',
'COLUMN', N'total_kwh'
GO
EXEC sp_addextendedproperty
'MS_Description', N'电日耗报表',
'SCHEMA', N'dbo',
'TABLE', N'report_day_dnb'
GO
-- ----------------------------
-- Primary Key structure for table report_day_dnb
-- ----------------------------
ALTER TABLE [dbo].[report_day_dnb] ADD CONSTRAINT [PK__report_d__530D6FE4397E551D] PRIMARY KEY CLUSTERED ([objid])
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
ON [PRIMARY]
GO
Write Preview
Loading…
Cancel
Save