diff --git a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/TemplateDto.java b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/TemplateDto.java index 850768e..1017f5b 100644 --- a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/TemplateDto.java +++ b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/TemplateDto.java @@ -10,10 +10,19 @@ import java.io.Serializable; public class TemplateDto implements Serializable { private int id ; + private String title ; private String config ; private int schoolId ; private String type ; + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public int getId() { return id; } diff --git a/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java b/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java index 902abae..1167426 100644 --- a/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java +++ b/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java @@ -37,7 +37,7 @@ public class HttpClientUtils { static { // 设置请求和传输超时时间 - requestConfig = RequestConfig.custom().setSocketTimeout(2000).setConnectTimeout(2000).build(); + requestConfig = RequestConfig.custom().setSocketTimeout(5000).setConnectTimeout(5000).build(); } public static void main(String[] args){ @@ -159,6 +159,33 @@ public class HttpClientUtils { return jsonResult; } + public static String httpGet2(String url) { + // get请求返回结果 + JSONObject jsonResult = null; + String result = "" ; + CloseableHttpClient client = HttpClients.createDefault(); + // 发送get请求 + HttpGet request = new HttpGet(url); + request.setConfig(requestConfig); + try { + CloseableHttpResponse response = client.execute(request); + // 请求发送成功，并得到响应 + if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { + // 读取服务器返回过来的json字符串数据 + HttpEntity entity = response.getEntity(); + String strResult = EntityUtils.toString(entity, "utf-8"); + // 把json字符串转换成json对象 + //jsonResult = JSONObject.parseObject(strResult); + result = strResult; + } + } catch (IOException e) { + + } finally { + request.releaseConnection(); + } + return result; + } + public static InputStream GetFileInputStream(String fileUrl){ try{ diff --git a/cloud/common/src/main/java/com/sincere/common/util/Xml2JsonUtils.java b/cloud/common/src/main/java/com/sincere/common/util/Xml2JsonUtils.java index 3cb2ce2..9e98375 100644 --- a/cloud/common/src/main/java/com/sincere/common/util/Xml2JsonUtils.java +++ b/cloud/common/src/main/java/com/sincere/common/util/Xml2JsonUtils.java @@ -13,20 +13,6 @@ import java.util.List; */ public class Xml2JsonUtils { - - public static void main(String[] args) throws Exception { - String xmlStr= - "" + - "9943601abd0575040013388685716校管理员00" + - "18639924计老师05750400-D00000115757371362教师00" + - "30962787王佳奕105750400-D00000113000000000教师00" + - ""; - Document doc= DocumentHelper.parseText(xmlStr); - JSONObject json=new JSONObject(); - dom4j2Json(doc.getRootElement(),json); - System.out.println("xml2Json:"+json.toJSONString()); - } - /** * xml转json * @param xmlStr diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java index dff4784..3c32afc 100644 --- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/KqController.java @@ -28,6 +28,7 @@ public class KqController { for(KqTemplate kqTemplate : list){ TemplateDto templateDto = new TemplateDto(); templateDto.setId(kqTemplate.getId()); + templateDto.setTitle(kqTemplate.getTitle()); templateDto.setConfig(kqTemplate.getConfig()); templateDto.setSchoolId(kqTemplate.getSchoolId()); templateDto.setType(kqTemplate.getType()); @@ -43,6 +44,7 @@ public class KqController { for(KqTemplate kqTemplate : list){ TemplateDto templateDto = new TemplateDto(); templateDto.setId(kqTemplate.getId()); + templateDto.setTitle(kqTemplate.getTitle()); templateDto.setConfig(kqTemplate.getConfig()); templateDto.setSchoolId(kqTemplate.getSchoolId()); templateDtos.add(templateDto); diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/KqTemplate.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/KqTemplate.java index f61713d..e32a455 100644 --- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/KqTemplate.java +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/KqTemplate.java @@ -8,10 +8,19 @@ package com.sincere.smartSearch.model; public class KqTemplate { private int id ; + private String title ; private String config ; private int schoolId ; private String type ; + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public int getId() { return id; } diff --git a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml index 7423171..b0de398 100644 --- a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml +++ b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml @@ -4,13 +4,14 @@ + diff --git a/cloud/search_smartCampus/src/main/resources/mapper/SyncMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/SyncMapper.xml index 866216a..7d1594c 100644 --- a/cloud/search_smartCampus/src/main/resources/mapper/SyncMapper.xml +++ b/cloud/search_smartCampus/src/main/resources/mapper/SyncMapper.xml @@ -63,35 +63,35 @@ - insert into SZ_DeptRelation (hxyDeptId,yxyDeptId,usertype,updateTime,createTime,state) + insert into YXY_DeptRelation (hxyDeptId,yxyDeptId,usertype,updateTime,createTime,state) values (#{hxyDeptId},#{yxyDeptId},#{userType},GETDATE(),GETDATE(),#{state}) - update SZ_DeptRelation set updateTime = GETDATE() , state = #{state} where hxyDeptId = #{hxyDeptId} + update YXY_DeptRelation set updateTime = GETDATE() , state = #{state} where hxyDeptId = #{hxyDeptId} - insert into SZ_UserRelation (hxyCustomerId,yxyUserId,userType,updateTime,createTime,state) + insert into YXY_UserRelation (hxyCustomerId,yxyUserId,userType,updateTime,createTime,state) values (#{hxyCustomerId},#{yxyUserId},#{userType},GETDATE(),GETDATE(),#{state}) - update SZ_UserRelation set updateTime = GETDATE() , state = #{state} where hxyCustomerId = #{hxyCustomerId} + update YXY_UserRelation set updateTime = GETDATE() , state = #{state} where hxyCustomerId = #{hxyCustomerId} \ No newline at end of file -- libgit2 0.21.0