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

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DmDeviceService.java

@@ -58,6 +58,9 @@ public class DmDeviceService extends BaseJpaService<Device, DeviceDao> {
                return result;
            }
        }
        if (null==device.getId()){
            device.setDel("1");
        }
        deviceDao.save(device);
        result.put(ResponseContant.resultFlag,ResponseContant.success);
        result.put(ResponseContant.resultMsg,"success");

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/NetworkCardService.java

@@ -118,8 +118,16 @@ public class NetworkCardService {
        String groupInfo = httpClientUtil.get(NetworkCardConfig.getGroupId,params,"UTF-8");
        JSONObject responseBody = JSONObject.parseObject(groupInfo);
        if (responseBody.getInteger("status")==0) {
            String groupId = "";
            JSONArray groupList = responseBody.getJSONArray("result").getJSONObject(0).getJSONArray("groupList");
            String groupId = groupList.getJSONObject(0).getString("groupId");
            for(int i=0;i<groupList.size();i++){
                JSONObject tmp = groupList.getJSONObject(i);
                if (tmp.containsKey("offeringId")){
                    if ("11000006".equals( tmp.getString("offeringId"))){//语音卡群组
                        groupId = tmp.getString("groupId");
                    }
                }
            }
            if (StringUtils.isNotBlank(groupId)) {
                params.add(new BasicNameValuePair("groupId", groupId));
                params.add(new BasicNameValuePair("operType", operType));

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/device/NetworkCardService.java

@@ -122,7 +122,15 @@ public class NetworkCardService {
        JSONObject responseBody = JSONObject.parseObject(groupInfo);
        if (responseBody.getInteger("status")==0) {
            JSONArray groupList = responseBody.getJSONArray("result").getJSONObject(0).getJSONArray("groupList");
            String groupId = groupList.getJSONObject(0).getString("groupId");
            String groupId = "";
            for(int i=0;i<groupList.size();i++){
                JSONObject tmp = groupList.getJSONObject(i);
                if (tmp.containsKey("offeringId")){
                    if ("11000006".equals( tmp.getString("offeringId"))){//语音卡群组
                        groupId = tmp.getString("groupId");
                    }
                }
            }
            if (StringUtils.isNotBlank(groupId)) {
                params.add(new BasicNameValuePair("groupId", groupId));
                params.add(new BasicNameValuePair("operType", operType));