diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java index f25c0d1..36a52b1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -2,7 +2,6 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.permission.dao.master.MasterCheckItemMapper; import com.lyms.platform.permission.model.CheckItem; -import com.lyms.platform.permission.model.CheckItemManage; import com.lyms.platform.permission.service.CheckItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,7 +9,7 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; -@Service +@Service("cfCheckItemService") public class CheckItemServiceImpl implements CheckItemService { @Autowired diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index f2c2e35..afdbf13 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1686,13 +1686,13 @@ public class DateUtil { return getYmdDate(calendar.getTime()); } -/* public static void main(String[] args) { + public static void main(String[] args) { Date bir = parseYMD("2017-03-08"); - Date bir1 = parseYMD("2019-03-08"); - int i = DateUtil.getAge2(bir, bir1); - System.out.println(i); + Date bir1 = parseYMD("2020-09-01"); + //int i = DateUtil.getAge2(bir, bir1); + System.out.println(bir1.getTime()); - }*/ + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index 96579fb..a4594da 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -48,6 +48,7 @@ public class HttpClientUtil { configBuilder.setSocketTimeout(MAX_TIMEOUT); // 设置从连接池获取连接实例的超时 configBuilder.setConnectionRequestTimeout(MAX_TIMEOUT); + // 在提交请求之前 测试连接是否可用 configBuilder.setStaleConnectionCheckEnabled(true); requestConfig = configBuilder.build(); @@ -223,6 +224,7 @@ public class HttpClientUtil { StringEntity stringEntity = new StringEntity(json.toString(),"UTF-8");//解决中文乱码问题 stringEntity.setContentEncoding("UTF-8"); stringEntity.setContentType("application/json"); + httpPost.setHeader("connection", "Keep-Alive"); httpPost.setEntity(stringEntity); response = httpClient.execute(httpPost); int statusCode = response.getStatusLine().getStatusCode(); diff --git a/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml b/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml index 9ed91c2..4f66f43 100644 --- a/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-job-index/src/main/resources/spring/applicationContext-quartz.xml @@ -22,7 +22,7 @@ - + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java index 6bb93e3..7498a5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java @@ -7,6 +7,7 @@ import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.CheckItem; import com.lyms.platform.permission.service.CheckItemService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -23,6 +24,7 @@ import java.util.Map; @RequestMapping("/checkitem") public class CheckItemController extends BaseController { @Autowired + @Qualifier("cfCheckItemService") private CheckItemService checkItemService; @RequestMapping(value = "/getCheckItemList", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index 6288e21..fba2907 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -13,6 +13,7 @@ import com.lyms.platform.permission.service.CheckItemManageService; import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.OrganizationService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -28,6 +29,7 @@ public class CheckItemManageController extends BaseController { private CheckItemManageService checkItemManageService; @Autowired + @Qualifier("cfCheckItemService") private CheckItemService checkItemService; @Autowired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index fb3182c..5394604 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -107,6 +107,7 @@ public class AntExRecordFacade { private DzfyHisService dzfyHisService; @Autowired + @Qualifier("cfCheckItemService") private CheckItemService checkItemService; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index cf2e949..c258a9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -31,6 +31,7 @@ import com.mongodb.BasicDBObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.aggregation.Aggregation; @@ -128,6 +129,7 @@ public class BabyCheckFacade extends BaseServiceImpl { @Autowired + @Qualifier("cfCheckItemService") private CheckItemService checkItemService; public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 2746eba..ffc2b74 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -38,6 +38,7 @@ import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -203,6 +204,7 @@ public class ViewFacade { private QhdfyHisService qhdfyHisService; @Autowired + @Qualifier("cfCheckItemService") private CheckItemService checkItemService; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 46be840..bcf5bd0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -98,7 +98,6 @@ public class MessageCenterService { String json = ""; try { json = JsonUtil.obj2Str(list); - System.out.println(json); String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", json); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class);