@@ -106,7 +106,7 @@ public class TokenSign {
try {
Jws<Claims> claimsJws = Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(jwtToken);
return claimsJws.getBody();
- }catch (ExpiredJwtException e){
+ }catch (Exception e){
return null;
}
@@ -20,4 +20,6 @@ import java.util.List;
@Repository
public interface EnvDataMapper extends BaseMapper<EnvData> {
List<EnvData> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnvData> queryWrapper);
+
+ List<EnvData> listNow(@Param(Constants.WRAPPER) QueryWrapper<EnvData> queryWrapper);
@@ -272,8 +272,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
else if ("1".equals(type)) {
Date timesmorning = DataUill.getTimesmorning();
queryWrapper.ge("create_time", timesmorning);
- List<EnvData> envData = dataMapper.listDay(queryWrapper);
-
+ List<EnvData> envData = dataMapper.listNow(queryWrapper);
+// List<EnvData> envData = dataMapper.selectList(queryWrapper);
map.put("location", basePigpen.getBuildName());
map.put("data", envData);
@@ -23,4 +23,10 @@
group BY DATE_FORMAT(create_time,'%Y-%m-%d')
ORDER BY create_time ASC
</select>
+ <select id="listNow" resultType="com.huimv.admin.entity.EnvData">
+ SELECT Convert((IFNULL(env_temp,'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(env_hum,'0')),DECIMAL(10,2)) 'envHum',create_time FROM env_data
+ ${ew.customSqlSegment}
+ ORDER BY create_time ASC
+ </select>
</mapper>