Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/InventoryWarningService.java

@@ -34,9 +34,9 @@ public class InventoryWarningService {
                IotMessageDO iotMessageDO = new IotMessageDO();
                iotMessageDO.setTitle("库存预警提醒");
                iotMessageDO.setContent("您的库存" + map.get("name") + "设备已达到预警数量，当前数量为：" + inventoryCount + "台，请及时维护库存。");
                iotMessageDO.setReadMsg("0");
                iotMessageDO.setDel("0");
                iotMessageDO.setType("2");
                iotMessageDO.setReadMsg(0);
                iotMessageDO.setDel(0);
                iotMessageDO.setType(2);
                iotMessageDao.save(iotMessageDO);
            }
        }

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -402,8 +402,7 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
        sql +=" GROUP BY p.device_sn ORDER BY p.update_time desc ";
        if (page != null && pageSize != null) {
            String sqlCount = "SELECT count(DISTINCT p.device_sn) " + sql.substring(sql.indexOf("FROM"), sql.length());
            Long count = jdbcTemplate.queryForObject(sqlCount, Long.class);
            Long count = Long.valueOf(jdbcTempalte.queryForList(sql).size());
            sql += "limit " +(page-1)* pageSize + "," +pageSize;
            List<IotPatientDeviceVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(IotPatientDeviceVO.class));
            return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Device.message_success_find, list,page, pageSize,count);