moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml

@@ -6,7 +6,7 @@
    <select id="getAreaWindData" resultType="com.moral.api.pojo.dto.Wind.WindData">
        SELECT
        d.longitude AS longitude,
        d.latitude AS latitude,
        d.latitude AS latitude,d.mac,
        CASE WHEN
        h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed,
        h.value->'$.a01008' AS windDir

			@@ -6,7 +6,7 @@
			<select id="getAreaWindData" resultType="com.moral.api.pojo.dto.Wind.WindData">
			SELECT
			d.longitude AS longitude,
			d.latitude AS latitude,
			d.latitude AS latitude,d.mac,
			CASE WHEN
			h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed,
			h.value->'$.a01008' AS windDir