From 2234cee8e872fd7633b95eef5b0c760cbbb8eabf Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期五, 02 九月 2022 17:00:00 +0800
Subject: [PATCH] 20220902林平凡离职交接（新增北理工大气数据获取）
---
src/main/resources/mapper/PoleSinglelampDataMapper.xml | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/src/main/resources/mapper/PoleSinglelampDataMapper.xml b/src/main/resources/mapper/PoleSinglelampDataMapper.xml
index cb1f884..f810ede 100644
--- a/src/main/resources/mapper/PoleSinglelampDataMapper.xml
+++ b/src/main/resources/mapper/PoleSinglelampDataMapper.xml
@@ -24,47 +24,35 @@
<select id="selectByCompany" resultType="api.bean.SinglelampDataEntity">
select
- ps.streetlight_name,ps.streetlight_id,
- psdm.*
+ *
from
pole_singlelamp_data_mq psdm
- left join pole_streetlight ps on
- psdm.mac = ps.code_number
- where
- psdm.singlelamp_data_id in (
+ join
+ (
select
- max(singlelamp_data_id)
+ ps.streetlight_id as id ,
+ ps.streetlight_name
from
- pole_singlelamp_data_mq
- where
- pole_singlelamp_data_mq.mac
- in (
+ pole_streetlight ps
+ where ps.streetlight_id in (
+ select
+ pus.streetlight_id
+ from
+ pole_user_streetlight pus
+ where
+ pus.company_id in(
select
- ps2.code_number
+ suc.company_id
from
- pole_streetlight ps2
+ sys_user_company suc
where
- ps2.streetlight_id
- in (
- select
- pus.streetlight_id
- from
- pole_user_streetlight pus
- where
- pus.company_id in(
- select
- suc.company_id
- from
- sys_user_company suc
- where
- suc.user_id = #{userId})
- )
+ suc.user_id =
+ #{userId}
)
- group by
- mac
- )
- order by
- streetlight_id
+ )
+ limit #{page},#{size}) idAndName
+ on idAndName .id = psdm .streetlight_id
+ group by psdm .streetlight_id
</select>
@@ -83,4 +71,6 @@
psd.singlelamp_data_id DESC
</select>
+
+
</mapper>
--
Gitblit v1.9.3