Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceController.java

@@ -200,7 +200,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            } else {
    
                if(isBinding == 3){//去重取设备名称
                    return iotDeviceService.findDevice();
                    return iotDeviceService.findDevice(page,size);
                }else{
                    return iotDeviceService.queryPage(sn, hospital, orderId, purcharseId, isBinding, page, size);
                }

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

@@ -337,7 +337,7 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
     *
     * @return
     */
    public MixEnvelop<IotDeviceVO, IotDeviceVO> findDevice() {
    public MixEnvelop<IotDeviceVO, IotDeviceVO> findDevice(Integer page, Integer size) {
        String sql ="SELECT DISTINCT c.* from iot_device c left join iot_patient_device t on t.del = 1 AND c.device_sn = t.device_sn  WHERE c.del=1 GROUP BY c.`name`";
        List<IotDeviceDO> list = jdbcTempalte.query(sql,new BeanPropertyRowMapper(IotDeviceDO.class));
@@ -345,7 +345,8 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
        List<IotDeviceVO> iotDeviceVOList = convertToModels(list,new ArrayList<>(list.size()),IotDeviceVO.class);
        translateDictForList(iotDeviceVOList);
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find_functions,iotDeviceVOList);
        long count = list.size();
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,iotDeviceVOList, page, size,count);
    }
    /**