~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -57,4 +57,14 @@
          AND `time` <![CDATA[>=]]> #{start}
          AND `time` <![CDATA[<=]]> #{end}
    </select>


    <select id="getAllCruiserData" resultType="java.util.Map">
        SELECT
        `value`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
        AND `time` <![CDATA[>=]]> #{time1}
        AND `time` <![CDATA[<=]]> #{time2}
    </select>
</mapper>

			@@ -57,4 +57,14 @@
			AND `time` <![CDATA[>=]]> #{start}
			AND `time` <![CDATA[<=]]> #{end}
			</select>


			<select id="getAllCruiserData" resultType="java.util.Map">
			SELECT
			`value`
			FROM `history_second_cruiser`
			WHERE mac = #{mac}
			AND `time` <![CDATA[>=]]> #{time1}
			AND `time` <![CDATA[<=]]> #{time2}
			</select>
			</mapper>