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

svr/svr-iot/src/main/java/com/yihu/iot/controller/dict/IotDeviceDictController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
 * @author yeshijie on 2017/12/8.
@@ -39,7 +41,8 @@ public class IotDeviceDictController extends EnvelopRestEndpoint {
        List<IotDeviceDictDO> list = iotDeviceDictService.search(fields,filters,sorts);
        //封装返回格式
        List<IotDeviceDictDO> iotDeviceDicts = convertToModels(list, new ArrayList<>(list.size()), IotDeviceDictDO.class, fields);
        return MixEnvelop.getSuccessList(IotRequestMapping.DeviceDict.message_success_find_functions,iotDeviceDicts);
        Map<String,List<IotDeviceDictDO>> map = iotDeviceDicts.stream().collect(Collectors.groupingBy(IotDeviceDictDO :: getDeviceType));
        return MixEnvelop.getSuccess(IotRequestMapping.DeviceDict.message_success_find_functions,map);
    }
    @PostMapping(value = IotRequestMapping.DeviceDict.api_create)