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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/DetectionPlatformEndpoint.java

@@ -182,4 +182,14 @@ public class DetectionPlatformEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "deviceAndService")
        @ApiOperation(value = "物联网检测大屏，设备种类     安防服务")
    public ObjEnvelop deviceAndService(){
        try {
            return success("查询成功",200, platformService.deviceAndService());
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/DetectionPlatformService.java

@@ -401,5 +401,15 @@ public class DetectionPlatformService  {
        return object;
    }
    public JSONObject deviceAndService(){
        JSONObject object = new JSONObject();
        String device = "SELECT COUNT(1) FROM dm_device GROUP BY category_code";
        List<Map<String , Object>> mapList = jdbcTemplate.queryForList(device);
        object.put("deviceType",mapList.size());
        String service = "SELECT COUNT(1) FROM base_system_dict_entry WHERE remark = 'security'";
        Integer serviceCount = jdbcTemplate.queryForObject(service,Integer.class);
        object.put("serviceCount",serviceCount);
        return object;
    }
}