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

svr/svr-base/src/main/resources/application.yml

@@ -330,5 +330,5 @@ wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
  sign: 1
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream

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)

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

@@ -110,7 +110,7 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
                String deviceSn = deviceDO.getDeviceSn();
                Integer type = deviceInventoryLogDO.getType();//调拨类型（1入库 2设备调拨出库 3核销出库）
                if (type.equals("1")) {
                if (type == 1) {
                    deviceDO.setSaasId(getCode());
                    deviceDO.setProductId(jsonObject.getString("productId"));
                    deviceDO.setName(jsonObject.getString("name"));
@@ -120,7 +120,7 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
                    deviceDO.setManufacturerName(jsonObject.getString("manufacturerName"));
                } else {//设备出库，更换相关信息
                    deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
                    if (type.equals("3")) {
                    if (type == 3) {
                        deviceDO.setDel(0);
                        deviceDO.setStatus("2");
                        deviceDO.setInventoryLogId(deviceInventoryLogDO.getId());