LAPTOP-KB9HII50\70708 il y a 2 ans
Parent
commit
f6a7eba90b
61 fichiers modifiés avec 65 ajouts et 670 suppressions
  1. 1 2
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/OauthCaConfigDao.java
  2. 1 2
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/OauthYlzConfigDao.java
  3. 1 2
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/SfConfigDao.java
  4. 0 43
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionExpressageService.java
  5. 1 1
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java
  6. 1 1
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/XzyyPrescriptionService.java
  7. 0 12
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/HcyyEntranceService.java
  8. 1 1
      business/base-service/src/main/java/com/yihu/jw/hospital/ykyy/service/YkyyService.java
  9. 1 1
      business/base-service/src/main/java/com/yihu/jw/order/pay/ylz/YlzPayService.java
  10. 1 2
      business/base-service/src/main/java/com/yihu/jw/wlyy/dao/OauthWlyyConfigDao.java
  11. 1 1
      business/base-service/src/main/java/com/yihu/jw/wlyy/wlyyhttp/WlyyHttpService.java
  12. 0 298
      common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesDO.java
  13. 0 99
      common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesInfoDO.java
  14. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/ca/OauthCaConfigDO.java
  15. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/sf/SfConfigDO.java
  16. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/child/BaseChildManage.java
  17. 0 143
      common/common-entity/src/main/java/com/yihu/jw/entity/myFamily/PatientApplyLog.java
  18. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/dimension/DimensionDo.java
  19. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/dimension/DimensionQuotaDo.java
  20. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/job/QuartzJobConfig.java
  21. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/job/QuartzJobLog.java
  22. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserDO.java
  23. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceDO.java
  24. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceLogDO.java
  25. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceStandardDO.java
  26. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/wlyyinfo/OauthWlyyConfigDO.java
  27. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/wlyyinfo/WechatTag.java
  28. 1 2
      common/common-entity/src/main/java/com/yihu/jw/entity/ylzinfo/OauthYlzConfigDO.java
  29. 1 2
      server/svr-authentication/src/main/java/com/yihu/jw/security/dao/OauthCaConfigDao.java
  30. 1 2
      server/svr-authentication/src/main/java/com/yihu/jw/security/dao/OauthWlyyConfigDao.java
  31. 1 2
      server/svr-authentication/src/main/java/com/yihu/jw/security/dao/OauthYlzConfigDao.java
  32. 1 1
      server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthCaConfigSerivce.java
  33. 1 2
      server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthWlyyConfigService.java
  34. 1 1
      server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthYlzConfigService.java
  35. 1 1
      server/svr-authentication/src/main/java/com/yihu/jw/security/service/XzzxService.java
  36. 1 2
      server/svr-authentication/src/main/java/com/yihu/jw/security/service/YkyyService.java
  37. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/childManage/BaseChildManageDao.java
  38. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserDao.java
  39. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserInterfaceDao.java
  40. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserInterfaceLogDao.java
  41. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserInterfaceStandardDao.java
  42. 4 4
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/interfacemg/BaseUserInterfaceEndpoint.java
  43. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/service/child/ChildManageService.java
  44. 4 4
      svr/svr-base/src/main/java/com/yihu/jw/base/service/interfacemg/BaseUserInterfaceService.java
  45. 1 1
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/repository/job/JobConfigDao.java
  46. 1 1
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/repository/job/QuartzJobConfigDao.java
  47. 1 1
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/repository/job/QuartzJobLogDao.java
  48. 1 1
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/quota/JobService.java
  49. 1 1
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java
  50. 1 1
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java
  51. 1 1
      svr/svr-statistics-es/doc/es/QuartzJobConfig.java
  52. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/dao/JobConfigDao.java
  53. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobConfigDao.java
  54. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobLogDao.java
  55. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/ExtractHelper.java
  56. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/Data2Save.java
  57. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/ESExtract.java
  58. 2 2
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentMysqlToEsQuotaJob.java
  59. 2 2
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/EsToEsQuotaJob.java
  60. 2 2
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/MysqlToEsQuotaJob.java
  61. 1 1
      svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

+ 1 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/OauthCaConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.hospital.prescription.dao;
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2019/12/25.
 * Created by Trick on 2019/12/25.

+ 1 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/OauthYlzConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.hospital.prescription.dao;
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2019/7/26.
 * Created by Trick on 2019/7/26.

+ 1 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/SfConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.hospital.prescription.dao;
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.sf.SfConfigDO;
import com.yihu.jw.entity.base.sf.SfConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2020/2/27.
 * Created by Trick on 2020/2/27.

+ 0 - 43
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionExpressageService.java

@ -91,9 +91,6 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
    @Autowired
    @Autowired
    PrescriptionService prescriptionService;
    PrescriptionService prescriptionService;
    @Autowired
    private SfConfigDao sfConfigDao;
    private PrescriptionExpressageService(){}
    private PrescriptionExpressageService(){}
    public PrescriptionExpressageService(String sf_url,String sf_code,String sf_check_word){
    public PrescriptionExpressageService(String sf_url,String sf_code,String sf_check_word){
@ -936,44 +933,4 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
        }
        }
    }
    }
//    public JSONObject addSFOrder(WlyyPrescriptionExpressageDO expressageDO){
//
//        SfConfigDO sfConfigDO = sfConfigDao.getOne("sfconfig");
//
//        JSONObject param = new JSONObject();
//        param.put("timestamp",new Date());
//        param.put("version","1.0");
//        JSONArray orderThirds = new JSONArray();
//        JSONObject order = new JSONObject();
//        order.put("bspOrderNo",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//        order.put("",);
//    }
}
}

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@ -50,7 +50,7 @@ import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.healthCare.service.HealthCareService;
import com.yihu.jw.healthCare.service.HealthCareService;
import com.yihu.jw.hospital.consult.dao.BaseAdviceTreatmentDao;
import com.yihu.jw.hospital.consult.dao.BaseAdviceTreatmentDao;

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/XzyyPrescriptionService.java

@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;

+ 0 - 12
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/HcyyEntranceService.java

@ -3,13 +3,11 @@ package com.yihu.jw.hospital.prescription.service.entrance;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.dict.dao.DictDoctorDutyDao;
import com.yihu.jw.dict.dao.DictDoctorDutyDao;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.entity.auth.OauthRsaKeyDO;
import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@ -17,36 +15,29 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.hospital.dict.WlyyChargeDictDao;
import com.yihu.jw.hospital.dict.WlyyChargeDictDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.prescription.dao.*;
import com.yihu.jw.hospital.prescription.dao.*;
import com.yihu.jw.hospital.prescription.service.entrance.util.AES;
import com.yihu.jw.oauth.OauthRsaKeyDao;
import com.yihu.jw.oauth.OauthRsaKeyDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.hospital.doctor.CheckInfoVO;
import com.yihu.jw.restmodel.hospital.doctor.PersonInfoVO;
import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.WebserviceUtil;
import com.yihu.jw.utils.WebserviceUtil;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.util.encrypt.MD5;
import com.yihu.jw.util.encrypt.MD5;
import net.sf.json.xml.XMLSerializer;
import net.sf.json.xml.XMLSerializer;
import nu.xom.*;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.Logger;
@ -57,9 +48,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.io.StringReader;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.*;

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/ykyy/service/YkyyService.java

@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import com.yihu.jw.hospital.prescription.dao.OauthCaConfigDao;
import com.yihu.jw.hospital.prescription.dao.OauthCaConfigDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/order/pay/ylz/YlzPayService.java

@ -2,7 +2,7 @@ package com.yihu.jw.order.pay.ylz;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.prescription.dao.OauthYlzConfigDao;
import com.yihu.jw.hospital.prescription.dao.OauthYlzConfigDao;
import com.yihu.jw.order.pay.utils.PayLogService;
import com.yihu.jw.order.pay.utils.PayLogService;

+ 1 - 2
business/base-service/src/main/java/com/yihu/jw/wlyy/dao/OauthWlyyConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.wlyy.dao;
package com.yihu.jw.wlyy.dao;
import com.yihu.jw.entity.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.entity.third.wlyyinfo.OauthWlyyConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2019/8/7.
 * Created by Trick on 2019/8/7.

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/wlyy/wlyyhttp/WlyyHttpService.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.wlyyhttp;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.entity.third.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.wlyy.dao.OauthWlyyConfigDao;
import com.yihu.jw.wlyy.dao.OauthWlyyConfigDao;

+ 0 - 298
common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesDO.java

@ -1,298 +0,0 @@
package com.yihu.jw.entity.archives;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by Trick on 2018/2/7.
 */
@Entity
@Table(name = "wlyy_patient_archives")
public class PatientArchivesDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasid
    @Column(name = "patient_code")
    private String patientCode;//关联居民登录code
    @Column(name = "patient_name")
    private String patientName;//姓名
    @Column(name = "idcard")
    private String idcard;//身份证号
    @Column(name = "birthday")
    private Date birthday;//生日
    @Column(name = "sex")
    private String sex;//int(11) DEFAULT NULL COMMENT '性别,1男,2女
    @Column(name = "mobile")
    private String mobile;//手机号
    @Column(name = "ssc")
    private String ssc;//社保卡号
    @Column(name = "status")
    private String status;//int(11) DEFAULT NULL COMMENT '档案状态:1正常,0注销
    @Column(name = "cancel_resean_type")
    private String cancelReseanType;//注销原因:1死亡,2.重复
    @Column(name = "sick_village")
    private String sickVillage;//居委会代码(字典)
    @Column(name = "sick_village_name")
    private String sickVillageName;//居委会
    @Column(name = "resident_type")
    private String residentType;//常住类型 :1户籍,2非户籍
    @Column(name = "blood")
    private String blood;//血型:A,AB,O,B,N(不详)
    @Column(name = "RH")
    private String RH;//1,阴性;2阳性;0 不详
    @Column(name = "nation_code")
    private String nationCode;//民族code(字典)
    @Column(name = "nation")
    private String nation;//民族名称
    @Column(name = "work_place")
    private String workPlace;//工作地点
    @Column(name = "contact_people")
    private String contactPeople;//联系人
    @Column(name = "contact_mobile")
    private String contactMobile;//联系人电话
    @Column(name = "education_code")
    private String educationCode;//文化程度(字典)
    @Column(name = "education")
    private String education;//文化程度
    @Column(name = "profession_code")
    private String professionCode;//职业(字典)
    @Column(name = "profession")
    private String profession;//职业
    @Column(name = "marriage_code")// ·
    private String marriageCode;//婚姻状况(字典)
    @Column(name = "marriage")
    private String marriage;//婚姻状况
    @Column(name = "payment_code")
    private String paymentCode;//支付方式(字典)
    @Column(name = "payment")
    private String payment;// 支付方式
    public String getPatientCode() {
        return patientCode;
    }
    public void setPatientCode(String patientCode) {
        this.patientCode = patientCode;
    }
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public Date getBirthday() {
        return birthday;
    }
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getSsc() {
        return ssc;
    }
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getCancelReseanType() {
        return cancelReseanType;
    }
    public void setCancelReseanType(String cancelReseanType) {
        this.cancelReseanType = cancelReseanType;
    }
    public String getSickVillage() {
        return sickVillage;
    }
    public void setSickVillage(String sickVillage) {
        this.sickVillage = sickVillage;
    }
    public String getSickVillageName() {
        return sickVillageName;
    }
    public void setSickVillageName(String sickVillageName) {
        this.sickVillageName = sickVillageName;
    }
    public String getResidentType() {
        return residentType;
    }
    public void setResidentType(String residentType) {
        this.residentType = residentType;
    }
    public String getBlood() {
        return blood;
    }
    public void setBlood(String blood) {
        this.blood = blood;
    }
    public String getRH() {
        return RH;
    }
    public void setRH(String RH) {
        this.RH = RH;
    }
    public String getNationCode() {
        return nationCode;
    }
    public void setNationCode(String nationCode) {
        this.nationCode = nationCode;
    }
    public String getNation() {
        return nation;
    }
    public void setNation(String nation) {
        this.nation = nation;
    }
    public String getWorkPlace() {
        return workPlace;
    }
    public void setWorkPlace(String workPlace) {
        this.workPlace = workPlace;
    }
    public String getContactPeople() {
        return contactPeople;
    }
    public void setContactPeople(String contactPeople) {
        this.contactPeople = contactPeople;
    }
    public String getContactMobile() {
        return contactMobile;
    }
    public void setContactMobile(String contactMobile) {
        this.contactMobile = contactMobile;
    }
    public String getEducationCode() {
        return educationCode;
    }
    public void setEducationCode(String educationCode) {
        this.educationCode = educationCode;
    }
    public String getEducation() {
        return education;
    }
    public void setEducation(String education) {
        this.education = education;
    }
    public String getProfessionCode() {
        return professionCode;
    }
    public void setProfessionCode(String professionCode) {
        this.professionCode = professionCode;
    }
    public String getProfession() {
        return profession;
    }
    public void setProfession(String profession) {
        this.profession = profession;
    }
    public String getMarriageCode() {
        return marriageCode;
    }
    public void setMarriageCode(String marriageCode) {
        this.marriageCode = marriageCode;
    }
    public String getMarriage() {
        return marriage;
    }
    public void setMarriage(String marriage) {
        this.marriage = marriage;
    }
    public String getPaymentCode() {
        return paymentCode;
    }
    public void setPaymentCode(String paymentCode) {
        this.paymentCode = paymentCode;
    }
    public String getPayment() {
        return payment;
    }
    public void setPayment(String payment) {
        this.payment = payment;
    }
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
}

+ 0 - 99
common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesInfoDO.java

@ -1,99 +0,0 @@
package com.yihu.jw.entity.archives;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by Trick on 2018/2/7.
 */
@Entity
@Table(name = "wlyy_patient_archives_info")
public class PatientArchivesInfoDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasid
    @Column(name = "archives_code")
    private String archivesCode; //档案code
    @Column(name = "level1")
    private String level1;//1.历史情况,2.既往史,3.家族史,4.生活环境
    @Column(name = "level2")
    private String level2; //子类别
    @Column(name = "key")
    private String key; //字典值,或判断值(有,无)
    @Column(name = "value")
    private String value; //字典名称
    @Column(name = "date")
    private Date date;//关联时间
    @Column(name = "remark")
    private String remark; //备注/其他/描述/详情
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getArchivesCode() {
        return archivesCode;
    }
    public void setArchivesCode(String archivesCode) {
        this.archivesCode = archivesCode;
    }
    public String getLevel1() {
        return level1;
    }
    public void setLevel1(String level1) {
        this.level1 = level1;
    }
    public String getLevel2() {
        return level2;
    }
    public void setLevel2(String level2) {
        this.level2 = level2;
    }
    public String getKey() {
        return key;
    }
    public void setKey(String key) {
        this.key = key;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public Date getDate() {
        return date;
    }
    public void setDate(Date date) {
        this.date = date;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/ca/OauthCaConfigDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.ca;
package com.yihu.jw.entity.base.ca;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/sf/SfConfigDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.sf;
package com.yihu.jw.entity.base.sf;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/child/BaseChildManage.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.child;
package com.yihu.jw.entity.care.child;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;

+ 0 - 143
common/common-entity/src/main/java/com/yihu/jw/entity/myFamily/PatientApplyLog.java

@ -1,143 +0,0 @@
package com.yihu.jw.entity.myFamily;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
/**
 * @author liuwenbin on 2018/11/30.
 */
@Entity
@Table(name = "patient_apply_for_log")
@SequenceGenerator(name="id_generated", sequenceName="PATIENT_APPLY_FOR_LOG_SEQ")
public class PatientApplyLog extends IntegerIdentityEntity {
    private String familyMemberName;//家庭成员名称
    private String familyMemberCode;//家庭成员code
    private String qrCode;//二维码地址
    private Date failureTime;//失效时间
    private Integer status;//1、添加家人(默认),2、邀请登录,3、通过,4、拒绝,5、申请人主动终止申请
    private Integer del;//删除标志(1正常,0删除)申请人主动终止申请
    private Date createTime;//创建时间
    private String createUser;//申请人
    private String createUserName;//申请人姓名
    private Integer remindType;//提醒方式(1、打电话,2、发短信,3、微信)
    private Date confirmTime;//确认时间
    private Integer familyBindRole;//1配偶,2父亲,3母亲,4公公,5婆婆,6岳父,7岳母,8女婿,9儿媳,10子女
    @Column(name = "family_member_name")
    public String getFamilyMemberName() {
        return familyMemberName;
    }
    public void setFamilyMemberName(String familyMemberName) {
        this.familyMemberName = familyMemberName;
    }
    @Column(name = "family_member_code")
    public String getFamilyMemberCode() {
        return familyMemberCode;
    }
    public void setFamilyMemberCode(String familyMemberCode) {
        this.familyMemberCode = familyMemberCode;
    }
    @Column(name = "qr_code")
    public String getQrCode() {
        return qrCode;
    }
    public void setQrCode(String qrCode) {
        this.qrCode = qrCode;
    }
    @Column(name = "failure_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getFailureTime() {
        return failureTime;
    }
    public void setFailureTime(Date failureTime) {
        this.failureTime = failureTime;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "create_user")
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "create_user_name")
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Column(name = "remind_type")
    public Integer getRemindType() {
        return remindType;
    }
    public void setRemindType(Integer remindType) {
        this.remindType = remindType;
    }
    @Column(name = "confirm_time")
    public Date getConfirmTime() {
        return confirmTime;
    }
    public void setConfirmTime(Date confirmTime) {
        this.confirmTime = confirmTime;
    }
    @Column(name = "family_bind_role")
    public Integer getFamilyBindRole() {
        return familyBindRole;
    }
    public void setFamilyBindRole(Integer familyBindRole) {
        this.familyBindRole = familyBindRole;
    }
}

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/dimension/DimensionDo.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.dimension;
package com.yihu.jw.entity.quota.dimension;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/dimension/DimensionQuotaDo.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.dimension;
package com.yihu.jw.entity.quota.dimension;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/job/QuartzJobConfig.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.job;
package com.yihu.jw.entity.quota.job;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.GenericGenerator;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/job/QuartzJobLog.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.job;
package com.yihu.jw.entity.quota.job;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.GenericGenerator;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.interfacemg;
package com.yihu.jw.entity.third.interfacemg;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.interfacemg;
package com.yihu.jw.entity.third.interfacemg;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceLogDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.interfacemg;
package com.yihu.jw.entity.third.interfacemg;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceStandardDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.interfacemg;
package com.yihu.jw.entity.third.interfacemg;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/wlyyinfo/OauthWlyyConfigDO.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.wlyyinfo;
package com.yihu.jw.entity.third.wlyyinfo;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/wlyyinfo/WechatTag.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.wlyyinfo;
package com.yihu.jw.entity.third.wlyyinfo;

+ 1 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/ylzinfo/OauthYlzConfigDO.java

@ -1,8 +1,7 @@
package com.yihu.jw.entity.ylzinfo;
package com.yihu.jw.entity.third.ylzinfo;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Table;

+ 1 - 2
server/svr-authentication/src/main/java/com/yihu/jw/security/dao/OauthCaConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.security.dao;
package com.yihu.jw.security.dao;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2019/12/25.
 * Created by Trick on 2019/12/25.

+ 1 - 2
server/svr-authentication/src/main/java/com/yihu/jw/security/dao/OauthWlyyConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.security.dao;
package com.yihu.jw.security.dao;
import com.yihu.jw.entity.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.entity.third.wlyyinfo.OauthWlyyConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2019/8/7.
 * Created by Trick on 2019/8/7.

+ 1 - 2
server/svr-authentication/src/main/java/com/yihu/jw/security/dao/OauthYlzConfigDao.java

@ -1,9 +1,8 @@
package com.yihu.jw.security.dao;
package com.yihu.jw.security.dao;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
/**
 * Created by Trick on 2019/7/26.
 * Created by Trick on 2019/7/26.

+ 1 - 1
server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthCaConfigSerivce.java

@ -1,7 +1,7 @@
package com.yihu.jw.security.service;
package com.yihu.jw.security.service;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import com.yihu.jw.security.dao.OauthCaConfigDao;
import com.yihu.jw.security.dao.OauthCaConfigDao;
import com.yihu.jw.security.utils.qrcode.QRCodeService;
import com.yihu.jw.security.utils.qrcode.QRCodeService;
import com.yihu.jw.security.utils.qrcode.QRCodeServiceImplServiceLocator;
import com.yihu.jw.security.utils.qrcode.QRCodeServiceImplServiceLocator;

+ 1 - 2
server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthWlyyConfigService.java

@ -1,6 +1,5 @@
package com.yihu.jw.security.service;
package com.yihu.jw.security.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
@ -10,7 +9,7 @@ import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.entity.third.wlyyinfo.OauthWlyyConfigDO;
import com.yihu.jw.security.dao.OauthWlyyConfigDao;
import com.yihu.jw.security.dao.OauthWlyyConfigDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorHospitalDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorHospitalDao;

+ 1 - 1
server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthYlzConfigService.java

@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.security.dao.OauthYlzConfigDao;
import com.yihu.jw.security.dao.OauthYlzConfigDao;
import com.yihu.jw.security.dao.patient.BasePatientDao;
import com.yihu.jw.security.dao.patient.BasePatientDao;
import com.yihu.jw.security.dao.patient.WlyyPatientFamilyMemberDao;
import com.yihu.jw.security.dao.patient.WlyyPatientFamilyMemberDao;

+ 1 - 1
server/svr-authentication/src/main/java/com/yihu/jw/security/service/XzzxService.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import com.yihu.jw.security.dao.OauthCaConfigDao;
import com.yihu.jw.security.dao.OauthCaConfigDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorHospitalDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorHospitalDao;

+ 1 - 2
server/svr-authentication/src/main/java/com/yihu/jw/security/service/YkyyService.java

@ -3,13 +3,12 @@ package com.yihu.jw.security.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.internal.util.codec.*;
import com.alipay.api.internal.util.codec.Base64;
import com.alipay.api.internal.util.codec.Base64;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.base.ca.OauthCaConfigDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.security.dao.OauthCaConfigDao;
import com.yihu.jw.security.dao.OauthCaConfigDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/childManage/BaseChildManageDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.dao.childManage;
package com.yihu.jw.base.dao.childManage;
import com.yihu.jw.entity.child.BaseChildManage;
import com.yihu.jw.entity.care.child.BaseChildManage;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.dao.interfacemg;
package com.yihu.jw.base.dao.interfacemg;
import com.yihu.jw.entity.interfacemg.BaseThirdUserDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserInterfaceDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.dao.interfacemg;
package com.yihu.jw.base.dao.interfacemg;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserInterfaceLogDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.dao.interfacemg;
package com.yihu.jw.base.dao.interfacemg;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceLogDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceLogDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/dao/interfacemg/BaseThirdUserInterfaceStandardDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.base.dao.interfacemg;
package com.yihu.jw.base.dao.interfacemg;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceStandardDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceStandardDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 4 - 4
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/interfacemg/BaseUserInterfaceEndpoint.java

@ -3,10 +3,10 @@ package com.yihu.jw.base.endpoint.interfacemg;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.interfacemg.BaseUserInterfaceService;
import com.yihu.jw.base.service.interfacemg.BaseUserInterfaceService;
import com.yihu.jw.entity.interfacemg.BaseThirdUserDO;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceDO;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceLogDO;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceStandardDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceLogDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceStandardDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/service/child/ChildManageService.java

@ -2,7 +2,7 @@ package com.yihu.jw.base.service.child;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.childManage.BaseChildManageDao;
import com.yihu.jw.base.dao.childManage.BaseChildManageDao;
import com.yihu.jw.entity.child.BaseChildManage;
import com.yihu.jw.entity.care.child.BaseChildManage;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.BeanPropertyRowMapper;

+ 4 - 4
svr/svr-base/src/main/java/com/yihu/jw/base/service/interfacemg/BaseUserInterfaceService.java

@ -6,10 +6,10 @@ import com.yihu.jw.base.dao.interfacemg.BaseThirdUserDao;
import com.yihu.jw.base.dao.interfacemg.BaseThirdUserInterfaceDao;
import com.yihu.jw.base.dao.interfacemg.BaseThirdUserInterfaceDao;
import com.yihu.jw.base.dao.interfacemg.BaseThirdUserInterfaceLogDao;
import com.yihu.jw.base.dao.interfacemg.BaseThirdUserInterfaceLogDao;
import com.yihu.jw.base.dao.interfacemg.BaseThirdUserInterfaceStandardDao;
import com.yihu.jw.base.dao.interfacemg.BaseThirdUserInterfaceStandardDao;
import com.yihu.jw.entity.interfacemg.BaseThirdUserDO;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceDO;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceLogDO;
import com.yihu.jw.entity.interfacemg.BaseThirdUserInterfaceStandardDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceLogDO;
import com.yihu.jw.entity.third.interfacemg.BaseThirdUserInterfaceStandardDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils;

+ 1 - 1
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/repository/job/JobConfigDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.repository.job;
package com.yihu.jw.repository.job;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 1 - 1
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/repository/job/QuartzJobConfigDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.repository.job;
package com.yihu.jw.repository.job;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 1 - 1
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/repository/job/QuartzJobLogDao.java

@ -1,6 +1,6 @@
package com.yihu.jw.repository.job;
package com.yihu.jw.repository.job;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.entity.quota.job.QuartzJobLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 1 - 1
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/quota/JobService.java

@ -1,6 +1,6 @@
package com.yihu.jw.service.quota;
package com.yihu.jw.service.quota;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.WlyyQuota;
import com.yihu.jw.entity.quota.WlyyQuota;
import com.yihu.jw.job.QuartzHelper;
import com.yihu.jw.job.QuartzHelper;
import com.yihu.jw.repository.job.QuartzJobConfigDao;
import com.yihu.jw.repository.job.QuartzJobConfigDao;

+ 1 - 1
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@ -25,7 +25,7 @@ import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.es.service.StatisticsEsService;
import com.yihu.jw.es.service.StatisticsEsService;
import com.yihu.jw.es.service.yqfk.YqfkService;
import com.yihu.jw.es.service.yqfk.YqfkService;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.file_upload.FileUploadService;

+ 1 - 1
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java

@ -5,7 +5,7 @@ import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.entity.third.ylzinfo.OauthYlzConfigDO;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.prescription.dao.OauthYlzConfigDao;
import com.yihu.jw.hospital.prescription.dao.OauthYlzConfigDao;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.hospital.ykyy.service.YkyyService;

+ 1 - 1
svr/svr-statistics-es/doc/es/QuartzJobConfig.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.job;
package com.yihu.jw.entity.quota.job;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.GenericGenerator;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/dao/JobConfigDao.java

@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobConfigDao.java

@ -1,7 +1,7 @@
package com.yihu.wlyy.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobLogDao.java

@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.entity.quota.job.QuartzJobLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/ExtractHelper.java

@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.etl.extract;
package com.yihu.wlyy.statistics.etl.extract;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.wlyy.statistics.etl.extract.db.DBExtract;
import com.yihu.wlyy.statistics.etl.extract.db.DBExtract;
import com.yihu.wlyy.statistics.etl.extract.db.ESExtract;
import com.yihu.wlyy.statistics.etl.extract.db.ESExtract;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.util.SpringUtil;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/Data2Save.java

@ -1,7 +1,7 @@
package com.yihu.wlyy.statistics.etl.extract.db;
package com.yihu.wlyy.statistics.etl.extract.db;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.vo.*;
import com.yihu.wlyy.statistics.vo.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeanUtils;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/ESExtract.java

@ -1,7 +1,7 @@
package com.yihu.wlyy.statistics.etl.extract.db;
package com.yihu.wlyy.statistics.etl.extract.db;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.util.ElasticsearchUtil;
import com.yihu.wlyy.statistics.util.ElasticsearchUtil;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;

+ 2 - 2
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentMysqlToEsQuotaJob.java

@ -1,7 +1,7 @@
package com.yihu.wlyy.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobLog;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;

+ 2 - 2
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/EsToEsQuotaJob.java

@ -1,7 +1,7 @@
package com.yihu.wlyy.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobLog;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.etl.compute.ComputeHelper;
import com.yihu.wlyy.statistics.etl.compute.ComputeHelper;

+ 2 - 2
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/MysqlToEsQuotaJob.java

@ -1,8 +1,8 @@
package com.yihu.wlyy.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobLog;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;

+ 1 - 1
svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.service;
package com.yihu.wlyy.statistics.service;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.quota.job.QuartzJobConfig;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.job.business.CacheCleanJob;
import com.yihu.wlyy.statistics.job.business.CacheCleanJob;