guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

0205cmt
dearLin 2024-12-13 13:50:53 +08:00
parent 05a14e2efc 5a81340b6b
commit 256ccee8f0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/util/SaveAnemometerInfoScheduled.java
View File

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

1
src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml
View File

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