Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.解决综合评估，时间范围查询bug

Browse Source
This commit is contained in:
wr
2023-09-20 15:36:38 +08:00
parent 243088415d
commit 0fbbb426a0
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java
View File

@@ -24,24 +24,13 @@ public interface RMpPollutionDPOMapper extends BaseMapper<RMpPollutionDPO> {
int insertOrUpdateSelective(RMpPollutionDPO record);
@Select({"<script>",
"SELECT\n",
" l.line_id,\n",
" max(l.value) as value\n",
"FROM\n" +
" r_mp_pollution_d l\n",
"where line_id in\n",
"<foreach item='item' index='index' collection='items' open='(' separator=',' close=')'>",
"#{item}",
"</foreach>",
"\tand DATE_FORMAT( data_date ,'%Y-%m-%d') like #{searchBeginTime}\n",
"and pollution_type =#{pollutionType}",
"GROUP BY\n",
" l.line_id",
"</script>"
List<RMpPollutionDPO> selectMaxList(@Param("ids") List<String> line,
@Param("pollutionType") String pollutionType,
@Param("statTime") String statTime,
@Param("endTime") String endTime);
})
List<RMpPollutionDPO> selectMaxList(@Param("items") List<String> line, @Param("pollutionType") String pollutionType, @Param("searchBeginTime") String searchBeginTime);
List<PublicDTO> getTop10Line(@Param("list") List<String> lineList, @Param("start") DateTime searchBeginTime, @Param("end") DateTime searchEndTime, @Param("pollutionType") String id);
List<PublicDTO> getTop10Line(@Param("list") List<String> lineList,
@Param("start") DateTime searchBeginTime,
@Param("end") DateTime searchEndTime,
@Param("pollutionType") String id);
}

24
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml
View File

@@ -43,6 +43,30 @@
ORDER BY data DESC
LIMIT 0,10
</select>
<select id="selectMaxList" resultType="com.njcn.harmonic.pojo.po.RMpPollutionDPO">
SELECT
l.line_id,
max( l.VALUE ) AS VALUE
FROM
r_mp_pollution_d l
<where>
pollution_type = #{pollutionType}
<if test=" ids != null and ids.size > 0">
AND line_id IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test=" statTime != null and statTime !=''">
AND data_date >= #{statTime}
</if>
<if test="endTime != null and endTime != ''">
AND data_date &lt;= #{endTime}
</if>
</where>
GROUP BY
l.line_id;
</select>
<insert id="batchInsert" parameterType="map">