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

business/base-service/src/main/java/com/yihu/jw/dailyReport/service/DailyReportUploadService.java

@@ -1852,6 +1852,7 @@ public class DailyReportUploadService {
            doubtTotalSql +=" and d.doctor_id IN (select dh.doctor_code from base_doctor_hospital dh where dh.dept_code = '" + dept + "' and dh.del=1 ) ";
        }
        doubtTypeSql += " group by de.doubt_type ";
        sql = " select dict_value from  wlyy_hospital_sys_dict where dict_name='healthUpload' and dict_code='healthUpload' ";
        List<String> dictValues = jdbcTemplate.queryForList(sql,String.class);
        JSONObject doubtTypeObj = new JSONObject();
        if (dictValues.size()>0){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/config/YsConfig.java

@@ -39,6 +39,8 @@ public class YsConfig {
    //开放平台  https://open.ys7.com/doc/zh/book/index/user.html
    public static final String iotAssesToken =baseUrl+ "/api/user/component-open/sso/oauth2/getEZAccessToken";
    public static final String iotAssesToken2 =iotBaseUrl+ "/api/lapp/token/get";
    //获取通道列表
    public static final String surveillanceWayList =baseUrl+ "/api/resource/open-app/surveillance/camera/list/page";

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

@@ -97,11 +97,20 @@ public class YsDeviceService {
        if(redisTemplate.hasKey(YSCONFIGDO.getIotAccessTokenKey())){
            return redisTemplate.opsForValue().get(YSCONFIGDO.getIotAccessTokenKey());
        }
        JSONObject responseBody = null;
        if (1==YSCONFIGDO.getConfigId()||2==YSCONFIGDO.getConfigId()){//兼容智居平台设备，后续全部迁移可删除改代码
            JSONObject param = new JSONObject();
            param.put("accessToken",getAccessToken(deviceSn));
            HttpEntity<JSONObject> response = httpClientUtil.assesTokenPostHttp(YsConfig.iotAssesToken,param, HttpMethod.POST);
            responseBody = response.getBody();
        }else {
            MultiValueMap<String, String> params =  new LinkedMultiValueMap<>();;
            params.add("appKey",getIotAccessToken(YSCONFIGDO.getAppKey()));
            params.add("appSecret",getIotAccessToken(YSCONFIGDO.getAppSecret()));
            HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.iotAssesToken2,params, HttpMethod.POST);
            responseBody = response.getBody();
        }
        JSONObject param = new JSONObject();
        param.put("accessToken",getAccessToken(deviceSn));
        HttpEntity<JSONObject> response = httpClientUtil.assesTokenPostHttp(YsConfig.iotAssesToken,param, HttpMethod.POST);
        JSONObject responseBody = response.getBody();
        String assToken = null;
        if (responseBody.getInteger("code")==200){
            assToken = responseBody.getJSONObject("data").getString("ezOpenAccessToken");