Browse Source

文件重新明明

chenweida 7 years ago
parent
commit
3ef82151ad
30 changed files with 37 additions and 30 deletions
  1. 7 0
      base/common-data-hbase/src/main/resources/template.yml
  2. 1 1
      base/common-swagger/pom.xml
  3. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/service/FunctionService.java
  4. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/service/ModuleFunService.java
  5. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/service/ModuleService.java
  6. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/service/SaasService.java
  7. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsGatewayService.java
  8. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsService.java
  9. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/version/service/ServerUrlVersionService.java
  10. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/version/service/ServerVersionLogService.java
  11. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/version/service/ServerVersionService.java
  12. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/version/service/UserUrlVersionService.java
  13. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/version/service/WlyyVersionService.java
  14. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WechatService.java
  15. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxAccessTokenService.java
  16. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java
  17. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java
  18. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxTemplateService.java
  19. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/ManageMenuUrlService.java
  20. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/MenuRoleService.java
  21. 2 2
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/UserRoleService.java
  22. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/BaseSaasService.java
  23. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiLogService.java
  24. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiService.java
  25. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementService.java
  26. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyySignFamilyService.java
  27. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/DoctorService.java
  28. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/HospitalService.java
  29. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/AdvertisementService.java
  30. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/PatientService.java

+ 7 - 0
base/common-data-hbase/src/main/resources/template.yml

@ -0,0 +1,7 @@
hadoop:
  hbase-properties:
    hbase.zookeeper.property.clientPort: 2181 ##端口号
    zookeeper.znode.parent: /hbase-unsecure
    hbase.zookeeper.quorum:  node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com ##地址
  user:
    name: root

+ 1 - 1
base/common-swagger/pom.xml

@ -12,7 +12,7 @@
    <artifactId>common-swagger</artifactId>
    <version>1.0.0</version>
    <packaging>pom</packaging>
    <packaging>jar</packaging>
    <dependencies>

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/service/FunctionService.java

@ -6,7 +6,7 @@ import com.yihu.jw.business.base.model.Function;
import com.yihu.jw.business.base.model.ModuleFunction;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/service/ModuleFunService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.base.dao.ModuleFunctionDao;
import com.yihu.jw.business.base.model.ModuleFunction;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/service/ModuleService.java

@ -6,7 +6,7 @@ import com.yihu.jw.business.base.model.Module;
import com.yihu.jw.business.base.model.SaasModule;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/service/SaasService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.base.dao.SaasDao;
import com.yihu.jw.business.base.model.Saas;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsGatewayService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.sms.dao.SmsGatewayDao;
import com.yihu.jw.business.sms.model.BaseSmsGateway;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsService.java

@ -3,7 +3,7 @@ package com.yihu.jw.business.sms.service;
import com.yihu.jw.business.sms.dao.SmsDao;
import com.yihu.jw.business.sms.model.BaseSms;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/version/service/ServerUrlVersionService.java

@ -7,7 +7,7 @@ import com.yihu.jw.business.version.model.BaseServerUrlVersion;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/version/service/ServerVersionLogService.java

@ -2,7 +2,7 @@ package com.yihu.jw.business.version.service;
import com.yihu.jw.business.version.dao.ServerVersionLogDao;
import com.yihu.jw.business.version.model.BaseServerVersionLog;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/version/service/ServerVersionService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.version.dao.ServerVersionDao;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.MBaseServerVersion;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/version/service/UserUrlVersionService.java

@ -5,7 +5,7 @@ import com.yihu.jw.business.version.dao.UserUrlVersionDao;
import com.yihu.jw.business.version.model.BaseServerVersion;
import com.yihu.jw.business.version.model.BaseServerVersionLog;
import com.yihu.jw.business.version.model.BaseUserUrlVersion;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/version/service/WlyyVersionService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.version.dao.WlyyVersionDao;
import com.yihu.jw.business.version.model.WlyyVersion;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WechatService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.wx.dao.WechatDao;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxAccessTokenService.java

@ -6,7 +6,7 @@ import com.yihu.jw.business.wx.model.WxAccessToken;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.util.HttpUtil;
import org.json.JSONObject;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java

@ -4,7 +4,7 @@ import com.yihu.jw.business.wx.dao.WxGraphicMessageDao;
import com.yihu.jw.business.wx.model.WxGraphicMessage;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.util.MessageUtil;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java

@ -6,7 +6,7 @@ import com.yihu.jw.business.wx.model.WxMenu;
import com.yihu.jw.business.wx.model.WxWechat;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.util.HttpUtil;
import org.json.JSONObject;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxTemplateService.java

@ -6,7 +6,7 @@ import com.yihu.jw.business.wx.dao.WxTemplateDao;
import com.yihu.jw.business.wx.model.*;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.util.HttpUtil;
import org.json.JSONObject;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/ManageMenuUrlService.java

@ -2,7 +2,7 @@ package com.yihu.jw.manage.service.system;
import com.yihu.jw.manage.dao.system.MenuUrlDao;
import com.yihu.jw.manage.model.system.ManageMenuUrl;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/MenuRoleService.java

@ -4,7 +4,7 @@ import com.yihu.jw.manage.adapter.CacheAdapter;
import com.yihu.jw.manage.adapter.cache.MapCache;
import com.yihu.jw.manage.dao.system.RoleMenuDao;
import com.yihu.jw.manage.model.system.ManageRoleMenu;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;

+ 2 - 2
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/UserRoleService.java

@ -3,8 +3,8 @@ package com.yihu.jw.manage.service.system;
import com.yihu.jw.manage.dao.system.UserRoleDao;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.model.system.ManageUserRole;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.URLQueryParser;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.URLQueryParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/BaseSaasService.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.BaseSaasDao;
import com.yihu.jw.wlyy.entity.BaseSaas;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiLogService.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiLogDao;
import com.yihu.jw.wlyy.entity.agreement.WlyyAgreementKpiLog;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiService.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiDao;
import com.yihu.jw.wlyy.entity.agreement.WlyyAgreement;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementService.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementDao;
import com.yihu.jw.wlyy.entity.agreement.WlyyAgreement;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyySignFamilyService.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.util.IDCard;
import com.yihu.jw.wlyy.dao.agreement.WlyySignFamilyDao;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/DoctorService.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.service.doctor;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.DoctorDao;
import com.yihu.jw.wlyy.entity.doctor.Doctors;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/HospitalService.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.service.doctor;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.HospitalDao;
import com.yihu.jw.wlyy.entity.doctor.BaseOrgHospital;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/AdvertisementService.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.patient;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.util.AddressUtils;
import com.yihu.jw.util.CusAccessObjectUtil;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/PatientService.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.service.patient;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.patient.BasePatientDao;
import com.yihu.jw.wlyy.entity.patient.BasePatient;
import org.springframework.beans.factory.annotation.Autowired;