Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

src/main/java/com/zcloud/util/SaveAnemometerInfoScheduled.java

@@ -43,11 +43,12 @@ public class SaveAnemometerInfoScheduled {
 		anemometerList.forEach(anemometer -> {
 			anemometer.put("FLID",UuidUtil.get32UUID());
 			String ftime = anemometer.getString("FTIME");
+			// Date date = new Date();
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			try {
 				Date date = simpleDateFormat.parse(ftime);
 				anemometer.put("FTIME",simpleDateFormat.format(date));
-			} catch (ParseException e) {
+			} catch (Exception e) {
 				throw new RuntimeException(e);
 			}
 			//判断获取的风速仪在本地是否存在

src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml

@@ -114,6 +114,7 @@
 				LEFT JOIN bus_anemometer_local al ON f.FNAME = al.FNAME and al.FTIME = ba.FTIME
 		WHERE
 			f.FNAME = #{FNAME}
+		LIMIT 1
 	</select>
 
 	<select id="getFourAnemometerData" parameterType="pd" resultType="pd">