diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoQuery.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoQuery.java index fb9f9e3..cf7a371 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoQuery.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoQuery.java @@ -44,9 +44,9 @@ public class MongoQuery { if (null != coniticon &&coniticon.getCriteria() !=null) { query.addCriteria(coniticon.getCriteria()); } - if (CollectionUtils.isNotEmpty(sortList)) { - query.with(new Sort(sortList)); - } +// if (CollectionUtils.isNotEmpty(sortList)) { +// query.with(new Sort(sortList)); +// } if (end > 0) { query.skip(start).limit(end); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 4252d4d..6596e8d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -555,6 +555,44 @@ public class BabyCheckModel extends BaseModel { //先天性白内障 private String xtxblz; + //家庭地址 或者是居住地址 + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + public String getXtxblz() { return xtxblz; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java index 4246b1f..57482be 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java @@ -195,6 +195,44 @@ public class NewbornVisit { //母亲出生日期 private String motherBirthDate; + //家庭地址 或者是居住地址 + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + public Integer getIsAppCreate() { return isAppCreate; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java index 44e3dcd..a12531e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -203,6 +203,43 @@ public class PostReviewModel extends BaseModel { private String followupDate; //国家规范版本号 private String standard; + //家庭地址 或者是居住地址 + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } public Integer getIsAppCreate() { return isAppCreate; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index ec34cae..6f402e4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; +import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Arrays; @@ -30,6 +31,8 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu private String[] buildIds; private String hospitalId; + private String streetId; + private List streetIds; private List hospitalIds; //体重评价 @@ -85,6 +88,22 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu private Boolean lhdsl; private List articleTypes; + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public List getStreetIds() { + return streetIds; + } + + public void setStreetIds(List streetIds) { + this.streetIds = streetIds; + } + public Date getGteModified() { return gteModified; } @@ -202,7 +221,12 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu if (null != heightWeight) { condition = condition.and("heightWeight", heightWeight, MongoOper.IS); } - + if(null!=streetId){ + condition=condition.and("streetId", streetId, MongoOper.IS); + } + if(CollectionUtils.isNotEmpty(streetIds)){ + condition=condition.and("streetId", streetIds, MongoOper.IN); + } if(null!=buildId){ condition=condition.and("buildId", buildId, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 58b1c1d..791e0ea 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -341,6 +341,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String cityId; private String streetId; + private List streetIds; //详细地址 private String address; @@ -415,6 +416,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { // 1 本县 2 外县 private Integer areaType; + public List getStreetIds() { + return streetIds; + } + + public void setStreetIds(List streetIds) { + this.streetIds = streetIds; + } + public Integer getCompleteCheck() { return completeCheck; } @@ -1931,6 +1940,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(streetId)) { condition = condition.and("streetId", streetId, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(streetIds)) { + condition = condition.and("streetId", streetIds, MongoOper.IN); + } if (StringUtils.isNotEmpty(address)) { condition = condition.and("address", address, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index f80ebc8..8951956 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -113,6 +113,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String cityRegisterId; private String areaRegisterId; private String streetRegisterId; + private List streetRegisterIds; private String noProvinceRegisterId; private String noCityRegisterId; @@ -611,6 +612,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.serviceTypeIsExist = serviceTypeIsExist; } + public List getStreetRegisterIds() { + return streetRegisterIds; + } + + public void setStreetRegisterIds(List streetRegisterIds) { + this.streetRegisterIds = streetRegisterIds; + } + public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -811,6 +820,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(streetRegisterId)) { condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(streetRegisterIds)) { + condition = condition.and("streetRegisterId", streetRegisterIds, MongoOper.IN); + } if (StringUtils.isNotEmpty(provincePostRestId)) { condition = condition.and("provincePostRestId", provincePostRestId, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 9f4c066..3075fc2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -45,6 +45,8 @@ 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; +import org.springframework.data.mongodb.core.aggregation.AggregationResults; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; @@ -5769,8 +5771,159 @@ public class TestController extends BaseController { } + /** + * 眼保健正常 + * @return + */ + @RequestMapping(value = "/addBabyEyeCheckZc", method = RequestMethod.GET) + @ResponseBody + public String addBabyEyeCheckZc() { + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()).and("hospitalId").is("2100001605") + .and("guideSuggest").regex(Pattern.compile("^.*眼保健.*$")).and("qgscResult").exists(false); + List checkModels = mongoTemplate.find(new Query(criteria),BabyCheckModel.class); + if (CollectionUtils.isNotEmpty(checkModels)) + { + for (BabyCheckModel checkModel : checkModels) + { + Map result = new HashMap<>(); + result.put("yesOrNo","no"); + result.put("sg","false"); + result.put("js","false"); + result.put("rs","false"); + result.put("ys","false"); + checkModel.setQgscResult(result); + + System.out.println("眼保健 update "+checkModel.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkModel)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkModel.getId())), update, + BabyCheckModel.class); + } + } + return "success"; + } + /** + * 眼保健异常 + * @return + */ + @RequestMapping(value = "/addBabyEyeCheckYc", method = RequestMethod.GET) + @ResponseBody + public String addBabyEyeCheckYc() { + + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()).and("hospitalId").is("2100001605") + .and("guideSuggest").regex(Pattern.compile("^.*眼复查.*$")).and("qgscResult").exists(false); + List checkModels = mongoTemplate.find(new Query(criteria),BabyCheckModel.class); + if (CollectionUtils.isNotEmpty(checkModels)) + { + for (BabyCheckModel checkModel : checkModels) + { + Map result = new HashMap<>(); + result.put("yesOrNo","yes"); + result.put("sg","false"); + result.put("js","false"); + result.put("rs","false"); + result.put("ys","false"); + + checkModel.setQgscResult(result); + + System.out.println("眼保健 update "+checkModel.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkModel)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkModel.getId())), update, + BabyCheckModel.class); + } + } + return "success"; + } + + + @RequestMapping(value = "/addBabyEyeCheckYcqk", method = RequestMethod.GET) + @ResponseBody + public String addBabyEyeCheckYcqk() { + + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()).and("hospitalId").is("2100001605") + .and("lhdcr").exists(true); + List checkModels = mongoTemplate.find(new Query(criteria),BabyCheckModel.class); + if (CollectionUtils.isNotEmpty(checkModels)) + { + for (BabyCheckModel checkModel : checkModels) + { + boolean flag = false; + if (StringUtils.isNotEmpty(checkModel.getLhdcr())) + { + String lhdcr = checkModel.getLhdcr().replace("+",""); + try{ + if (Double.parseDouble(lhdcr) > 3) { + flag = true; + } + }catch (Exception e) { } + } + if (StringUtils.isNotEmpty(checkModel.getLhdcl())) + { + String lhdcl = checkModel.getLhdcl().replace("+",""); + try{ + if (Double.parseDouble(lhdcl) > 3) { + flag = true; + } + }catch (Exception e) { } + } + boolean flag1 = false; + if (StringUtils.isNotEmpty(checkModel.getLhaxisr())) + { + String lhaxisr = checkModel.getLhaxisr().replace("+",""); + try{ + if (Double.parseDouble(lhaxisr) >= -1) { + flag1 = true; + } + }catch (Exception e) { } + } + if (StringUtils.isNotEmpty(checkModel.getLhaxisl())) + { + String lhaxisl = checkModel.getLhaxisl().replace("+",""); + try{ + if (Double.parseDouble(lhaxisl) > -1) { + flag1 = true; + } + }catch (Exception e) { } + } + + Map result = new HashMap<>(); + if (checkModel.getQgscResult() != null && checkModel.getQgscResult().size() >0) + { + result = checkModel.getQgscResult(); + } + else + { + + result.put("yesOrNo","no"); + result.put("sg","false"); + result.put("js","false"); + result.put("rs","false"); + result.put("ys","false"); + } + + if (flag) + { + result.put("yesOrNo","yes"); + result.put("ys","true"); + } + if (flag1) + { + result.put("yesOrNo","yes"); + result.put("sg","true"); + } + checkModel.setQgscResult(result); + System.out.println("眼保健 update "+checkModel.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkModel)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkModel.getId())), update, + BabyCheckModel.class); + } + } + return "success"; + } @RequestMapping(value = "/exportHandleFmData", method = RequestMethod.GET) @ResponseBody @@ -6011,4 +6164,143 @@ public class TestController extends BaseController { } + /** + * 新生儿方式同步儿童居住地址 + * @return + */ + @RequestMapping(value = "/syncNewbabyHomeAddress", method = RequestMethod.GET) + @ResponseBody + public String syncNewbabyHomeAddress(String start,String end) { + + Criteria criteria = Criteria.where("yn").is("1"); + criteria.and("checkTime").gte(DateUtil.parseYMD(start)).lt(DateUtil.addDay(DateUtil.parseYMD(end), 1)); + List newbornVisits = mongoTemplate.find(new Query(criteria),NewbornVisit.class); + if (CollectionUtils.isNotEmpty(newbornVisits)) + { + System.out.println("新生儿访视跟新记录数"+ newbornVisits.size()); + for (NewbornVisit visit : newbornVisits) + { + try { + if (!StringUtils.isNotEmpty(visit.getBabyId())) + { + continue; + } + + BabyModel babyModel = babyService.getOneBabyById(visit.getBabyId()); + if (babyModel != null && StringUtils.isNotEmpty(babyModel.getStreetId())) + { + visit.setProvinceId(babyModel.getProvinceId()); + visit.setCityId(babyModel.getCityId()); + visit.setAreaId(babyModel.getAreaId()); + visit.setStreetId(babyModel.getStreetId()); + + System.out.println("新生儿访视同步地址 update "+visit.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(visit)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(visit.getId())), update, + NewbornVisit.class); + } + } + catch (Exception e) + { + continue; + } + + } + } + return "success"; + } + + + /** + * 儿童检查同步儿童居住地址 + * @return + */ + @RequestMapping(value = "/syncBabyCheckHomeAddress", method = RequestMethod.GET) + @ResponseBody + public String syncBabyCheckHomeAddress(String start,String end) { + + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()); + criteria.and("checkDate").gte(DateUtil.parseYMD(start)).lt(DateUtil.addDay(DateUtil.parseYMD(end), 1)); + List babyCheckModels = mongoTemplate.find(new Query(criteria),BabyCheckModel.class); + if (CollectionUtils.isNotEmpty(babyCheckModels)) + { + System.out.println("儿童检查新记录数"+ babyCheckModels.size()); + for (BabyCheckModel babyCheckModel : babyCheckModels) + { + try { + if (!StringUtils.isNotEmpty(babyCheckModel.getBuildId())) + { + continue; + } + + BabyModel babyModel = babyService.getOneBabyById(babyCheckModel.getBuildId()); + if (babyModel != null && StringUtils.isNotEmpty(babyModel.getStreetId())) + { + babyCheckModel.setProvinceId(babyModel.getProvinceId()); + babyCheckModel.setCityId(babyModel.getCityId()); + babyCheckModel.setAreaId(babyModel.getAreaId()); + babyCheckModel.setStreetId(babyModel.getStreetId()); + + System.out.println("儿童检查同步地址 "+babyCheckModel.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(babyCheckModel)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyCheckModel.getId())), update, + BabyCheckModel.class); + } + } + catch (Exception e) + { + continue; + } + + } + } + return "success"; + } + + + /** + * 产后访视同步居住地址 + * @return + */ + @RequestMapping(value = "/syncChanHouHomeAddress", method = RequestMethod.GET) + @ResponseBody + public String syncChanHouHomeAddress(String start,String end) { + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()); + criteria.and("checkTime").gte(DateUtil.parseYMD(start)).lt(DateUtil.addDay(DateUtil.parseYMD(end), 1)); + List postReviewModels = mongoTemplate.find(new Query(criteria),PostReviewModel.class); + if (CollectionUtils.isNotEmpty(postReviewModels)) + { + System.out.println(" 产后访视同步居住记录数"+ postReviewModels.size()); + for (PostReviewModel postReviewModel : postReviewModels) + { + try { + if (!StringUtils.isNotEmpty(postReviewModel.getParentId())) + { + continue; + } + Patients patients = patientsService.findOnePatientById(postReviewModel.getParentId()); + if (patients != null && StringUtils.isNotEmpty(patients.getStreetRegisterId())) + { + postReviewModel.setProvinceId(patients.getProvinceRegisterId()); + postReviewModel.setCityId(patients.getCityRegisterId()); + postReviewModel.setAreaId(patients.getAreaRegisterId()); + postReviewModel.setStreetId(patients.getStreetRegisterId()); + System.out.println("产后访视同步居住地址："+postReviewModel.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(postReviewModel)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(postReviewModel.getId())), update, + PostReviewModel.class); + } + } + catch (Exception e) + { + continue; + } + + } + } + return "success"; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 4eb4bfb..f2db02b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3031,25 +3031,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Map streetMap=new HashMap<>(); streetMap.put("streetName",region.getName()); streetMap.put("streetId",region.getId()); - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - - BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setHospitalId(hospitalId); - int babyCount = babyBookbuildingService.queryBabyCount(babyModelQuery); - - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setHospitalId(hospitalId); - int patientCount = patientsService.queryPatientCount(patientsQuery); - if (babyCount == 0 && patientCount == 0) - { - continue; - } - //医院数据 - getDateCount(hospitalId,startDate,endDate,streetMap); - } + //医院数据 + getDateCount(region.getId(),startDate,endDate,streetMap); //合计 mapTotal.put("streetName","合计"); int lastDate1= null==mapTotal.get("data1")?0:Integer.parseInt(mapTotal.get("data1").toString()); @@ -3258,34 +3241,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { /** * 医院数据 - * @param hospitalId 医院id + * @param streetId 乡镇id * @param startDate 开始时间 * @param endDate 结束时间 * @param hospitalDate 医院数据map - * data1 本月活产数 - * data2 累计活产数 - * data3 新生儿访视人数 - * data4 新生儿访视率% - * data5 0-3岁儿童总数 - * data6 0-3岁儿童系统管理人数 - * data7 0-3岁儿童系统管理率% - * data8 0-6岁儿童总数 - * data9 0-6岁儿童系统管理人数 - * data10 0-6岁儿童系统管理率% - * data11 0-6岁儿童健康管理人数 - * data12 0-6岁儿童健康管理率% - * data13 0-6岁儿童眼保健及视力检查人数 - * data14 0-6岁儿童眼保健及视力检查覆盖率% - * data15 孕13周之前建册的人数 - * data16 早孕建册率% - * data17 孕产妇健康管理人数 - * data18 孕产妇健康管理率% - * data19 产后访视人数 - * data20 产后访视率% - * data21 孕产妇系统管理人数 - * data22 孕产妇系统管理率% */ - private void getDateCount(String hospitalId,Date startDate, Date endDate,Map hospitalDate){ + private void getDateCount(String streetId,Date startDate, Date endDate,Map hospitalDate){ //传入的时间获取年的第一天 Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(startDate)); DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0 @@ -3296,7 +3257,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { babyModelQuery.setDataStatus(false); babyModelQuery.setBuildType(2); babyModelQuery.setPregnancyOut("0"); - babyModelQuery.setHospitalId(hospitalId); + babyModelQuery.setStreetId(streetId); babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); @@ -3317,7 +3278,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //本月新生儿访视人数 int data26 = (int)mongoTemplate.count(new Query(Criteria. where("yn").is("1") - .and("hospitalId").is(hospitalId) + .and("streetId").is(streetId) .and("checkTime").gte(startDate).lte(endDate)),NewbornVisit.class); int lastDate26= null==hospitalDate.get("data26")?0:Integer.parseInt(hospitalDate.get("data26").toString()); hospitalDate.put("data26",data26+lastDate26); @@ -3325,7 +3286,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //累计新生儿访视人数 int data3 = (int)mongoTemplate.count(new Query(Criteria. where("yn").is("1") - .and("hospitalId").is(hospitalId) + .and("streetId").is(streetId) .and("checkTime").lte(endDate)),NewbornVisit.class); int lastDate3= null==hospitalDate.get("data3")?0:Integer.parseInt(hospitalDate.get("data3").toString()); hospitalDate.put("data3",data3+lastDate3); @@ -3346,7 +3307,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalId(hospitalId); + babyQuery.setStreetId(streetId); Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); @@ -3421,7 +3382,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //0-6岁儿童眼保健及视力检查人数 BabyCheckModelQuery checkModelQuery = new BabyCheckModelQuery(); - checkModelQuery.setHospitalId(hospitalId); + checkModelQuery.setStreetId(streetId); checkModelQuery.setYn(YnEnums.YES.getId()); checkModelQuery.setBirthStart(end1); checkModelQuery.setBirthEnd(start1); @@ -3447,7 +3408,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { PatientsQuery patientsQuery=new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setHospitalId(hospitalId); + patientsQuery.setStreetRegisterId(streetId); patientsQuery.setBuildDaysStart(0); patientsQuery.setBuildDaysEnd(13*7-1); patientsQuery.setDueStatus(0); @@ -3478,7 +3439,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { hospitalDate.put("data16",data15_data2+"%"); //孕产妇健康管理人数 PatientsQuery patientsQuery2=new PatientsQuery(); - patientsQuery2.setHospitalId(hospitalId); + patientsQuery2.setStreetRegisterId(streetId); patientsQuery2.setDueStatus(0); patientsQuery2.setExtEnable(false); patientsQuery2.setBuildTypeNot(1); @@ -3506,7 +3467,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //产后访视人数 int data19= (int)mongoTemplate.count(new Query(Criteria. - where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).and("yn").is(1)),PostReviewModel.class); + where("streetId").is(streetId).and("checkTime").lte(endDate).and("yn").is(1)),PostReviewModel.class); int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString()); hospitalDate.put("data19",data19+lastDate19); @@ -3523,7 +3484,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { hospitalDate.put("data20",data19_data2+"%"); PatientsQuery patientsQuery1 = new PatientsQuery(); - patientsQuery1.setHospitalId(hospitalId); + patientsQuery1.setStreetRegisterId(streetId); patientsQuery1.setIsComplete(2); int data21 = patientsService.queryPatientCount(patientsQuery1); int lastDate21= null==hospitalDate.get("data21")?0:Integer.parseInt(hospitalDate.get("data21").toString()); @@ -3544,7 +3505,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //中医指导的人次 end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); - checkModelQuery1.setHospitalId(hospitalId); + checkModelQuery1.setStreetId(streetId); checkModelQuery1.setYn(YnEnums.YES.getId()); checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); @@ -3644,17 +3605,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime,Integer type) { //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); @@ -3663,7 +3619,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setBirthEnd(start1); Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); - checkModelQuery1.setHospitalIds(hospitalIds); + checkModelQuery1.setStreetIds(streetIds); checkModelQuery1.setYn(YnEnums.YES.getId()); checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); @@ -3723,25 +3679,20 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date startDate=DateUtil.getDateMonthFirst(dateTime); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyModelQuery = new BabyModelQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { babyModelQuery.setExistSource(false); babyModelQuery.setDataStatus(false); babyModelQuery.setBuildType(2); babyModelQuery.setPregnancyOut("0"); - babyModelQuery.setHospitalIdList(hospitalIds); + babyModelQuery.setStreetIds(streetIds); babyModelQuery.setPage(page); babyModelQuery.setLimit(limit); @@ -3800,23 +3751,18 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date startDate=DateUtil.getDateMonthFirst(dateTime); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { Criteria criteria = Criteria. where("yn").is("1") - .and("hospitalId").in(hospitalIds); + .and("streetId").in(streetIds); if (type == 1) { //本月访视人数 @@ -3865,14 +3811,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Integer startMonth = null; @@ -3913,12 +3854,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalIdList(hospitalIds); + babyQuery.setStreetIds(streetIds); Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); @@ -3996,23 +3937,18 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { //孕13周之前建册的人数 patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setHospitalList(hospitalIds); + patientsQuery.setStreetRegisterIds(streetIds); patientsQuery.setBuildDaysStart(0); patientsQuery.setBuildDaysEnd(13*7-1); patientsQuery.setDueStatus(0); @@ -4057,20 +3993,15 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { Criteria criteria = Criteria. - where("hospitalId").in(hospitalIds).and("checkTime").lte(endDate).and("yn").is(1); + where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1); PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit); List postReviewModels = (List ) pageResult.getGrid(); @@ -4110,17 +4041,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { public BaseResponse getBabyEyeCheckItems(Integer page, Integer limit, String areaId, String streetId, Date dateTime) { //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); @@ -4129,7 +4055,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setBirthEnd(start1); Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); - checkModelQuery1.setHospitalIds(hospitalIds); + checkModelQuery1.setStreetIds(streetIds); checkModelQuery1.setYn(YnEnums.YES.getId()); checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); @@ -4178,24 +4104,19 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalIdList(hospitalIds); + babyQuery.setStreetIds(streetIds); Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); @@ -4237,24 +4158,18 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { - babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setHospitalIdList(hospitalIds); + babyQuery.setStreetIds(streetIds); Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); @@ -4305,19 +4220,14 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { patientsQuery.setDueStatus(0); patientsQuery.setExtEnable(false); @@ -4326,7 +4236,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); patientsQuery.setBookbuildingDateEnd(endDate); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setHospitalList(hospitalIds); + patientsQuery.setStreetRegisterIds(streetIds); patientsQuery.setExistLastCheckEmployeeId(true); patientsQuery.setType(3); patientsQuery.setPage(page); @@ -4375,21 +4285,16 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 List regions = getRegions(areaId,streetId); - List hospitalIds = new ArrayList<>(); + List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - //获得街道下的医院 - List organizations = getOrganization(region.getId()); - for (Organization organization : organizations) { - String hospitalId= StringUtils.getIntToVal(organization.getId()); - hospitalIds.add(hospitalId); - } + streetIds.add(region.getId()); } Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); - if (CollectionUtils.isNotEmpty(hospitalIds)) + if (CollectionUtils.isNotEmpty(streetIds)) { - patientsQuery.setHospitalList(hospitalIds); + patientsQuery.setStreetRegisterIds(streetIds); patientsQuery.setIsComplete(2); patientsQuery.setPage(page); patientsQuery.setLimit(limit); @@ -4431,4 +4336,5 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { return new BaseListResponse().setErrorcode(0).setErrormsg("成功") .setData(results).setPageInfo(patientsQuery.getPageInfo()); } + } diff --git a/platform-transfer/pom.xml b/platform-transfer/pom.xml index f33e8d5..6a18357 100644 --- a/platform-transfer/pom.xml +++ b/platform-transfer/pom.xml @@ -25,10 +25,10 @@ - + - + @@ -110,12 +110,12 @@ true - src/main/resources/lib - BOOT-INF/lib/ - - **/*.jar - - + src/main/resources/lib + BOOT-INF/lib/ + + **/*.jar + + diff --git a/platform-transfer/src/main/java/com/lyms/platform/contraller/TestController.java b/platform-transfer/src/main/java/com/lyms/platform/contraller/TestController.java new file mode 100644 index 0000000..a4218c7 --- /dev/null +++ b/platform-transfer/src/main/java/com/lyms/platform/contraller/TestController.java @@ -0,0 +1,45 @@ +package com.lyms.platform.contraller; + +import com.lyms.platform.pojo.Patients; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.aggregation.Aggregation; +import org.springframework.data.mongodb.core.aggregation.AggregationResults; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +@Controller +public class TestController { + @Autowired + private MongoTemplate mongoTemplate; + + @RequestMapping(value = "/testMongodb", method = RequestMethod.GET) + @ResponseBody + public Object testMongodb() { + // TODO 店长是否实名认证 + Aggregation aggregation = Aggregation.newAggregation( + // 关联member表 + Aggregation.lookup( + "lyms_matdeliver", // 从表表名 + "parentId", // 如shop被查询主表的userId，相对于member表的外键 + "_id", // 如member从表的主键_id，相对于member表的主键 + "docs_member" // 联合查询出的别名，用于多条件查询表明前缀，相当于SQL中的临时表名 + ), + Aggregation.match( + Criteria.where("type").is(3) // 添加member表查询条件，如用户手机号，此处可举一反三 + ), + // 分页：页码 + Aggregation.skip(1), + // 分页：条数 + Aggregation.limit((long) 10), + // 排序 + Aggregation.sort(Sort.Direction.DESC,"created") + ); + // 执行查询，这里的shop必须是查询的主表名 + AggregationResults results = mongoTemplate.aggregate(aggregation, "lyms_patient", Patients.class); + return results.getMappedResults(); + } +} diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java b/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java index b93ca8d..9b58b70 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java @@ -14,7 +14,6 @@ public abstract class TransferAbstract implements ITransfer { private static final Logger logger = LoggerFactory.getLogger(BoneTransferWorker.class); public abstract void doTransfer(); - @Override public String send(Map data,String path) { if (data != null && data.size() > 0) { diff --git a/regional-etl/pom.xml b/regional-etl/pom.xml deleted file mode 100644 index e70d164..0000000 --- a/regional-etl/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 1.5.3.RELEASE - - - com.lyms.etl - regional-etl - - - UTF-8 - UTF-8 - 1.7 - - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-aop - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.2.0 - - - - org.springframework.boot - spring-boot-starter-data-mongodb - 1.5.2.RELEASE - - - - org.springframework.boot - spring-boot-starter-test - test - - - - mysql - mysql-connector-java - - - - com.alibaba - druid - 1.0.31 - - - - org.springframework.boot - spring-boot-devtools - true - - - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - org.slf4j - log4j-over-slf4j - - - - org.apache.commons - commons-collections4 - 4.1 - - - org.apache.commons - commons-lang3 - 3.5 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - \ No newline at end of file diff --git a/regional-etl/src/main/java/com/lyms/etl/ApplicationRunner.java b/regional-etl/src/main/java/com/lyms/etl/ApplicationRunner.java deleted file mode 100644 index 760339e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/ApplicationRunner.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.lyms.etl; - -import com.lyms.etl.datasource.DynamicDataSourceRegister; -import com.lyms.etl.service.IInvokeHandler; -import com.lyms.etl.util.AopTargetUtil; -import org.mybatis.spring.annotation.MapperScan; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -import java.util.Date; -import java.util.Set; - -/** - * @Author: litao - * @Date: 2017/5/2 0002 20:29 - * @Version: V1.0 - */ -@SpringBootApplication -@EnableTransactionManagement -@Import({ DynamicDataSourceRegister.class }) -@MapperScan("com.lyms.etl.dao") -public class ApplicationRunner implements CommandLineRunner{ - - private static final Logger log = LoggerFactory.getLogger(ApplicationRunner.class); - - @Autowired - Set invokeHandlers; - - public static void main(String[] args) { - SpringApplication.run(ApplicationRunner.class, args); - } - - @Override - public void run(String... strings) throws Exception { - for (IInvokeHandler handler : invokeHandlers) { - Date start = new Date(); - log.info("start ................ {}", AopTargetUtil.getTarget(handler).getClass().getName()); - handler.invoke(); - log.info("end ................ used: {} ms", System.currentTimeMillis() - start.getTime()); - } - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/dao/ICouponInfoDao.java b/regional-etl/src/main/java/com/lyms/etl/dao/ICouponInfoDao.java deleted file mode 100644 index d7394c9..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/dao/ICouponInfoDao.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lyms.etl.dao; - -import com.lyms.etl.model.CouponInfo; -import com.lyms.etl.model.HospitalCouponTemplateGroup; - -import java.util.List; -import java.util.Map; - -/** - * @Author: litao - * @Date: 2017/5/3 0003 11:30 - * @Version: V1.0 - */ -public interface ICouponInfoDao { - - CouponInfo find(String id); - - void save(CouponInfo couponInfo); - - String findTempId(Map number); - - HospitalCouponTemplateGroup findHospital(String hospitalId); - - void saveHospitalGroup(HospitalCouponTemplateGroup hospitalCouponTemplateGroup); - - void batchSave(List commitList); - - List findDistinctUserId(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSource.java b/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSource.java deleted file mode 100644 index 4bc9cb2..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSource.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lyms.etl.datasource; - -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - -/** - * 动态数据源 - * @Author: litao - * @Date: 2017/5/17 0017 10:25 - * @Version: V1.0 - */ -public class DynamicDataSource extends AbstractRoutingDataSource { - - @Override - protected Object determineCurrentLookupKey() { - return DynamicDataSourceContextHolder.getDataSourceType(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceAnno.java b/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceAnno.java deleted file mode 100644 index bccc075..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceAnno.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lyms.etl.datasource; - -import java.lang.annotation.*; - -/** - * 在方法或类上使用，用于指定使用哪个数据源 - * @Author: litao - * @Date: 2017/5/17 0017 10:31 - * @Version: V1.0 - */ -@Target({ ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface DynamicDataSourceAnno { - String value() default ""; -} diff --git a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceAspect.java b/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceAspect.java deleted file mode 100644 index 3d8589e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceAspect.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.lyms.etl.datasource; - -import com.lyms.etl.util.ReflectUtil; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.lang.reflect.Method; - -/** - * 动态切换数据源aop - * @Author: litao - * @Date: 2017/5/17 0017 10:48 - * @Version: V1.0 - */ -@Aspect -@Component -//@Order(1) /** 保证在方法执行前执行 */ -public class DynamicDataSourceAspect { - private static final Logger logger = LoggerFactory.getLogger(DynamicDataSourceAspect.class); - - @Pointcut("@within(DynamicDataSourceAnno) || @annotation(DynamicDataSourceAnno)") - private void advice() { - } - - @Before("advice()") - public void setDataSource(JoinPoint point) { - try { - Class clazz = point.getTarget().getClass(); - MethodSignature signature = (MethodSignature) point.getSignature(); - Method method = signature.getMethod(); - - /** 可能是通过接口调用方法 所以通过反射获取实现类方法上面的注解 */ - DynamicDataSourceAnno anno = ReflectUtil.getMethodAnno(clazz, method.getName(), DynamicDataSourceAnno.class); - if(anno == null) { /** 方法上沒注解获取类上面的注解 由于只拦截了类和方法上的注解 所以不可能为空 */ - anno = clazz.getAnnotation(DynamicDataSourceAnno.class); - } - - String datasource = anno.value(); - if(DynamicDataSourceContextHolder.containsDataSource(datasource)) { - DynamicDataSourceContextHolder.setDataSourceType(datasource); - logger.info("切换到 [{}] 数据源", datasource); - } else { - logger.info("数据源 [{}] 未找到，使用默认数据源", datasource); - } - } catch (Exception e) { - logger.error("切换数据源失败: ", e.fillInStackTrace()); - } - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceContextHolder.java b/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceContextHolder.java deleted file mode 100644 index 2167214..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceContextHolder.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lyms.etl.datasource; - -import java.util.ArrayList; -import java.util.List; - -/** - * 通过ThreadLocal来存储当前所使用数据源对应的key - * @Author: litao - * @Date: 2017/5/17 0017 10:25 - * @Version: V1.0 - */ -public class DynamicDataSourceContextHolder { - - private static final ThreadLocal contextHolder = new ThreadLocal(); - - public static List dataSourceIds = new ArrayList<>(); - - public static void setDataSourceType(String dataSourceType) { - contextHolder.set(dataSourceType); - } - - public static String getDataSourceType() { - return contextHolder.get(); - } - - public static void clearDataSourceType() { - contextHolder.remove(); - } - - public static boolean containsDataSource(String dataSourceId){ - return dataSourceIds.contains(dataSourceId); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceRegister.java b/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceRegister.java deleted file mode 100644 index 4c4c128..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/datasource/DynamicDataSourceRegister.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.lyms.etl.datasource; - -import com.alibaba.druid.pool.DruidDataSourceFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.boot.bind.RelaxedPropertyResolver; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.EnvironmentAware; -import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -import org.springframework.core.env.Environment; -import org.springframework.core.type.AnnotationMetadata; - -import javax.sql.DataSource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Author: litao - * @Date: 2017/5/18 0018 20:08 - * @Version: V1.0 - */ -public class DynamicDataSourceRegister - implements ImportBeanDefinitionRegistrar, EnvironmentAware { - - private static final Logger LOG = LoggerFactory.getLogger(DynamicDataSourceRegister.class); - - private DataSource defaultDataSource; /** 主数据源 */ - private Map customDataSources = new HashMap<>(); /** 其他数据源 */ - - @Override - public void setEnvironment(Environment environment) { - initDefaultDataSource(environment); -// initCustomDataSources(environment); - } - - /** - * 初始化主数据源（默认数据源） - * @param environment - */ - @ConfigurationProperties - private void initDefaultDataSource(Environment environment) { - try { - RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, "spring.datasource"); - - Map connProperties = propertyResolver.getSubProperties(".default."); - System.err.println("connProperties = [" + connProperties + "]"); - defaultDataSource = DruidDataSourceFactory.createDataSource(connProperties); - } catch (Exception e) { - LOG.error("初始化主数据源出错：", e.fillInStackTrace()); - } - } - - - /** - * 初始化多数据源 - * @param environment - */ - private void initCustomDataSources(Environment environment) { - try { - RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, "spring.datasource"); - - Map connProperties = propertyResolver.getSubProperties(".default."); - System.err.println("connProperties>>> " + connProperties); - List customs = (List) connProperties.get("customs"); - } catch (Exception e) { - LOG.error("初始化多数据源失败：", e.fillInStackTrace()); - } - } - - - @Override - public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry beanDefinitionRegistry) { - System.err.println("registerBeanDefinitions"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/model/AntExChu.java b/regional-etl/src/main/java/com/lyms/etl/model/AntExChu.java deleted file mode 100644 index b6019d1..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/model/AntExChu.java +++ /dev/null @@ -1,1005 +0,0 @@ -package com.lyms.etl.model; - -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.Date; -import java.util.List; - -/** - * 产前检查初诊模型 - * - * Created by Administrator on 2016/6/21 0021. - */ -@Document(collection = "lyms_antexc") -public class AntExChu { - - //条码 - private String barCode; - private String id; - private String parentId; - private String pid; - //预产期 - private Date dueDate; - //末次月经 - private Date lastMenses; - private String cDueWeek; - private String bg; - // 既往史 - private String pastHistory ; - // 家族史 - private String familyHistory ; - //个人史 - private String personalHistory; - //疫苗接种史 - private String ymjzHistory ; - //药物过敏史 - private String ywgmHistory ; - //妇科手术史 - private String fksxHistory ; - // 叶酸服用 - private String ysfyHistory ; - //孕次 - private Integer pregnancyTimes; - // 产次 - private Integer prodTime; - // 顺产 - private Integer delivery; - //刨宫产 - private Integer planedProd; - //流产 - private Integer abortion; - //死胎 - private Integer stillbirth; - //死产 - private Integer stillChan ; - //新生儿死亡 - private Integer neoDeath; - //出生缺陷 - private Integer birthDefect; - // 身高 - private String height; - //体重 - private String weight ; - //孕前体重 - private String yqWeight ; - //体重指数 - private String baricIndex; - //本次妊娠情况 - private String cestationInfo; - // 宫高 - private String gonggao; - //腹围 - private String fuwei; - //胎数 - private String tireNumber1; - private String syjg; - private List placentas; - //心脏 - private String heart; - //肺部 - private String lungs; - //外阴 - private String vulva; - //阴道 - private String vagina; - //宫颈 - private String cervical; - //子宫 - private String uterus; - //附件 - private String fujian; - private Date created; - private String hospitalId; - private String bp; - //丈夫健康情况 - private String hHealthInfo; - - //自然流产 - private Integer abortionZR; - //人工流产 - private Integer abortionRG; - - public String getBarCode() { - return barCode; - } - - public void setBarCode(String barCode) { - this.barCode = barCode; - } - - public Integer getAbortionZR() { - return abortionZR; - } - - public void setAbortionZR(Integer abortionZR) { - this.abortionZR = abortionZR; - } - - public Integer getAbortionRG() { - return abortionRG; - } - - public void setAbortionRG(Integer abortionRG) { - this.abortionRG = abortionRG; - } - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - - public String getBp() { - return bp; - } - - public void setBp(String bp) { - this.bp = bp; - } - - public String getcDueWeek() { - return cDueWeek; - } - - public void setcDueWeek(String cDueWeek) { - this.cDueWeek = cDueWeek; - } - - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } - - public String getCervical() { - return cervical; - } - - public String getBg() { - return bg; - } - - public void setBg(String bg) { - this.bg = bg; - } - - public void setCervical(String cervical) { - this.cervical = cervical; - } - - public String getFujian() { - return fujian; - } - - public void setFujian(String fujian) { - this.fujian = fujian; - } - - public String getHeart() { - return heart; - } - - public void setHeart(String heart) { - this.heart = heart; - } - - public String getLungs() { - return lungs; - } - - public void setLungs(String lungs) { - this.lungs = lungs; - } - - public String getUterus() { - return uterus; - } - - public void setUterus(String uterus) { - this.uterus = uterus; - } - - public String getVagina() { - return vagina; - } - - public void setVagina(String vagina) { - this.vagina = vagina; - } - - public String getVulva() { - return vulva; - } - - public void setVulva(String vulva) { - this.vulva = vulva; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getSyjg() { - return syjg; - } - - public void setSyjg(String syjg) { - this.syjg = syjg; - } - - public String gethHealthInfo() { - return hHealthInfo; - } - - public void sethHealthInfo(String hHealthInfo) { - this.hHealthInfo = hHealthInfo; - } - - /*//心率 - private double heartRate; - //胎方位 - private String fetalPosition; - //胎先露 - private String fetalPresentation; - // 衔接 - private String join;*/ - //高危因素 - private String highrisk ; - //高危评分 - private String highriskSocre; - // 其他高危 - private String otherHighRisk; - // 诊断 - private String diagnosis; - //处理意见 - private String treatOpinion; - //指导意见 - private String dirOpinion; - //产检 医生 - private String prodDoctor; - //产检日期 - private Date checkTime; - //下次产检时间 - private Date nextCheckTime; - private Integer yn; - //血红蛋白值 - private String xhdb ; - //白细胞计数值 - private String bxbjs ; - //血小板 - private String platelet; - // 血常规其他 - private String chgOther ; - // 尿蛋白 - private String ndb; - //尿糖 - private String nt; - //尿同体 - private String urineKetone ; - // 尿潜血 - private String bld ; - //尿常规其他 - private String ncgOther; - //ABO - private String abo ; - // rh - private String rh ; - // 血糖 - private String bloodSugar; - //B超 - private String bChao ; - //胎数 - private String tireNumber ; - //血清谷丙转氨酶 - private String xqgbzam ; - //血清谷草转氨酶 - private String xqgczam ; - //白蛋白 - private String albumin ; - //总胆红素 - private String totalBilirubin; - // 结合胆红素 - private String jhBilirubin ; - - public Date getModified() { - return modified; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - //乙肝表面抗原 - private String ygbmky; - //乙肝表面抗体 - private String ygbmkt; - //乙肝e抗原 - private String ygeky; - //乙肝e抗体 - private String ygekt; - // 乙肝核心抗体 - private String yghxkt; - // 血清肌 - private String xqjq; - // 血尿素氮 - private String xnsd; - // 梅毒血清实验 -// private String mdxqsy; - // hit抗体检测 - private String hivkt; - // 阴道分泌物 - private String ydfmw; - // 阴道清洁度 - private String ydqjd; - - private Date modified; - //操作人 - private Integer operator; - - public Integer getOperator() { - return operator; - } - - public void setOperator(Integer operator) { - this.operator = operator; - } - - public String getCestationInfo() { - return cestationInfo; - } - - public void setCestationInfo(String cestationInfo) { - this.cestationInfo = cestationInfo; - } - - - - - public String getDiagnosis() { - return diagnosis; - } - - public void setDiagnosis(String diagnosis) { - this.diagnosis = diagnosis; - } - - public String getDirOpinion() { - return dirOpinion; - } - - public void setDirOpinion(String dirOpinion) { - this.dirOpinion = dirOpinion; - } - - public String getFamilyHistory() { - return familyHistory; - } - - public void setFamilyHistory(String familyHistory) { - this.familyHistory = familyHistory; - } - - public String getFksxHistory() { - return fksxHistory; - } - - public void setFksxHistory(String fksxHistory) { - this.fksxHistory = fksxHistory; - } - - public String getFuwei() { - return fuwei; - } - - public void setFuwei(String fuwei) { - this.fuwei = fuwei; - } - - public String getGonggao() { - return gonggao; - } - - public void setGonggao(String gonggao) { - this.gonggao = gonggao; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getHighrisk() { - return highrisk; - } - - public void setHighrisk(String highrisk) { - this.highrisk = highrisk; - } - - public String getHighriskSocre() { - return highriskSocre; - } - - public void setHighriskSocre(String highriskSocre) { - this.highriskSocre = highriskSocre; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - - public Date getCheckTime() { - return checkTime; - } - - public void setCheckTime(Date checkTime) { - this.checkTime = checkTime; - } - - public Date getNextCheckTime() { - return nextCheckTime; - } - - public void setNextCheckTime(Date nextCheckTime) { - this.nextCheckTime = nextCheckTime; - } - - public String getOtherHighRisk() { - return otherHighRisk; - } - - public void setOtherHighRisk(String otherHighRisk) { - this.otherHighRisk = otherHighRisk; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getPastHistory() { - return pastHistory; - } - - public void setPastHistory(String pastHistory) { - this.pastHistory = pastHistory; - } - - public String getPersonalHistory() { - return personalHistory; - } - - public void setPersonalHistory(String personalHistory) { - this.personalHistory = personalHistory; - } - - public List getPlacentas() { - return placentas; - } - - public void setPlacentas(List placentas) { - this.placentas = placentas; - } - - - public String getTireNumber1() { - return tireNumber1; - } - - public void setTireNumber1(String tireNumber1) { - this.tireNumber1 = tireNumber1; - } - - public String getTreatOpinion() { - return treatOpinion; - } - - public void setTreatOpinion(String treatOpinion) { - this.treatOpinion = treatOpinion; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String getYmjzHistory() { - return ymjzHistory; - } - - public void setYmjzHistory(String ymjzHistory) { - this.ymjzHistory = ymjzHistory; - } - - public Integer getYn() { - return yn; - } - - public void setYn(Integer yn) { - this.yn = yn; - } - - public String getYqWeight() { - return yqWeight; - } - - public void setYqWeight(String yqWeight) { - this.yqWeight = yqWeight; - } - - public String getYsfyHistory() { - return ysfyHistory; - } - - public void setYsfyHistory(String ysfyHistory) { - this.ysfyHistory = ysfyHistory; - } - - public String getYwgmHistory() { - return ywgmHistory; - } - - public void setYwgmHistory(String ywgmHistory) { - this.ywgmHistory = ywgmHistory; - } - - public String getAbo() { - return abo; - } - - public void setAbo(String abo) { - this.abo = abo; - } - - public String getAlbumin() { - return albumin; - } - - public void setAlbumin(String albumin) { - this.albumin = albumin; - } - - public String getbChao() { - return bChao; - } - - public void setbChao(String bChao) { - this.bChao = bChao; - } - - public String getBld() { - return bld; - } - - public void setBld(String bld) { - this.bld = bld; - } - - public String getBloodSugar() { - return bloodSugar; - } - - public void setBloodSugar(String bloodSugar) { - this.bloodSugar = bloodSugar; - } - - public String getBxbjs() { - return bxbjs; - } - - public void setBxbjs(String bxbjs) { - this.bxbjs = bxbjs; - } - - public String getChgOther() { - return chgOther; - } - - public void setChgOther(String chgOther) { - this.chgOther = chgOther; - } - - public String getHivkt() { - return hivkt; - } - - public void setHivkt(String hivkt) { - this.hivkt = hivkt; - } - - public String getJhBilirubin() { - return jhBilirubin; - } - - public void setJhBilirubin(String jhBilirubin) { - this.jhBilirubin = jhBilirubin; - } - -/* public String getMdxqsy() { - return mdxqsy; - } - - public void setMdxqsy(String mdxqsy) { - this.mdxqsy = mdxqsy; - }*/ - - public Integer getAbortion() { - return abortion; - } - - public void setAbortion(Integer abortion) { - this.abortion = abortion; - } - - public String getBaricIndex() { - return baricIndex; - } - - public void setBaricIndex(String baricIndex) { - this.baricIndex = baricIndex; - } - - public Integer getBirthDefect() { - return birthDefect; - } - - public void setBirthDefect(Integer birthDefect) { - this.birthDefect = birthDefect; - } - - public Integer getDelivery() { - return delivery; - } - - public void setDelivery(Integer delivery) { - this.delivery = delivery; - } - - public Integer getNeoDeath() { - return neoDeath; - } - - public void setNeoDeath(Integer neoDeath) { - this.neoDeath = neoDeath; - } - - public Integer getPlanedProd() { - return planedProd; - } - - public void setPlanedProd(Integer planedProd) { - this.planedProd = planedProd; - } - - public Integer getPregnancyTimes() { - return pregnancyTimes; - } - - public void setPregnancyTimes(Integer pregnancyTimes) { - this.pregnancyTimes = pregnancyTimes; - } - - public String getProdDoctor() { - return prodDoctor; - } - - public void setProdDoctor(String prodDoctor) { - this.prodDoctor = prodDoctor; - } - - public Integer getProdTime() { - return prodTime; - } - - public void setProdTime(Integer prodTime) { - this.prodTime = prodTime; - } - - public Integer getStillbirth() { - return stillbirth; - } - - public void setStillbirth(Integer stillbirth) { - this.stillbirth = stillbirth; - } - - public Integer getStillChan() { - return stillChan; - } - - public void setStillChan(Integer stillChan) { - this.stillChan = stillChan; - } - - public String getNcgOther() { - return ncgOther; - } - - public void setNcgOther(String ncgOther) { - this.ncgOther = ncgOther; - } - - public String getNdb() { - return ndb; - } - - public void setNdb(String ndb) { - this.ndb = ndb; - } - - public String getNt() { - return nt; - } - - public void setNt(String nt) { - this.nt = nt; - } - - public String getPlatelet() { - return platelet; - } - - public void setPlatelet(String platelet) { - this.platelet = platelet; - } - - public String getRh() { - return rh; - } - - public void setRh(String rh) { - this.rh = rh; - } - - public String getTireNumber() { - return tireNumber; - } - - public void setTireNumber(String tireNumber) { - this.tireNumber = tireNumber; - } - - public String getTotalBilirubin() { - return totalBilirubin; - } - - public void setTotalBilirubin(String totalBilirubin) { - this.totalBilirubin = totalBilirubin; - } - - public String getUrineKetone() { - return urineKetone; - } - - public void setUrineKetone(String urineKetone) { - this.urineKetone = urineKetone; - } - - public String getXhdb() { - return xhdb; - } - - public void setXhdb(String xhdb) { - this.xhdb = xhdb; - } - - public String getXnsd() { - return xnsd; - } - - public void setXnsd(String xnsd) { - this.xnsd = xnsd; - } - - public String getXqgbzam() { - return xqgbzam; - } - - public void setXqgbzam(String xqgbzam) { - this.xqgbzam = xqgbzam; - } - - public String getXqgczam() { - return xqgczam; - } - - public void setXqgczam(String xqgczam) { - this.xqgczam = xqgczam; - } - - public String getXqjq() { - return xqjq; - } - - public void setXqjq(String xqjq) { - this.xqjq = xqjq; - } - - public String getYdfmw() { - return ydfmw; - } - - public void setYdfmw(String ydfmw) { - this.ydfmw = ydfmw; - } - - public String getYdqjd() { - return ydqjd; - } - - public void setYdqjd(String ydqjd) { - this.ydqjd = ydqjd; - } - - public String getYgbmkt() { - return ygbmkt; - } - - public void setYgbmkt(String ygbmkt) { - this.ygbmkt = ygbmkt; - } - - public String getYgbmky() { - return ygbmky; - } - - public void setYgbmky(String ygbmky) { - this.ygbmky = ygbmky; - } - - public String getYgekt() { - return ygekt; - } - - public void setYgekt(String ygekt) { - this.ygekt = ygekt; - } - - public String getYgeky() { - return ygeky; - } - - public void setYgeky(String ygeky) { - this.ygeky = ygeky; - } - - public String getYghxkt() { - return yghxkt; - } - - public void setYghxkt(String yghxkt) { - this.yghxkt = yghxkt; - } - - public Date getDueDate() { - return dueDate; - } - - public void setDueDate(Date dueDate) { - this.dueDate = dueDate; - } - - public Date getLastMenses() { - return lastMenses; - } - - public void setLastMenses(Date lastMenses) { - this.lastMenses = lastMenses; - } - - @Override - public String toString() { - return "AntExChu{" + - "barCode='" + barCode + '\'' + - ", id='" + id + '\'' + - ", parentId='" + parentId + '\'' + - ", pid='" + pid + '\'' + - ", dueDate=" + dueDate + - ", lastMenses=" + lastMenses + - ", cDueWeek='" + cDueWeek + '\'' + - ", bg='" + bg + '\'' + - ", pastHistory='" + pastHistory + '\'' + - ", familyHistory='" + familyHistory + '\'' + - ", personalHistory='" + personalHistory + '\'' + - ", ymjzHistory='" + ymjzHistory + '\'' + - ", ywgmHistory='" + ywgmHistory + '\'' + - ", fksxHistory='" + fksxHistory + '\'' + - ", ysfyHistory='" + ysfyHistory + '\'' + - ", pregnancyTimes=" + pregnancyTimes + - ", prodTime=" + prodTime + - ", delivery=" + delivery + - ", planedProd=" + planedProd + - ", abortion=" + abortion + - ", stillbirth=" + stillbirth + - ", stillChan=" + stillChan + - ", neoDeath=" + neoDeath + - ", birthDefect=" + birthDefect + - ", height='" + height + '\'' + - ", weight='" + weight + '\'' + - ", yqWeight='" + yqWeight + '\'' + - ", baricIndex='" + baricIndex + '\'' + - ", cestationInfo='" + cestationInfo + '\'' + - ", gonggao='" + gonggao + '\'' + - ", fuwei='" + fuwei + '\'' + - ", tireNumber1='" + tireNumber1 + '\'' + - ", syjg='" + syjg + '\'' + - ", placentas=" + placentas + - ", heart='" + heart + '\'' + - ", lungs='" + lungs + '\'' + - ", vulva='" + vulva + '\'' + - ", vagina='" + vagina + '\'' + - ", cervical='" + cervical + '\'' + - ", uterus='" + uterus + '\'' + - ", fujian='" + fujian + '\'' + - ", created=" + created + - ", hospitalId='" + hospitalId + '\'' + - ", bp='" + bp + '\'' + - ", hHealthInfo='" + hHealthInfo + '\'' + - ", abortionZR=" + abortionZR + - ", abortionRG=" + abortionRG + - ", highrisk='" + highrisk + '\'' + - ", highriskSocre='" + highriskSocre + '\'' + - ", otherHighRisk='" + otherHighRisk + '\'' + - ", diagnosis='" + diagnosis + '\'' + - ", treatOpinion='" + treatOpinion + '\'' + - ", dirOpinion='" + dirOpinion + '\'' + - ", prodDoctor='" + prodDoctor + '\'' + - ", checkTime=" + checkTime + - ", nextCheckTime=" + nextCheckTime + - ", yn=" + yn + - ", xhdb='" + xhdb + '\'' + - ", bxbjs='" + bxbjs + '\'' + - ", platelet='" + platelet + '\'' + - ", chgOther='" + chgOther + '\'' + - ", ndb='" + ndb + '\'' + - ", nt='" + nt + '\'' + - ", urineKetone='" + urineKetone + '\'' + - ", bld='" + bld + '\'' + - ", ncgOther='" + ncgOther + '\'' + - ", abo='" + abo + '\'' + - ", rh='" + rh + '\'' + - ", bloodSugar='" + bloodSugar + '\'' + - ", bChao='" + bChao + '\'' + - ", tireNumber='" + tireNumber + '\'' + - ", xqgbzam='" + xqgbzam + '\'' + - ", xqgczam='" + xqgczam + '\'' + - ", albumin='" + albumin + '\'' + - ", totalBilirubin='" + totalBilirubin + '\'' + - ", jhBilirubin='" + jhBilirubin + '\'' + - ", ygbmky='" + ygbmky + '\'' + - ", ygbmkt='" + ygbmkt + '\'' + - ", ygeky='" + ygeky + '\'' + - ", ygekt='" + ygekt + '\'' + - ", yghxkt='" + yghxkt + '\'' + - ", xqjq='" + xqjq + '\'' + - ", xnsd='" + xnsd + '\'' + - ", hivkt='" + hivkt + '\'' + - ", ydfmw='" + ydfmw + '\'' + - ", ydqjd='" + ydqjd + '\'' + - ", modified=" + modified + - ", operator=" + operator + - '}'; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/model/CouponInfo.java b/regional-etl/src/main/java/com/lyms/etl/model/CouponInfo.java deleted file mode 100644 index 5e0e662..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/model/CouponInfo.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.lyms.etl.model; - -import java.util.Date; - -/** - * 优惠券详情 - * @date: 2017-04-27 11:25:57 - */ -public class CouponInfo { - private String id; - - /** - * 12位优惠券id - */ - private String sequenceId; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 使用时间 - */ - private Date useDate; - - /** - * 所属用户id - */ - private String userId; - - /** - * 创建人id - */ - private String createUserId; - - /** - * 对应模板id - */ - private String couponTemplateId; - - /** - * 创建的医院id - */ - private String createHospitalId; - - /** - * 使用优惠券的医院id - */ - private String usedHospitalId; - - /** - * 状态：1:未使用 2:已使用 -1:禁用 3：分娩销毁 4:建档删除 删除 - */ - private Integer status; - - /** - * 使用优惠券时操作人的id - */ - private String operatorUseId; - - public CouponInfo() { - - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - public String getSequenceId() { - return sequenceId; - } - - public void setSequenceId(String sequenceId) { - this.sequenceId = sequenceId; - } - public Date getCreateDate() { - return createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - public Date getUseDate() { - return useDate; - } - - public void setUseDate(Date useDate) { - this.useDate = useDate; - } - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - public String getCouponTemplateId() { - return couponTemplateId; - } - - public void setCouponTemplateId(String couponTemplateId) { - this.couponTemplateId = couponTemplateId; - } - public String getCreateHospitalId() { - return createHospitalId; - } - - public void setCreateHospitalId(String createHospitalId) { - this.createHospitalId = createHospitalId; - } - public String getUsedHospitalId() { - return usedHospitalId; - } - - public void setUsedHospitalId(String usedHospitalId) { - this.usedHospitalId = usedHospitalId; - } - public Integer getStatus() { - return status; - } - - public String getCreateUserId() { - return createUserId; - } - - public void setCreateUserId(String createUserId) { - this.createUserId = createUserId; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getOperatorUseId() { - return operatorUseId; - } - - public void setOperatorUseId(String operatorUseId) { - this.operatorUseId = operatorUseId; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/model/HospitalCouponTemplateGroup.java b/regional-etl/src/main/java/com/lyms/etl/model/HospitalCouponTemplateGroup.java deleted file mode 100644 index 9b324b1..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/model/HospitalCouponTemplateGroup.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lyms.etl.model; - -/** - * 医院和优惠券模板表 多对一 对应关系 - * @date: 2017-05-05 11:43:33 - */ -public class HospitalCouponTemplateGroup { - private String id; - - private String hospitalId; - - private String couponTemplateGroupId; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } - public String getCouponTemplateGroupId() { - return couponTemplateGroupId; - } - - public void setCouponTemplateGroupId(String couponTemplateGroupId) { - this.couponTemplateGroupId = couponTemplateGroupId; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("HospitalCouponTemplateGroup [ "); - sb.append("id=" + id + ","); - sb.append("hospitalId=" + hospitalId + ","); - sb.append("couponTemplateGroupId=" + couponTemplateGroupId + ","); - sb.replace(sb.length()-1, sb.length(), " ]"); - return sb.toString(); - } - - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/model/PatientCheckTicket.java b/regional-etl/src/main/java/com/lyms/etl/model/PatientCheckTicket.java deleted file mode 100644 index bf6d04a..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/model/PatientCheckTicket.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.lyms.etl.model; - -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.Date; - - -@Document(collection="lyms_patient_check_ticket") -public class PatientCheckTicket { - - @Id - private String id; - private String patientId; - private String hospitalId; - private String pid; - private String consumeHospitalId; - private Integer status; // 1：创建未使用， 2：产检使用，3：分娩销毁 4:建档删除 删除 - private Date created; - private Date consumeDate; - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getPatientId() { - return patientId; - } - - public void setPatientId(String patientId) { - this.patientId = patientId; - } - - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } - - public String getConsumeHospitalId() { - return consumeHospitalId; - } - - public void setConsumeHospitalId(String consumeHospitalId) { - this.consumeHospitalId = consumeHospitalId; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public Date getConsumeDate() { - return consumeDate; - } - - public void setConsumeDate(Date consumeDate) { - this.consumeDate = consumeDate; - } - - @Override - public String toString() { - return "PatientCheckTicket{" + - "id='" + id + '\'' + - ", patientId='" + patientId + '\'' + - ", hospitalId='" + hospitalId + '\'' + - ", pid='" + pid + '\'' + - ", consumeHospitalId='" + consumeHospitalId + '\'' + - ", status=" + status + - ", created=" + created + - ", consumeDate=" + consumeDate + - '}'; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/model/Patients.java b/regional-etl/src/main/java/com/lyms/etl/model/Patients.java deleted file mode 100644 index de9886e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/model/Patients.java +++ /dev/null @@ -1,1079 +0,0 @@ -package com.lyms.etl.model; - -import com.lyms.etl.util.DateUtil; -import org.springframework.data.mongodb.core.mapping.Document; -import org.springframework.data.mongodb.core.mapping.Field; - -import java.util.Date; -import java.util.List; -import java.util.Objects; - - -@Document(collection="lyms_patient") -public class Patients { - - private static final long serialVersionUID = 1L; - - /** - * 身份证号码 - */ - private String cardNo; - /** - * 助产机构 - */ - @Field("deliverorg") - private String deliverOrg; - /** - * 分娩方式 - */ - @Field("duetype") - private String dueType; - - /******add by lqy begin*******/ - //孕妇国籍Id - private String pcountryId; - - //孕妇民族Id - private String pnationId; - - //孕妇职业类别Id - private String pprofessionTypeId; - - //户籍类型Id - private String pcensusTypeId; - - //孕妇文化程度Id - private String plevelTypeId; - - //工作单位 - private String pworkUnit; - - //居住类别Id - private String pliveTypeId; - - //证件类型Id - private String pcerteTypeId; - - //建档号 - private String fileCode; - //建档医生 - private String bookbuildingDoctor; - - //建档日期 - private Date bookbuildingDate; - - //医院ID - private String hospitalId; - - - /***********丈夫信息***********/ - - //证件号 - private String hcertificateNum; - //证件类型Id - private String hcertificateTypeId; - //国籍Id - private String hcountryId; - //民族Id - private String hnationId; - //工作单位 - private String hworkUnit; - //职业类别Id - private String hprofessionTypeId; - - //户籍地址 - private String haddressRegister; - private String hprovinceRegisterId; - private String hcityRegisterId; - private String hareaRegisterId; - private String hstreetRegisterId; - /******add by lqy end *********/ - /** - *孕妇户籍地址 - */ - private String address; - private String provinceId; - private String cityId; - private String areaId; - private String streetId; - - //服务状态 - private Integer serviceStatus; - - //体验会员 0非会员 1会员 - private Integer expVip; - - //会员截止时间 - private Date vipEndTime; - - //备注 - private String mremark; - - //分娩状态 0未终止妊娠 1终止妊娠 - private Integer dueStatus; - - //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档 - private Integer buildType; - - /** - * 产后休养地 - */ - private String addressPostRest; - private String provincePostRestId; - private String cityPostRestId; - private String areaPostRestId; - private String streetPostRestId; - - - /** - * 孕妇居住地 - */ - private String addressRegister; - private String provinceRegisterId; - private String cityRegisterId; - private String areaRegisterId; - private String streetRegisterId; - - /** - * 社区id - */ - private String communityId; - /** - * 是否访视 - */ - private Integer isVisit; - - private String id; - - private String username; - - private Integer crisis; - - private String avatar; - //预产期 - private Date dueDate; - //末次月经 - private Date lastMenses; - //分娩日期 - private Date fmDate; - - @SuppressWarnings("unused") - private Integer age; - - private String phone; - - private String foreignId; - - private String publishId; - - private String publishName; - //数据来源id,用于区域隐藏建档 - private String source; - - private Integer yn; - - private Date modified; - - private Date created; - - private Integer gender; - - private Date birth; - //1孕妇 3 产妇 - private Integer type; - - private String foreignSubId; - - private String triageOrderNo; - - private Date nextCheckTime; - - private Integer patientLevel; - //最后一次产检医生职工ID - private String lastCheckEmployeeId; - //最后一次检查id - private Integer lastReportId; - //高危风险id - private List riskFactorId; - //建档时高危风险id - private List firstRiskFactorId; - //自定义的高危因素 - private String oRiskFactor; - //风险等级颜色 - private String riskLevelId; - //高危评分值 - private Integer riskScore; - private Integer serviceType; - private Integer vip; - //最后一次检查医生名称 - private String lastReportDoctorName; - private String mommyPatientId; - private String husbandName; - private String husbandPhone; - //丈夫生日 - private Date husbandBirth; - private String vcCardNo; - - //丈夫文化程度Id - private String hlevelTypeId; - - //体验类型 - private Integer expType; - - //person表主键 - private String pid; - //是否隐藏 0 隐藏 1 显示 - private String enable; - //最后一次高危时间 - private Date lastRhTime; - //本院最后一次产检时间 - private Date lastCTime; - //本院产后复查次数 - private Integer postViewTimes; - //操作人 - private Integer operator; - - // 分娩相关信息 - // 分娩医院 - private String fmHospital; - // 分娩年龄 - private Integer fmAge; - // 分娩孕周 - private Integer fmWeek; - // 分娩方式 - private String fmType; - - private Integer isAutoFm; - - // 是否发放过优惠券 - private boolean isSendCoupon; - - public Integer getIsAutoFm() { - return isAutoFm; - } - - public void setIsAutoFm(Integer isAutoFm) { - this.isAutoFm = isAutoFm; - } - - public String getFmHospital() { - return fmHospital; - } - - public void setFmHospital(String fmHospital) { - this.fmHospital = fmHospital; - } - - public Integer getFmAge() { - return fmAge; - } - - public void setFmAge(Integer fmAge) { - this.fmAge = fmAge; - } - - public Integer getFmWeek() { - return fmWeek; - } - - public void setFmWeek(Integer fmWeek) { - this.fmWeek = fmWeek; - } - - public String getFmType() { - return fmType; - } - - public void setFmType(String fmType) { - this.fmType = fmType; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public String getoRiskFactor() { - return oRiskFactor; - } - - public void setoRiskFactor(String oRiskFactor) { - this.oRiskFactor = oRiskFactor; - } - - public Date getLastCTime() { - return lastCTime; - } - - public void setLastCTime(Date lastCTime) { - this.lastCTime = lastCTime; - } - - public Integer getPostViewTimes() { - return postViewTimes; - } - - public void setPostViewTimes(Integer postViewTimes) { - this.postViewTimes = postViewTimes; - } - - public Integer getOperator() { - return operator; - } - - public void setOperator(Integer operator) { - this.operator = operator; - } - - public Date getLastRhTime() { - return lastRhTime; - } - - public void setLastRhTime(Date lastRhTime) { - this.lastRhTime = lastRhTime; - } - - public String getEnable() { - return enable; - } - - public void setEnable(String enable) { - this.enable = enable; - } - - public Date getHusbandBirth() { - return husbandBirth; - } - - public void setHusbandBirth(Date husbandBirth) { - this.husbandBirth = husbandBirth; - } - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - - public Integer getExpType() { - return expType; - } - - public void setExpType(Integer expType) { - this.expType = expType; - } - - public String getPlevelTypeId() { - return plevelTypeId; - } - - public void setPlevelTypeId(String plevelTypeId) { - this.plevelTypeId = plevelTypeId; - } - - public String getHlevelTypeId() { - return hlevelTypeId; - } - - public void setHlevelTypeId(String hlevelTypeId) { - this.hlevelTypeId = hlevelTypeId; - } - - public Date getFmDate() { - return fmDate; - } - - public void setFmDate(Date fmDate) { - this.fmDate = fmDate; - } - - public List getFirstRiskFactorId() { - return firstRiskFactorId; - } - - public void setFirstRiskFactorId(List firstRiskFactorId) { - this.firstRiskFactorId = firstRiskFactorId; - } - - public List getRiskFactorId() { - return riskFactorId; - } - - public void setRiskFactorId(List riskFactorId) { - this.riskFactorId = riskFactorId; - } - - public String getRiskLevelId() { - return riskLevelId; - } - - public void setRiskLevelId(String riskLevelId) { - this.riskLevelId = riskLevelId; - } - public String getAddressPostRest() { - return addressPostRest; - } - - public void setAddressPostRest(String addressPostRest) { - this.addressPostRest = addressPostRest; - } - - public String getProvincePostRestId() { - return provincePostRestId; - } - - public void setProvincePostRestId(String provincePostRestId) { - this.provincePostRestId = provincePostRestId; - } - - public String getCityPostRestId() { - return cityPostRestId; - } - - public void setCityPostRestId(String cityPostRestId) { - this.cityPostRestId = cityPostRestId; - } - - public String getAreaPostRestId() { - return areaPostRestId; - } - - public void setAreaPostRestId(String areaPostRestId) { - this.areaPostRestId = areaPostRestId; - } - public Integer getRiskScore() { - return riskScore; - } - - public void setRiskScore(Integer riskScore) { - this.riskScore = riskScore; - } - - public String getVcCardNo() { - return vcCardNo; - } - - public void setVcCardNo(String vcCardNo) { - this.vcCardNo = vcCardNo; - } - - public String getHusbandName() { - return husbandName; - } - - public void setHusbandName(String husbandName) { - this.husbandName = husbandName; - } - - public String getHusbandPhone() { - return husbandPhone; - } - - public Integer getBuildType() { - return buildType; - } - - public void setBuildType(Integer buildType) { - this.buildType = buildType; - } - - public void setHusbandPhone(String husbandPhone) { - this.husbandPhone = husbandPhone; - } - - public String getMommyPatientId() { - return mommyPatientId; - } - - public void setMommyPatientId(String mommyPatientId) { - this.mommyPatientId = mommyPatientId; - } - - public String getLastCheckEmployeeId() { - return lastCheckEmployeeId; - } - - public void setLastCheckEmployeeId(String lastCheckEmployeeId) { - this.lastCheckEmployeeId = lastCheckEmployeeId; - } - - public String getLastReportDoctorName() { - return lastReportDoctorName; - } - - public void setLastReportDoctorName(String lastReportDoctorName) { - this.lastReportDoctorName = lastReportDoctorName; - } - - public String getAddressRegister() { - return addressRegister; - } - - public void setAddressRegister(String addressRegister) { - this.addressRegister = addressRegister; - } - - public String getProvinceRegisterId() { - return provinceRegisterId; - } - - public void setProvinceRegisterId(String provinceRegisterId) { - this.provinceRegisterId = provinceRegisterId; - } - - public String getCityRegisterId() { - return cityRegisterId; - } - - public void setCityRegisterId(String cityRegisterId) { - this.cityRegisterId = cityRegisterId; - } - - public String getAreaRegisterId() { - return areaRegisterId; - } - - public void setAreaRegisterId(String areaRegisterId) { - this.areaRegisterId = areaRegisterId; - } - public Integer getLastReportId() { - return lastReportId; - } - - public void setLastReportId(Integer lastReportId) { - this.lastReportId = lastReportId; - } - - public Integer getDueStatus() { - return dueStatus; - } - - public void setDueStatus(Integer dueStatus) { - this.dueStatus = dueStatus; - } - - public String getMremark() { - return mremark; - } - - public void setMremark(String mremark) { - this.mremark = mremark; - } - - public Integer getServiceStatus() { - return serviceStatus; - } - - public void setServiceStatus(Integer serviceStatus) { - this.serviceStatus = serviceStatus; - } - - public Integer getExpVip() { - return expVip; - } - - public void setExpVip(Integer expVip) { - this.expVip = expVip; - } - - public Date getVipEndTime() { - return vipEndTime; - } - - public void setVipEndTime(Date vipEndTime) { - this.vipEndTime = vipEndTime; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - - public String getProvinceId() { - return provinceId; - } - - public void setProvinceId(String provinceId) { - this.provinceId = provinceId; - } - - public Integer getServiceType() { - return serviceType; - } - - public void setServiceType(Integer serviceType) { - this.serviceType = serviceType; - } - - public Integer getVip() { - return vip; - } - - public void setVip(Integer vip) { - this.vip = vip; - } - - public Integer getPatientLevel() { - return patientLevel; - } - - public void setPatientLevel(Integer patientLevel) { - this.patientLevel = patientLevel; - } - - public Date getNextCheckTime() { - return nextCheckTime; - } - - public void setNextCheckTime(Date nextCheckTime) { - this.nextCheckTime = nextCheckTime; - } - - public String getForeignSubId() { - return foreignSubId; - } - - public void setForeignSubId(String foreignSubId) { - this.foreignSubId = foreignSubId; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getTriageOrderNo() { - return triageOrderNo; - } - - public void setTriageOrderNo(String triageOrderNo) { - this.triageOrderNo = triageOrderNo; - } - - public Integer getGender() { - return gender; - } - - public void setGender(Integer gender) { - this.gender = gender; - } - - public Date getBirth() { - return birth; - } - - public void setBirth(Date birth) { - this.birth = birth; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - - } - - public Integer getCrisis() { - return crisis; - } - - public void setCrisis(Integer crisis) { - this.crisis = crisis; - - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - - } - - public Date getDueDate() { - return dueDate; - } - - public void setDueDate(Date dueDate) { - this.dueDate = dueDate; - - } - - public Date getLastMenses() { - return lastMenses; - } - - public void setLastMenses(Date lastMenses) { - this.lastMenses = lastMenses; - - } - - public Integer getAge() { - return DateUtil.getAge(birth); - } - - public void setAge(Integer age) { - this.age = age; - - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getPublishId() { - return publishId; - } - - public void setPublishId(String publishId) { - this.publishId = publishId; - } - - public String getPublishName() { - return publishName; - } - - public void setPublishName(String publishName) { - this.publishName = publishName; - - } - - public Integer getYn() { - return yn; - } - - public void setYn(Integer yn) { - this.yn = yn; - - } - - public Date getModified() { - return modified; - } - - public void setModified(Date modified) { - this.modified = modified; - - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - - public String getCommunityId() { - return communityId; - } - - public void setCommunityId(String communityId) { - this.communityId = communityId; - } - - public String getDeliverOrg() { - return deliverOrg; - } - - public void setDeliverOrg(String deliverOrg) { - this.deliverOrg = deliverOrg; - } - - public String getDueType() { - return dueType; - } - - public void setDueType(String dueType) { - this.dueType = dueType; - } - - public Integer getIsVisit() { - return isVisit; - } - - public void setIsVisit(Integer isVisit) { - this.isVisit = isVisit; - } - - public String getPcountryId() { - return pcountryId; - } - - public void setPcountryId(String pcountryId) { - this.pcountryId = pcountryId; - } - - public String getPnationId() { - return pnationId; - } - - public void setPnationId(String pnationId) { - this.pnationId = pnationId; - } - - public String getPprofessionTypeId() { - return pprofessionTypeId; - } - - public void setPprofessionTypeId(String pprofessionTypeId) { - this.pprofessionTypeId = pprofessionTypeId; - } - - public String getPcensusTypeId() { - return pcensusTypeId; - } - - public void setPcensusTypeId(String pcensusTypeId) { - this.pcensusTypeId = pcensusTypeId; - } - - public String getPworkUnit() { - return pworkUnit; - } - - public void setPworkUnit(String pworkUnit) { - this.pworkUnit = pworkUnit; - } - - public String getPliveTypeId() { - return pliveTypeId; - } - - public void setPliveTypeId(String pliveTypeId) { - this.pliveTypeId = pliveTypeId; - } - - public String getPcerteTypeId() { - return pcerteTypeId; - } - - public void setPcerteTypeId(String pcerteTypeId) { - this.pcerteTypeId = pcerteTypeId; - } - - public String getFileCode() { - return fileCode; - } - - public void setFileCode(String fileCode) { - this.fileCode = fileCode; - } - - public String getBookbuildingDoctor() { - return bookbuildingDoctor; - } - - public void setBookbuildingDoctor(String bookbuildingDoctor) { - this.bookbuildingDoctor = bookbuildingDoctor; - } - - public Date getBookbuildingDate() { - return bookbuildingDate; - } - - public void setBookbuildingDate(Date bookbuildingDate) { - this.bookbuildingDate = bookbuildingDate; - } - - public String getHcertificateNum() { - return hcertificateNum; - } - - public void setHcertificateNum(String hcertificateNum) { - this.hcertificateNum = hcertificateNum; - } - - public String getHcertificateTypeId() { - return hcertificateTypeId; - } - - public void setHcertificateTypeId(String hcertificateTypeId) { - this.hcertificateTypeId = hcertificateTypeId; - } - - public String getHcountryId() { - return hcountryId; - } - - public void setHcountryId(String hcountryId) { - this.hcountryId = hcountryId; - } - - public String getHnationId() { - return hnationId; - } - - public void setHnationId(String hnationId) { - this.hnationId = hnationId; - } - - public String getHworkUnit() { - return hworkUnit; - } - - public void setHworkUnit(String hworkUnit) { - this.hworkUnit = hworkUnit; - } - - public String getHprofessionTypeId() { - return hprofessionTypeId; - } - - public void setHprofessionTypeId(String hprofessionTypeId) { - this.hprofessionTypeId = hprofessionTypeId; - } - - public String getHaddressRegister() { - return haddressRegister; - } - - public void setHaddressRegister(String haddressRegister) { - this.haddressRegister = haddressRegister; - } - - public String getHprovinceRegisterId() { - return hprovinceRegisterId; - } - - public void setHprovinceRegisterId(String hprovinceRegisterId) { - this.hprovinceRegisterId = hprovinceRegisterId; - } - - public String getHcityRegisterId() { - return hcityRegisterId; - } - - public void setHcityRegisterId(String hcityRegisterId) { - this.hcityRegisterId = hcityRegisterId; - } - - public String getHareaRegisterId() { - return hareaRegisterId; - } - - public void setHareaRegisterId(String hareaRegisterId) { - this.hareaRegisterId = hareaRegisterId; - } - - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } - - public String getHstreetRegisterId() { - return hstreetRegisterId; - } - - public void setHstreetRegisterId(String hstreetRegisterId) { - this.hstreetRegisterId = hstreetRegisterId; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetPostRestId() { - return streetPostRestId; - } - - public void setStreetPostRestId(String streetPostRestId) { - this.streetPostRestId = streetPostRestId; - } - - public String getStreetRegisterId() { - return streetRegisterId; - } - - public void setStreetRegisterId(String streetRegisterId) { - this.streetRegisterId = streetRegisterId; - } - - public boolean isSendCoupon() { - return isSendCoupon; - } - - public void setSendCoupon(boolean sendCoupon) { - isSendCoupon = sendCoupon; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Patients patients = (Patients) o; - return Objects.equals(id, patients.id); - } - - @Override - public int hashCode() { - return Objects.hash(id); - } -} \ No newline at end of file diff --git a/regional-etl/src/main/java/com/lyms/etl/repository/AntExChuRepository.java b/regional-etl/src/main/java/com/lyms/etl/repository/AntExChuRepository.java deleted file mode 100644 index e776424..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/repository/AntExChuRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lyms.etl.repository; - -import com.lyms.etl.model.AntExChu; -import org.springframework.data.mongodb.repository.MongoRepository; - -/** - * @Author: litao - * @Date: 2017/5/4 0004 17:15 - * @Version: V1.0 - */ -public interface AntExChuRepository extends MongoRepository { - AntExChu findByBarCode(String barCode); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/repository/PatientCheckTicketRepository.java b/regional-etl/src/main/java/com/lyms/etl/repository/PatientCheckTicketRepository.java deleted file mode 100644 index c36a679..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/repository/PatientCheckTicketRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lyms.etl.repository; - -import com.lyms.etl.model.PatientCheckTicket; -import org.springframework.data.mongodb.repository.MongoRepository; - -/** - * @Author: litao - * @Date: 2017/5/4 0004 15:17 - * @Version: V1.0 - */ -public interface PatientCheckTicketRepository extends MongoRepository { - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/ICouponInfoService.java b/regional-etl/src/main/java/com/lyms/etl/service/ICouponInfoService.java deleted file mode 100644 index 42bd741..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/ICouponInfoService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.lyms.etl.service; - -/** - * @Author: litao - * @Date: 2017/5/3 0003 11:43 - * @Version: V1.0 - */ -public interface ICouponInfoService extends IInvokeHandler { - void transferCoupon(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/IEtlService.java b/regional-etl/src/main/java/com/lyms/etl/service/IEtlService.java deleted file mode 100644 index 5d97adf..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/IEtlService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.etl.service; - -/** - * @Author: litao - * @Date: 2017/5/3 0003 12:00 - * @Version: V1.0 - */ -public interface IEtlService extends IInvokeHandler { -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/IInvokeHandler.java b/regional-etl/src/main/java/com/lyms/etl/service/IInvokeHandler.java deleted file mode 100644 index 8267235..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/IInvokeHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.lyms.etl.service; - -/** - * @Author: litao - * @Date: 2017/5/5 0005 20:21 - * @Version: V1.0 - */ -public interface IInvokeHandler { - void invoke(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/IPatientService.java b/regional-etl/src/main/java/com/lyms/etl/service/IPatientService.java deleted file mode 100644 index 767d535..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/IPatientService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lyms.etl.service; - -/** - * @Author: litao - * @Date: 2017/6/26 0026 - */ -public interface IPatientService extends IInvokeHandler { -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/impl/CouponServiceImpl.java b/regional-etl/src/main/java/com/lyms/etl/service/impl/CouponServiceImpl.java deleted file mode 100644 index 9d5b52a..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/impl/CouponServiceImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.lyms.etl.service.impl; - -import com.lyms.etl.dao.ICouponInfoDao; -import com.lyms.etl.model.AntExChu; -import com.lyms.etl.model.CouponInfo; -import com.lyms.etl.model.HospitalCouponTemplateGroup; -import com.lyms.etl.model.PatientCheckTicket; -import com.lyms.etl.repository.AntExChuRepository; -import com.lyms.etl.repository.PatientCheckTicketRepository; -import com.lyms.etl.service.ICouponInfoService; -import com.lyms.etl.util.UUIDUtil; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -/** - * @Author: litao - * @Date: 2017/5/3 0003 11:45 - * @Version: V1.0 - */ -@Profile("coupon") -@Service -public class CouponServiceImpl implements ICouponInfoService { - - private Logger LOG = LoggerFactory.getLogger(CouponServiceImpl.class); - - @Autowired - private ICouponInfoDao couponInfoDao; - - @Autowired - private PatientCheckTicketRepository patientCheckTicketRepository; - @Autowired - private AntExChuRepository antExChuRepository; - - @Override - @Transactional - public void transferCoupon() { - List couponInfos = new ArrayList<>(); - Set hospitalIds = new HashSet<>(); - List patientCheckTickets = patientCheckTicketRepository.findAll(); - LOG.info("本次共需要导入 [{}] 条数据", patientCheckTickets.size()); - for (PatientCheckTicket checkTicket : patientCheckTickets) { - CouponInfo couponInfo = createCouponInfo(checkTicket, hospitalIds); - if(couponInfo != null) { - couponInfos.add(couponInfo); - LOG.info("正在创建第 [{}] 个优惠券", couponInfos.size()); - } - } - batchInsert(couponInfos, 100); - -// setnx(hospitalIds); - } - - /** - * 创建产检券model 并且得到hospitalId - * @param checkTicket - * @param hospitalIds - * @return - */ - private CouponInfo createCouponInfo(PatientCheckTicket checkTicket, Set hospitalIds) { - CouponInfo couponInfo = new CouponInfo(); - couponInfo.setId(UUIDUtil.createId()); - couponInfo.setSequenceId(checkTicket.getId()); - couponInfo.setCreateDate(checkTicket.getCreated()); - couponInfo.setUseDate(checkTicket.getConsumeDate()); - couponInfo.setUserId(checkTicket.getPid()); - couponInfo.setCouponTemplateId(parseSuffix(checkTicket.getId(), checkTicket.getHospitalId())); - couponInfo.setCreateHospitalId(checkTicket.getHospitalId()); - couponInfo.setUsedHospitalId(checkTicket.getConsumeHospitalId()); - couponInfo.setStatus(checkTicket.getStatus()); - couponInfo.setCreateUserId(null); - AntExChu antExChu = antExChuRepository.findByBarCode(checkTicket.getId()); - if(antExChu != null) { - couponInfo.setOperatorUseId(antExChu.getProdDoctor()); - } - hospitalIds.add(checkTicket.getHospitalId()); - - if(StringUtils.isBlank(couponInfo.getCouponTemplateId())) { - return null; - } - return couponInfo; - } - - /** - * 批量插入 - * @param couponInfos - * @param size - */ - private void batchInsert(List couponInfos, Integer size) { - LOG.info("开始导入数据, 共 [{}] 条: ", couponInfos.size()); - List commitList = new ArrayList<>(); - for (int i = 0; i < couponInfos.size(); i++) { - commitList.add(couponInfos.get(i)); - - if(i != 0 && commitList.size() % size == 0) { - LOG.info("插入第 [{}] 条数据, 共 [{}] 条: ", i, couponInfos.size()); - couponInfoDao.batchSave(commitList); - commitList.clear(); - } - } - if(CollectionUtils.isNotEmpty(commitList)) { - couponInfoDao.batchSave(commitList); - } - } - - /** - * 验证医院是否存在 - * @param hospitalId - * @return - */ - private boolean validateHospital(String hospitalId) { - HospitalCouponTemplateGroup hospital = couponInfoDao.findHospital(hospitalId); - return hospital == null ? false : true; - } - - private String parseSuffix(String id, String hospitalId) { - Integer number = Integer.parseInt(id.substring(id.length() - 1, id.length())); - Map map = new HashMap<>(); - map.put("number", number); - map.put("hospitalId", hospitalId); - return couponInfoDao.findTempId(map); - } - - /** - * 医院 不存在就创建 - * @param hospitalIds - */ - public void setnx(Set hospitalIds) { - for (String hospitalId : hospitalIds) { - if(!validateHospital(hospitalId)) { - HospitalCouponTemplateGroup hospitalCouponTemplateGroup = new HospitalCouponTemplateGroup(); - hospitalCouponTemplateGroup.setId(UUIDUtil.createId()); - hospitalCouponTemplateGroup.setHospitalId(hospitalId); - HospitalCouponTemplateGroup hospital = couponInfoDao.findHospital(hospitalId); - if(hospital != null) { - hospitalCouponTemplateGroup.setCouponTemplateGroupId(hospital.getCouponTemplateGroupId()); - couponInfoDao.saveHospitalGroup(hospitalCouponTemplateGroup); - } - } - } - } - - @Override - public void invoke() { - transferCoupon(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/impl/EtlServiceImpl.java b/regional-etl/src/main/java/com/lyms/etl/service/impl/EtlServiceImpl.java deleted file mode 100644 index 3ae5ba2..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/impl/EtlServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.etl.service.impl; - -import com.lyms.etl.service.IEtlService; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Service; - -/** - * @Author: litao - * @Date: 2017/5/3 0003 12:00 - * @Version: V1.0 - */ -@Profile("etl") -@Service -public class EtlServiceImpl implements IEtlService { - @Override - public void invoke() { - System.out.println("etl >> "); - } - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/service/impl/PatientServiceImpl.java b/regional-etl/src/main/java/com/lyms/etl/service/impl/PatientServiceImpl.java deleted file mode 100644 index 585bd16..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/service/impl/PatientServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lyms.etl.service.impl; - -import com.lyms.etl.dao.ICouponInfoDao; -import com.lyms.etl.model.Patients; -import com.lyms.etl.service.IPatientService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Profile; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.core.query.Update; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * @Author: litao - * @Date: 2017/6/26 0026 - */ -@Profile("patient") -@Service -public class PatientServiceImpl implements IPatientService { - - @Autowired - private ICouponInfoDao couponInfoDao; - - @Autowired - private MongoTemplate mongoTemplate; - - @Override - public void invoke() { - List userIds = couponInfoDao.findDistinctUserId(); - mongoTemplate.updateMulti(Query.query(Criteria.where("pid").in(userIds)), Update.update("isSendCoupon", true), Patients.class); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/socket/ServerThread.java b/regional-etl/src/main/java/com/lyms/etl/socket/ServerThread.java deleted file mode 100644 index a524bfe..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/socket/ServerThread.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lyms.etl.socket; - - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.net.Socket; - -public class ServerThread implements Runnable { - - public Socket socket; - - public ServerThread (Socket socket) { - this.socket = socket; - } - - @Override - public void run() { - try { - BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream())); - while (true) { - if (socket.getKeepAlive()) - { - System.out.println(SocketService.socketList.size()); - System.out.println("关闭"+socket.getPort()); - } - String str = br.readLine(); - System.out.println("接收到"+socket.getPort()+"消息:"+str); - for (Socket item : SocketService.socketList) { - if (item.getPort() == socket.getPort()) - { - PrintWriter pw = new PrintWriter(item.getOutputStream()); - pw.println("服务器说："+str); - pw.flush(); - } - - } - } - } catch (IOException e) { - System.out.println(socket.getPort()); - } - } - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/socket/SocketClient1.java b/regional-etl/src/main/java/com/lyms/etl/socket/SocketClient1.java deleted file mode 100644 index 63c91c3..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/socket/SocketClient1.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lyms.etl.socket; - - -import java.net.Socket; - -public class SocketClient1 { - public static void main(String args[])throws Exception{ - Socket socket = new Socket("192.168.0.5", 5208); - System.out.println("恭喜你连接成功!"); - new Thread(new SocketThread1(socket)).start(); - new Thread(new SocketThread2(socket)).start(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/socket/SocketClient2.java b/regional-etl/src/main/java/com/lyms/etl/socket/SocketClient2.java deleted file mode 100644 index 0fe34dc..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/socket/SocketClient2.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lyms.etl.socket; - - -import java.net.Socket; - -public class SocketClient2 { - public static void main(String args[])throws Exception{ - Socket socket = new Socket("192.168.0.5", 5208); - System.out.println("恭喜你连接成功!"); - new Thread(new SocketThread1(socket)).start(); - new Thread(new SocketThread2(socket)).start(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/socket/SocketService.java b/regional-etl/src/main/java/com/lyms/etl/socket/SocketService.java deleted file mode 100644 index 7dec23b..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/socket/SocketService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.etl.socket; - -import java.net.ServerSocket; -import java.net.Socket; -import java.util.concurrent.CopyOnWriteArrayList; - -/** - * Created by Administrator on 2020-06-15. - */ -public class SocketService { - public static CopyOnWriteArrayList socketList = new CopyOnWriteArrayList<>(); - - public static void main(String args[])throws Exception { - ServerSocket serverSocket = new ServerSocket(5208); - System.out.println("聊天室开启"); - while (true) { - Socket socket= serverSocket.accept(); - System.out.println("上线通知： 用户" + socket.getPort() + "上线啦！"); - socketList.add(socket); - new Thread(new ServerThread(socket)).start(); - } - } - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/socket/SocketThread1.java b/regional-etl/src/main/java/com/lyms/etl/socket/SocketThread1.java deleted file mode 100644 index 342b3a4..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/socket/SocketThread1.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lyms.etl.socket; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.net.Socket; - -public class SocketThread1 implements Runnable { - - public Socket socket; - - public SocketThread1(Socket socket){ - this.socket = socket; - } - - @Override - public void run() { - try { - BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); - PrintWriter pw = new PrintWriter(socket.getOutputStream()); - while(true){ - String str = br.readLine(); - pw.println(str); - pw.flush(); - } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/socket/SocketThread2.java b/regional-etl/src/main/java/com/lyms/etl/socket/SocketThread2.java deleted file mode 100644 index 2b08e3a..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/socket/SocketThread2.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyms.etl.socket; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.Socket; - -public class SocketThread2 implements Runnable { - - public Socket socket; - - public SocketThread2(Socket socket){ - this.socket = socket; - } - - @Override - public void run() { - try { - BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream())); - while(true){ - String str = br.readLine(); - System.out.println(str); - } - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirver.java b/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirver.java deleted file mode 100644 index e0826c7..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirver.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.etl.start; - -/** - * Created by Administrator on 2020-03-25. - */ -public class DecoratorDirver extends Driver { - - private Driver driver; - public DecoratorDirver(Driver driver) - { - this.driver = driver; - } - - @Override - public void drive() - { - driver.drive(); - } - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirverA.java b/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirverA.java deleted file mode 100644 index f952fb1..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirverA.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lyms.etl.start; - -/** - * Created by Administrator on 2020-03-25. - */ -public class DecoratorDirverA extends DecoratorDirver { - public DecoratorDirverA(Driver driver) { - super(driver); - } - - - @Override - public void drive() - { - super.drive(); - eat(); - } - - - public void eat() - { - System.out.println("chiiiii"); - } - - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirverB.java b/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirverB.java deleted file mode 100644 index 8af0a55..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/DecoratorDirverB.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.etl.start; - -/** - * Created by Administrator on 2020-03-25. - */ -public class DecoratorDirverB extends DecoratorDirver { - - public DecoratorDirverB(Driver driver) { - super(driver); - } - - @Override - public void drive() - { - super.drive(); - sleep(); - } - - public void sleep() - { - System.out.println("sleeeeep"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/Driver.java b/regional-etl/src/main/java/com/lyms/etl/start/Driver.java deleted file mode 100644 index 2c74c00..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/Driver.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.lyms.etl.start; - -/** - * Created by Administrator on 2020-03-25. - */ -public class Driver { - - public void drive() - { - System.out.println("dirve....."); - } - - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/Test.java b/regional-etl/src/main/java/com/lyms/etl/start/Test.java deleted file mode 100644 index 47d8e48..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/Test.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.lyms.etl.start; - -import com.lyms.etl.start.adapter.ForeignStudent; -import com.lyms.etl.start.adapter.ISpeak; -import com.lyms.etl.start.adapter.SpeakAdapter; -import com.lyms.etl.start.brige.G8Memory; -import com.lyms.etl.start.brige.HuaweiPhone; -import com.lyms.etl.start.brige.IPhone; -import com.lyms.etl.start.factorymethod.DatabaseLoggerFactory; -import com.lyms.etl.start.factorymethod.Logger; -import com.lyms.etl.start.factorymethod.LoggerFactory; -import com.lyms.etl.start.memento.Creater; -import com.lyms.etl.start.memento.Game; -import com.lyms.etl.start.memento.GameMemento; -import com.lyms.etl.start.observer.Observer; -import com.lyms.etl.start.observer.UserObserver; -import com.lyms.etl.start.observer.WechatServer; -import com.lyms.etl.start.proxy.CodeProxy; -import com.lyms.etl.start.proxy.CoderDynamicProxy; -import com.lyms.etl.start.proxy.ICoder; -import com.lyms.etl.start.proxy.JavaCoder; -import com.lyms.etl.start.singleton.Singleton; -import com.lyms.etl.start.singleton.SingletonEnum; -import com.lyms.etl.start.state.AirController; -import com.lyms.etl.start.strategy.PayStrategy; -import com.lyms.etl.start.strategy.Payer; -import com.lyms.etl.start.strategy.WxPay; -import com.lyms.etl.start.template.BsHouse; -import com.lyms.etl.start.template.HouseTemplate; -import com.lyms.etl.util.DateUtil; -import org.apache.commons.lang3.StringUtils; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; -import java.util.Date; - -/** - * Created by Administrator on 2020-03-25. - */ -public class Test { - - public static void main(String[] args) { -// 枚举单例模式 -// SingletonEnum singletonEnum = SingletonEnum.INSTANCE; -// SingletonEnum singletonEnum2 = SingletonEnum.INSTANCE; -// System.out.println(singletonEnum == singletonEnum2); - -// //工厂方法 -// LoggerFactory factory = new DatabaseLoggerFactory(); -// Logger logger = factory.createLogger(); -// logger.writeLog(); - - //适配器模式 - ISpeak speak = new SpeakAdapter(new ForeignStudent("Jon")); - speak.speak(); - speak.listen(); - - - //装饰设计模式 -// Driver d = new Driver(); -// DecoratorDirver decoratorDirver = new DecoratorDirver(d); -// decoratorDirver = new DecoratorDirverA(decoratorDirver); -// decoratorDirver = new DecoratorDirverB(decoratorDirver); -// decoratorDirver.drive(); - - - //代理模式 -// ICoder coder = new JavaCoder(); -// ICoder proxy = new CodeProxy(coder); -// proxy.code(); - //要代理的真实对象 -// ICoder coder = new JavaCoder(); -// //创建中介类实例 -// InvocationHandler handler = new CoderDynamicProxy(coder); -// ClassLoader classLoader = coder.getClass().getClassLoader(); -// ICoder proxy = (ICoder)Proxy.newProxyInstance(classLoader, coder.getClass().getInterfaces(), handler); -// proxy.code(); -// proxy.eat(); - - -// //桥接模式 - IPhone phone = new HuaweiPhone(); - phone.setMemory(new G8Memory()); - phone.buyPhone(); - - -// //模板模式 -// HouseTemplate build = new BsHouse("山顶别墅"); -// build.buildHouse(); -// -// -// //策略模式 -// Payer payStrategy = new Payer(); -// payStrategy.setPayStrategy(new WxPay()); -// payStrategy.pay(); - - //状态模式 比如用户登录系统，在登录和注销的情况下发表评论、收藏等行为有着不同执行轨迹 -// AirController controller = new AirController(); -// controller.powerOn(); -// controller.adjustTemp(); -// controller.powerOff(); -// controller.adjustTemp(); - - - - //观察者模式 -// Observer userObserver = new UserObserver("张三"); -// Observer userObserver1 = new UserObserver("李四"); -// WechatServer server = new WechatServer(); -// server.registerObsesrver(userObserver); -// server.registerObsesrver(userObserver1); -// server.notifyObserver(); - -// //备忘录模式 -// Game game = new Game(); -// game.setPlayStep(4); -// GameMemento gameMemento = game.saveGameMemento(); -// Creater creater = new Creater(); -// creater.setGameMemento(gameMemento); -// game.setPlayStep(0); -// game.recover(creater.getGameMemento()); -// System.out.println(game.getPlayStep()); - - - - - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/adapter/ChinaeseStudent.java b/regional-etl/src/main/java/com/lyms/etl/start/adapter/ChinaeseStudent.java deleted file mode 100644 index 82dd0c6..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/adapter/ChinaeseStudent.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.etl.start.adapter; - -/** - * Created by Administrator on 2020-04-15. - */ -public class ChinaeseStudent implements ISpeak { - private String name; - public ChinaeseStudent(String name) { - this.name = name; - } - - @Override - public void speak() { - System.out.println(name+"说中国话"); - } - - @Override - public void listen() { - System.out.println(name+"听中国话"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/adapter/ForeignStudent.java b/regional-etl/src/main/java/com/lyms/etl/start/adapter/ForeignStudent.java deleted file mode 100644 index 38292cc..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/adapter/ForeignStudent.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.etl.start.adapter; - -/** - * Created by Administrator on 2020-04-15. - */ -public class ForeignStudent implements ISpeak { - private String name; - public ForeignStudent(String name) { - this.name = name; - } - - @Override - public void speak() { - System.out.println(name+"说中国话"); - } - - @Override - public void listen() { - System.out.println(name+"听中国话"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/adapter/ISpeak.java b/regional-etl/src/main/java/com/lyms/etl/start/adapter/ISpeak.java deleted file mode 100644 index dc6d39f..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/adapter/ISpeak.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.adapter; - -/** - * Created by Administrator on 2020-04-15. - */ -public interface ISpeak { - - void speak(); - void listen(); - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/adapter/SpeakAdapter.java b/regional-etl/src/main/java/com/lyms/etl/start/adapter/SpeakAdapter.java deleted file mode 100644 index eb0babc..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/adapter/SpeakAdapter.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.etl.start.adapter; - -/** - * Created by Administrator on 2020-04-15. - */ -public class SpeakAdapter implements ISpeak { - - ISpeak speak; - - public SpeakAdapter(ISpeak speak) { - this.speak = speak; - } - - @Override - public void speak() { - speak.speak(); - } - - @Override - public void listen() { - speak.listen(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/brige/G6Memory.java b/regional-etl/src/main/java/com/lyms/etl/start/brige/G6Memory.java deleted file mode 100644 index be6c415..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/brige/G6Memory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.brige; - -/** - * Created by Administrator on 2020-03-27. - */ -public class G6Memory implements IMemory { - @Override - public void addMemory() { - System.out.println("6G..."); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/brige/G8Memory.java b/regional-etl/src/main/java/com/lyms/etl/start/brige/G8Memory.java deleted file mode 100644 index 454445a..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/brige/G8Memory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.brige; - -/** - * Created by Administrator on 2020-03-27. - */ -public class G8Memory implements IMemory { - @Override - public void addMemory() { - System.out.println("8G ......"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/brige/HuaweiPhone.java b/regional-etl/src/main/java/com/lyms/etl/start/brige/HuaweiPhone.java deleted file mode 100644 index 67bc2dd..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/brige/HuaweiPhone.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.etl.start.brige; - -/** - * Created by Administrator on 2020-03-27. - */ -public class HuaweiPhone implements IPhone { - - private IMemory memory; - - public void setMemory(IMemory memory) - { - this.memory = memory; - } - - @Override - public void buyPhone() { - memory.addMemory(); - System.out.println("buy huawei ..."); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/brige/IMemory.java b/regional-etl/src/main/java/com/lyms/etl/start/brige/IMemory.java deleted file mode 100644 index 28d40d1..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/brige/IMemory.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.etl.start.brige; - -/** - * Created by Administrator on 2020-03-27. - */ -public interface IMemory { - - public void addMemory(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/brige/IPhone.java b/regional-etl/src/main/java/com/lyms/etl/start/brige/IPhone.java deleted file mode 100644 index e1c731d..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/brige/IPhone.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.lyms.etl.start.brige; - -/** - * Created by Administrator on 2020-03-27. - */ -public interface IPhone { - void buyPhone(); - - public void setMemory(IMemory memory); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/builder/IBuilder.java b/regional-etl/src/main/java/com/lyms/etl/start/builder/IBuilder.java deleted file mode 100644 index 5efe60f..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/builder/IBuilder.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lyms.etl.start.builder; - -/** - * Created by Administrator on 2020-04-15. - */ -public abstract class IBuilder { - - abstract void buildHead(); - abstract void buildBody(); - abstract void buildFoot(); - - abstract Person buildPerson(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/builder/Person.java b/regional-etl/src/main/java/com/lyms/etl/start/builder/Person.java deleted file mode 100644 index 7a85314..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/builder/Person.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lyms.etl.start.builder; - -/** - * Created by Administrator on 2020-04-15. - */ -public class Person { - - private String head; - - private String body; - - private String foot; - - public String getHead() { - return head; - } - - public void setHead(String head) { - this.head = head; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getFoot() { - return foot; - } - - public void setFoot(String foot) { - this.foot = foot; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/builder/PersonBuilder.java b/regional-etl/src/main/java/com/lyms/etl/start/builder/PersonBuilder.java deleted file mode 100644 index 4529e6e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/builder/PersonBuilder.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lyms.etl.start.builder; - -/** - * Created by Administrator on 2020-04-15. - */ -public class PersonBuilder extends IBuilder { - - private Person person = null; - - public PersonBuilder() { - this.person = new Person(); - } - - @Override - void buildHead() { - person.setHead("创建头"); - } - - @Override - void buildBody() { - person.setHead("创建身体"); - } - - @Override - void buildFoot() { - person.setHead("创建脚"); - } - - @Override - Person buildPerson() { - return person; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/DatabaseLogger.java b/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/DatabaseLogger.java deleted file mode 100644 index 0046d16..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/DatabaseLogger.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.lyms.etl.start.factorymethod; - -/** - * Created by Administrator on 2020-04-14. - */ -public class DatabaseLogger implements Logger { - @Override - public void writeLog() { - System.out.println("存入数据库日志"); - } - -} - - diff --git a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/DatabaseLoggerFactory.java b/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/DatabaseLoggerFactory.java deleted file mode 100644 index 917924e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/DatabaseLoggerFactory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.factorymethod; - -/** - * Created by Administrator on 2020-04-14. - */ -public class DatabaseLoggerFactory implements LoggerFactory { - @Override - public Logger createLogger() { - return new DatabaseLogger(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/FileLogger.java b/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/FileLogger.java deleted file mode 100644 index afd66d8..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/FileLogger.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.factorymethod; - -/** - * Created by Administrator on 2020-04-14. - */ -public class FileLogger implements Logger { - @Override - public void writeLog() { - System.out.println("存入文件"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/FileLoggerFactory.java b/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/FileLoggerFactory.java deleted file mode 100644 index ab3c5a4..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/FileLoggerFactory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.factorymethod; - -/** - * Created by Administrator on 2020-04-14. - */ -public class FileLoggerFactory implements LoggerFactory { - @Override - public Logger createLogger() { - return new FileLogger(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/Logger.java b/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/Logger.java deleted file mode 100644 index 7b78d60..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/Logger.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.lyms.etl.start.factorymethod; - -/** - * Created by Administrator on 2020-04-14. - */ -public interface Logger { - void writeLog(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/LoggerFactory.java b/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/LoggerFactory.java deleted file mode 100644 index bc48582..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/factorymethod/LoggerFactory.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.etl.start.factorymethod; - -/** - * Created by Administrator on 2020-04-14. - */ -public interface LoggerFactory { - - Logger createLogger(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/mediator/Mediator.java b/regional-etl/src/main/java/com/lyms/etl/start/mediator/Mediator.java deleted file mode 100644 index bb7b750..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/mediator/Mediator.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.etl.start.mediator; - -/** - * Created by Administrator on 2020-04-07. - */ -public abstract class Mediator { - - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/memento/Creater.java b/regional-etl/src/main/java/com/lyms/etl/start/memento/Creater.java deleted file mode 100644 index 4dfd856..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/memento/Creater.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lyms.etl.start.memento; - -/** - * Created by Administrator on 2020-04-03. - */ -public class Creater { - - public GameMemento gameMemento; - - public GameMemento getGameMemento() { - return gameMemento; - } - - public Creater setGameMemento(GameMemento gameMemento) { - this.gameMemento = gameMemento; - return this; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/memento/Game.java b/regional-etl/src/main/java/com/lyms/etl/start/memento/Game.java deleted file mode 100644 index 6a9b87c..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/memento/Game.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lyms.etl.start.memento; - -/** - * Created by Administrator on 2020-04-03. - */ -public class Game { - - private int playStep; - - public int getPlayStep() { - return playStep; - } - - public Game setPlayStep(int playStep) { - this.playStep = playStep; - return this; - } - - public GameMemento saveGameMemento() - { - GameMemento gameMemento = new GameMemento(); - gameMemento.setPlayStep(playStep); - return gameMemento; - } - - public void recover(GameMemento gameMemento) - { - this.playStep = gameMemento.getPlayStep(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/memento/GameMemento.java b/regional-etl/src/main/java/com/lyms/etl/start/memento/GameMemento.java deleted file mode 100644 index ef9e62e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/memento/GameMemento.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lyms.etl.start.memento; - -/** - * Created by Administrator on 2020-04-03. - */ -public class GameMemento { - - private int playStep; - - public int getPlayStep() { - return playStep; - } - - public GameMemento setPlayStep(int playStep) { - this.playStep = playStep; - return this; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/observer/Observer.java b/regional-etl/src/main/java/com/lyms/etl/start/observer/Observer.java deleted file mode 100644 index d7dec0d..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/observer/Observer.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.etl.start.observer; - -/** - * Created by Administrator on 2020-04-02. - */ -public interface Observer { - - void update(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/observer/Observerable.java b/regional-etl/src/main/java/com/lyms/etl/start/observer/Observerable.java deleted file mode 100644 index dab0f1c..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/observer/Observerable.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.observer; - -/** - * Created by Administrator on 2020-04-03. - */ -public interface Observerable { - - void registerObsesrver(Observer observer); - void removeObsesrver(Observer observer); - void notifyObserver(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/observer/UserObserver.java b/regional-etl/src/main/java/com/lyms/etl/start/observer/UserObserver.java deleted file mode 100644 index 0a917a5..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/observer/UserObserver.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.lyms.etl.start.observer; - -/** - * Created by Administrator on 2020-04-02. - */ -public class UserObserver implements Observer { - - private String name; - public UserObserver(String name) - { - this.name = name; - } - - - @Override - public void update() { - System.out.println(name+"收到通知"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/observer/WechatServer.java b/regional-etl/src/main/java/com/lyms/etl/start/observer/WechatServer.java deleted file mode 100644 index 9671afc..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/observer/WechatServer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lyms.etl.start.observer; - -import org.apache.commons.collections4.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by Administrator on 2020-04-03. - */ -public class WechatServer implements Observerable { - List observers = new ArrayList<>(); - - @Override - public void registerObsesrver(Observer observer) { - observers.add(observer); - } - - @Override - public void removeObsesrver(Observer observer) { - observers.remove(observer); - } - - @Override - public void notifyObserver() { - if (CollectionUtils.isNotEmpty(observers)) - { - for (Observer o : observers) - { - o.update(); - } - } - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/proxy/CodeProxy.java b/regional-etl/src/main/java/com/lyms/etl/start/proxy/CodeProxy.java deleted file mode 100644 index eb2e2c5..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/proxy/CodeProxy.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.etl.start.proxy; - -/** - * Created by Administrator on 2020-03-25. - */ -public class CodeProxy implements ICoder { - - private ICoder coder; - public CodeProxy(ICoder coder) - { - this.coder = coder; - } - - @Override - public void code() { - coder.code(); - } - - @Override - public void eat() { - coder.eat(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/proxy/CoderDynamicProxy.java b/regional-etl/src/main/java/com/lyms/etl/start/proxy/CoderDynamicProxy.java deleted file mode 100644 index 3e14121..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/proxy/CoderDynamicProxy.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lyms.etl.start.proxy; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; - -/** - * Created by Administrator on 2020-03-25. - */ -public class CoderDynamicProxy implements InvocationHandler { - - //被代理的实例 - private ICoder coder; - public CoderDynamicProxy(ICoder _coder){ - this.coder = _coder; - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - System.out.println(System.currentTimeMillis()); - Object result = method.invoke(coder, args); - System.out.println(System.currentTimeMillis()); - System.out.println(method.getName()); - return result; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/proxy/ICoder.java b/regional-etl/src/main/java/com/lyms/etl/start/proxy/ICoder.java deleted file mode 100644 index 4dfd1db..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/proxy/ICoder.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.proxy; - -/** - * Created by Administrator on 2020-03-25. - */ -public interface ICoder { - - public void code(); - - public void eat(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/proxy/JavaCoder.java b/regional-etl/src/main/java/com/lyms/etl/start/proxy/JavaCoder.java deleted file mode 100644 index 9d99a88..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/proxy/JavaCoder.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lyms.etl.start.proxy; - -/** - * Created by Administrator on 2020-03-25. - */ -public class JavaCoder implements ICoder { - @Override - public void code() { - System.out.println("coding....."); - } - - @Override - public void eat() { - System.out.println("eat....."); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/singleton/Singleton.java b/regional-etl/src/main/java/com/lyms/etl/start/singleton/Singleton.java deleted file mode 100644 index 7db444c..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/singleton/Singleton.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.lyms.etl.start.singleton; - -/** - * Created by Administrator on 2020-04-13. - */ -public class Singleton { - - private Singleton() - { - - } - - - private static volatile Singleton instance; - - public static Singleton getInstance() - { - if (instance == null) - { - synchronized (Singleton.class) - { - if (instance == null) - { - instance = new Singleton(); - } - } - } - return instance; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/singleton/SingletonEnum.java b/regional-etl/src/main/java/com/lyms/etl/start/singleton/SingletonEnum.java deleted file mode 100644 index cf831f3..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/singleton/SingletonEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.lyms.etl.start.singleton; - -/** - * Created by Administrator on 2020-04-13. - */ -public enum SingletonEnum { - INSTANCE; - - public void ok() - { - System.out.println("ok"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/state/AirController.java b/regional-etl/src/main/java/com/lyms/etl/start/state/AirController.java deleted file mode 100644 index 606763e..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/state/AirController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lyms.etl.start.state; - -/** - * Created by Administrator on 2020-04-02. - */ -public class AirController { - - public static final OpenState STATE_OPEN = new OpenState(); - public static final ClosedState STATE_CLOSED = new ClosedState(); - - private AirState currentState = STATE_CLOSED; - - public AirController() { - this.currentState.setController(this); - } - - public AirState getCurrentState() { - return currentState; - } - - public void setCurrentState(AirState currentState) { - this.currentState = currentState; - currentState.setController(this); - } - - public void powerOn() { - currentState.powerOn(); - } - - public void powerOff() { - currentState.powerOff(); - } - - public void adjustTemp() { - currentState.adjustTemp(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/state/AirState.java b/regional-etl/src/main/java/com/lyms/etl/start/state/AirState.java deleted file mode 100644 index 6c3edde..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/state/AirState.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.lyms.etl.start.state; - -/** - * Created by Administrator on 2020-04-02. - */ -public abstract class AirState { - - protected AirController controller; - - public abstract void powerOn(); - - public abstract void powerOff(); - - public abstract void adjustTemp(); - - public void setController(AirController controller) { - this.controller = controller; - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/state/ClosedState.java b/regional-etl/src/main/java/com/lyms/etl/start/state/ClosedState.java deleted file mode 100644 index a89c12d..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/state/ClosedState.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.etl.start.state; - -/** - * Created by Administrator on 2020-04-02. - */ -public class ClosedState extends AirState { - @Override - public void powerOn() { - controller.setCurrentState(AirController.STATE_OPEN); - controller.getCurrentState().powerOn(); - - System.out.println("当前状态为启动状态"); - } - - @Override - public void powerOff() { - System.out.println("已关闭空调"); - } - - @Override - public void adjustTemp() { - // no-op - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/state/OpenState.java b/regional-etl/src/main/java/com/lyms/etl/start/state/OpenState.java deleted file mode 100644 index 9be5802..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/state/OpenState.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.etl.start.state; - -/** - * Created by Administrator on 2020-04-02. - */ -public class OpenState extends AirState { - @Override - public void powerOn() { - System.out.println("已启动空调"); - } - - @Override - public void powerOff() { - controller.setCurrentState(AirController.STATE_CLOSED); - controller.getCurrentState().powerOff(); - - System.out.println("当前状态为关闭状态"); - } - - @Override - public void adjustTemp() { - System.out.println("已调整温度"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/strategy/MonnyPay.java b/regional-etl/src/main/java/com/lyms/etl/start/strategy/MonnyPay.java deleted file mode 100644 index b8f1b5c..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/strategy/MonnyPay.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.strategy; - -/** - * Created by Administrator on 2020-04-02. - */ -public class MonnyPay implements PayStrategy { - @Override - public void pay() { - System.out.println("现金支付"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/strategy/PayStrategy.java b/regional-etl/src/main/java/com/lyms/etl/start/strategy/PayStrategy.java deleted file mode 100644 index 82d38d0..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/strategy/PayStrategy.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lyms.etl.start.strategy; - -/** - * Created by Administrator on 2020-04-02. - */ -public interface PayStrategy { - - void pay(); -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/strategy/Payer.java b/regional-etl/src/main/java/com/lyms/etl/start/strategy/Payer.java deleted file mode 100644 index 31ab7ed..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/strategy/Payer.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.etl.start.strategy; - -/** - * Created by Administrator on 2020-04-02. - */ -public class Payer implements PayStrategy{ - - private PayStrategy payStrategy; - - public Payer() - { - - } - - public void setPayStrategy(PayStrategy payStrategy) - { - this.payStrategy = payStrategy; - } - - @Override - public void pay() { - payStrategy.pay(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/strategy/WxPay.java b/regional-etl/src/main/java/com/lyms/etl/start/strategy/WxPay.java deleted file mode 100644 index 6036d6d..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/strategy/WxPay.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lyms.etl.start.strategy; - -/** - * Created by Administrator on 2020-04-02. - */ -public class WxPay implements PayStrategy { - @Override - public void pay() { - System.out.println("微信支付"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/template/BsHouse.java b/regional-etl/src/main/java/com/lyms/etl/start/template/BsHouse.java deleted file mode 100644 index 765b824..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/template/BsHouse.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lyms.etl.start.template; - -/** - * Created by Administrator on 2020-04-02. - */ -public class BsHouse extends HouseTemplate { - - - public BsHouse(String name) { - super(name); - } - - @Override - public void buildDoor() { - System.out.println(super.name+"门修建成功"); - } - - @Override - public void buildWindow() { - System.out.println(super.name+"窗修建成功"); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/start/template/HouseTemplate.java b/regional-etl/src/main/java/com/lyms/etl/start/template/HouseTemplate.java deleted file mode 100644 index 5005790..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/start/template/HouseTemplate.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.etl.start.template; - -/** - * Created by Administrator on 2020-04-02. - */ -public abstract class HouseTemplate { - - protected String name; - HouseTemplate(String name) - { - this.name = name; - } - - - public abstract void buildDoor(); - - public abstract void buildWindow(); - - public final void buildHouse() - { - buildDoor(); - buildWindow(); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/util/AopTargetUtil.java b/regional-etl/src/main/java/com/lyms/etl/util/AopTargetUtil.java deleted file mode 100644 index 7406cbc..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/util/AopTargetUtil.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.lyms.etl.util; - -import org.springframework.aop.framework.AdvisedSupport; -import org.springframework.aop.framework.AopProxy; -import org.springframework.aop.support.AopUtils; - -import java.lang.reflect.Field; - -/** - * spring自动注入的对象 通过getClass()获取到的是proxy对象 - * 通过此类获取到真实对象 - * @Author: litao - * @Date: 2017/5/6 0006 11:21 - * @Version: V1.0 - */ -public class AopTargetUtil { - /** - * 获取 目标对象 - * @param proxy 代理对象 - * @return - * @throws Exception - */ - public static Object getTarget(Object proxy) { - if(!AopUtils.isAopProxy(proxy)) { - return proxy;//不是代理对象 - } - - if(AopUtils.isJdkDynamicProxy(proxy)) { - return getJdkDynamicProxyTargetObject(proxy); - } else { //cglib - return getCglibProxyTargetObject(proxy); - } - } - - - private static Object getCglibProxyTargetObject(Object proxy) { - Object target = null; - try { - Field h = proxy.getClass().getDeclaredField("CGLIB$CALLBACK_0"); - h.setAccessible(true); - Object dynamicAdvisedInterceptor = h.get(proxy); - - Field advised = dynamicAdvisedInterceptor.getClass().getDeclaredField("advised"); - advised.setAccessible(true); - - target = ((AdvisedSupport)advised.get(dynamicAdvisedInterceptor)).getTargetSource().getTarget(); - } catch (Exception e) { - - } - return target; - } - - - private static Object getJdkDynamicProxyTargetObject(Object proxy) { - Object target = null; - try { - Field h = proxy.getClass().getSuperclass().getDeclaredField("h"); - h.setAccessible(true); - AopProxy aopProxy = (AopProxy) h.get(proxy); - Field advised = aopProxy.getClass().getDeclaredField("advised"); - advised.setAccessible(true); - target = ((AdvisedSupport)advised.get(aopProxy)).getTargetSource().getTarget(); - } catch (Exception e) { - } - return target; - } - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/util/DateUtil.java b/regional-etl/src/main/java/com/lyms/etl/util/DateUtil.java deleted file mode 100644 index 60a3264..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/util/DateUtil.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lyms.etl.util; - -import java.util.Calendar; -import java.util.Date; - -public class DateUtil { - public static Integer getAge(Date birth) { - if(null==birth){ - return null; - } - Calendar calendar= Calendar.getInstance(); - Date date=new Date(); - calendar.setTime(date); - - Calendar c1 = Calendar.getInstance(); - Calendar c2 = Calendar.getInstance(); - c1.setTime(date); - c2.setTime(birth); - int year1 = c1.get(Calendar.YEAR); - int year2 = c2.get(Calendar.YEAR); - - int mouth1 = c1.get(Calendar.MONTH);//0当前 - int mouth2 = c2.get(Calendar.MONTH);//4 - int i=0; - /* if(mouth2-mouth1>=0){ - int days1 = c1.get(Calendar.DAY_OF_MONTH);//当前10 - int days2 = c2.get(Calendar.DAY_OF_MONTH);//1 - if(days1days2){ - } - }else if(mouth1-mouth2<0){ - i=i-1; - }*/ - - if(mouth2==mouth1){ - int days1 = c1.get(Calendar.DAY_OF_MONTH);//当前10 - int days2 = c2.get(Calendar.DAY_OF_MONTH);//1 - if(days1days2){ -// i=i-1; - } - }else if(mouth2>mouth1){ - i=i-1; - } - - -// if (birth == null) { -// return null; -// } -// Date now = new Date(); -// long m = now.getTime() - birth.getTime(); -// Long age = m / 31536000000L; -// return age.intValue(); - return (Math.abs(year1 - year2)+i); - } -} diff --git a/regional-etl/src/main/java/com/lyms/etl/util/ReflectUtil.java b/regional-etl/src/main/java/com/lyms/etl/util/ReflectUtil.java deleted file mode 100644 index 6bbfe94..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/util/ReflectUtil.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyms.etl.util; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.annotation.Annotation; - -/** - * 反射相关工具类 - * @Author: litao - * @Date: 2017/5/17 0017 17:41 - * @Version: V1.0 - */ -public class ReflectUtil { - - private static final Logger log = LoggerFactory.getLogger(ReflectUtil.class); - - public static T getMethodAnno(Class clazz, String methodName, Class annoClass) { - T anno = null; - try { - anno = clazz.getMethod(methodName).getAnnotation(annoClass); - } catch (Exception e) { - log.error("反射获取注解出错:", e.fillInStackTrace()); - } - return anno; - } - -} diff --git a/regional-etl/src/main/java/com/lyms/etl/util/UUIDUtil.java b/regional-etl/src/main/java/com/lyms/etl/util/UUIDUtil.java deleted file mode 100644 index c5e07d3..0000000 --- a/regional-etl/src/main/java/com/lyms/etl/util/UUIDUtil.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.lyms.etl.util; - -import java.util.UUID; - -/** - * @Author: litao - * @Date: 2017/5/4 0004 15:41 - * @Version: V1.0 - */ -public class UUIDUtil { - public static String createId() { - return UUID.randomUUID().toString().replace("-", "").toUpperCase(); - } -} diff --git a/regional-etl/src/main/resources/application-dz.yml b/regional-etl/src/main/resources/application-dz.yml deleted file mode 100644 index bcae619..0000000 --- a/regional-etl/src/main/resources/application-dz.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://192.168.200.119:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 - username: platform - password: platform123 - driver-class-name: com.mysql.jdbc.Driver - - data: - mongodb: - host: 192.168.200.119 - port: 27017 - database: platform - username: platform - password: platform123 diff --git a/regional-etl/src/main/resources/application-prod.yml b/regional-etl/src/main/resources/application-prod.yml deleted file mode 100644 index ca6d2cf..0000000 --- a/regional-etl/src/main/resources/application-prod.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://192.168.1.39:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 - username: platform - password: platform123 - driver-class-name: com.mysql.jdbc.Driver - - data: - mongodb: - host: 192.168.1.41 - port: 27018 - database: platform - username: platform - password: platform123 diff --git a/regional-etl/src/main/resources/application-qhd.yml b/regional-etl/src/main/resources/application-qhd.yml deleted file mode 100644 index eb49162..0000000 --- a/regional-etl/src/main/resources/application-qhd.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://localhost:3306/platform_dev?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 - username: root - password: - driver-class-name: com.mysql.jdbc.Driver - - data: - mongodb: - host: localhost - port: 27017 - database: platform - username: platform - password: platform123 diff --git a/regional-etl/src/main/resources/application.properties b/regional-etl/src/main/resources/application.properties deleted file mode 100644 index b780649..0000000 --- a/regional-etl/src/main/resources/application.properties +++ /dev/null @@ -1,25 +0,0 @@ -# druid -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.initialSize=5 -spring.datasource.minIdle=5 -spring.datasource.maxActive=20 -spring.datasource.maxWait=60000 -spring.datasource.timeBetweenEvictionRunsMillis=60000 -spring.datasource.minEvictableIdleTimeMillis=300000 -spring.datasource.validationQuery=SELECT 1 FROM DUAL -spring.datasource.testWhileIdle=true -spring.datasource.testOnBorrow=false -spring.datasource.testOnReturn=false -spring.datasource.poolPreparedStatements=true -spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.filters=stat,wall,log4j -spring.datasource.useGlobalDataSourceStat=true -spring.datasource.connectionProperties.druid.stat.mergeSql=true -spring.datasource.druid.stat.slowSqlMillis=5000 - -# mybatis -mybatis.typeAliasesPackage=com.lyms.etl.model -mybatis.mapperLocations=classpath:mappers/*.xml - -#spring.profiles.active=prod, etl -spring.profiles.active=dz, patient \ No newline at end of file diff --git a/regional-etl/src/main/resources/application.yml b/regional-etl/src/main/resources/application.yml deleted file mode 100644 index 3032ab6..0000000 --- a/regional-etl/src/main/resources/application.yml +++ /dev/null @@ -1,30 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://111.206.6.150:3306/platform - username: platform - password: platform123 - driver-class-name: com.mysql.jdbc.Driver - # 必须配置为字符类型 @see com.alibaba.druid.pool.DruidDataSourceFactory > value = (String)properties.get("init"); - init: "true" - - default: - url: jdbc:mysql://111.206.6.150:3306/platform - username: platform - password: platform123 - driver-class-name: com.mysql.jdbc.Driver - # 必须配置为字符类型 @see com.alibaba.druid.pool.DruidDataSourceFactory > value = (String)properties.get("init"); - init: "true" - - customs: - - ds1 - - ds2 - - data: - mongodb: - host: 111.206.6.150 - port: 10001 - database: platform - username: platform - password: platform123 -server: - port: 8888 \ No newline at end of file diff --git a/regional-etl/src/main/resources/logback.xml b/regional-etl/src/main/resources/logback.xml deleted file mode 100644 index b54144c..0000000 --- a/regional-etl/src/main/resources/logback.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - DEBUG - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/debug.%d{yyyy-MM-dd}.log - 30 - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - - INFO - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/info.%d{yyyy-MM-dd}.log - 30 - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - - WARN - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/warn.%d{yyyy-MM-dd}.log - 30 - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - - ERROR - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/error.%d{yyyy-MM-dd}.log - 30 - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - - - ${LOG_PATH}/debug_all.log - - DEBUG - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/compress/debug-%d{yyyy-MM-dd_HH}.%i.log.gz - 365 - - 10MB - - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - ${LOG_PATH}/info_all.log - - INFO - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/compress/info-%d{yyyy-MM-dd_HH}.%i.log.gz - 365 - - 10MB - - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - ${LOG_PATH}/warn_all.log - - WARN - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/compress/warn-%d{yyyy-MM-dd_HH}.%i.log.gz - 365 - - 10MB - - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - ${LOG_PATH}/error_all.log - - ERROR - NEUTRAL - DENY - - - ${LOG_PATH}/%d{yyyy-MM-dd}/compress/error-%d{yyyy-MM-dd_HH}.%i.log.gz - 365 - - 10MB - - - - %X{sessionId} %d{yyyy-MM-dd HH:mm:ss.SSS} %C method[%M] line[%L] %level logger[%c] %msg%n - - - - - System.err - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - ERROR - NEUTRAL - DENY - - - - System.err - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - INFO - NEUTRAL - DENY - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/regional-etl/src/main/resources/mappers/CouponInfoMapper.xml b/regional-etl/src/main/resources/mappers/CouponInfoMapper.xml deleted file mode 100644 index e8ba290..0000000 --- a/regional-etl/src/main/resources/mappers/CouponInfoMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - sequence_id,create_date,use_date,user_id,create_user_id,coupon_template_id,create_hospital_id,used_hospital_id,status - - - - - - insert into coupon_info(id, ) values(#{id},#{sequenceId},#{createDate},#{useDate},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status}) - - - - - - - - insert into hospital_coupon_template_group values(#{id}, #{hospitalId},#{couponTemplateGroupId}) - - - - insert into coupon_info(id, ) values - - (#{item.id}, #{item.sequenceId}, #{item.createDate}, #{item.useDate}, #{item.userId}, #{item.createUserId}, #{item.couponTemplateId}, #{item.createHospitalId}, #{item.usedHospitalId}, #{item.status}) - - - - - \ No newline at end of file