Browse Source

公共方法,异常处理类

Progr1mmer 6 years ago
parent
commit
9a3231fb7c
100 changed files with 798 additions and 207 deletions
  1. 30 0
      common/common-entity/src/main/java/com/yihu/jw/entity/AssignedIdentityEntity.java
  2. 92 0
      common/common-entity/src/main/java/com/yihu/jw/entity/AssignedIdentityEntityWithOperator.java
  3. 30 0
      common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java
  4. 92 0
      common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntityWithOperator.java
  5. 1 1
      common/common-entity/src/main/java/com/yihu/jw/UuidIdentityEntity.java
  6. 102 0
      common/common-entity/src/main/java/com/yihu/jw/entity/UuidIdentityEntityWithOperator.java
  7. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesDO.java
  8. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesInfoDO.java
  9. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/function/FunctionDO.java
  10. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/login/BaseLoginAccountDO.java
  11. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/login/BaseLoginLogDO.java
  12. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/message/Message.java
  13. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/message/MessageSubscriberDO.java
  14. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/module/ModuleDO.java
  15. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/module/ModuleFunctionDO.java
  16. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/org/OrganizationDO.java
  17. 38 7
      common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java
  18. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDefaultModuleDO.java
  19. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasModuleDO.java
  20. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/BaseSmsDO.java
  21. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/SmsGatewayDO.java
  22. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/SmsTemplateDO.java
  23. 1 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/system/SystemDictDO.java
  24. 1 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/system/SystemDictEntryDO.java
  25. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/theme/ThemeDO.java
  26. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/BaseMenuDO.java
  27. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/BaseRoleMenuDO.java
  28. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/EmployDO.java
  29. 3 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/EmployHideModuleFunctionDO.java
  30. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/EmployRoleDO.java
  31. 2 3
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/RoleDO.java
  32. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/user/RoleModuleFunctionDO.java
  33. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/version/BaseUserVersionDO.java
  34. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/version/WlyyVersionDO.java
  35. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxAccessTokenDO.java
  36. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxGraphicMessageDO.java
  37. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxMenuDO.java
  38. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxTemplateDO.java
  39. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxWechatDO.java
  40. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/AccountDO.java
  41. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActiveRecordDO.java
  42. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java
  43. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/CreditsDetailDO.java
  44. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ExchangeGoodsDO.java
  45. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/GoodsDO.java
  46. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDO.java
  47. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDictDO.java
  48. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskGoodsDO.java
  49. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskPatientDetailDO.java
  50. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskRangDO.java
  51. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskRuleDO.java
  52. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyCertificateChangeRecordDO.java
  53. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyCertificateDO.java
  54. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyDO.java
  55. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyTypeDO.java
  56. 2 2
      common/common-entity/src/main/java/com/yihu/jw/iot/datainput/DataProcessLogDO.java
  57. 2 2
      common/common-entity/src/main/java/com/yihu/jw/iot/datainput/DataStandardDO.java
  58. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceDO.java
  59. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceImportRecordDO.java
  60. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceOrderDO.java
  61. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceQualityInspectionPlanDO.java
  62. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotOrderPurchaseDO.java
  63. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotPatientDeviceDO.java
  64. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/device/IotQualityRecordDO.java
  65. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/dict/IotDeviceDictDO.java
  66. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/dict/IotSystemDictDO.java
  67. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/label/IotDeviceLabelDO.java
  68. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/label/IotDeviceLabelInfoDO.java
  69. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductAttachmentDO.java
  70. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductBaseInfoDO.java
  71. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductDataTransmissionDO.java
  72. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductExtendInfoDO.java
  73. 3 3
      common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductMeasuredDataDO.java
  74. 3 3
      common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationInformationDO.java
  75. 3 3
      common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationPerformanceDO.java
  76. 3 3
      common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationPlanningDO.java
  77. 3 3
      common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationTreatmentProgramDO.java
  78. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/specialist/PatientHospitalRecordDO.java
  79. 2 2
      common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistPatientRelationDO.java
  80. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementDO.java
  81. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiDO.java
  82. 1 1
      common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiLogDO.java
  83. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyySignFamilyDO.java
  84. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgDO.java
  85. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgDeptDO.java
  86. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgHospitalDO.java
  87. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientExtendDO.java
  88. 1 1
      common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientWechatDO.java
  89. 2 2
      common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/WlyyAdvertisementDO.java
  90. 0 2
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/SaasFeign.java
  91. 0 8
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/login/LoginFeign.java
  92. 0 6
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/sms/RegisterSmsFeign.java
  93. 0 2
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/user/BaseRoleFeign.java
  94. 0 3
      common/common-fegin/src/main/java/com/yihu/jw/fegin/base/user/EmployFeign.java
  95. 0 2
      common/common-fegin/src/main/java/com/yihu/jw/fegin/common/security/LoginSmsFeign.java
  96. 0 5
      common/common-fegin/src/main/java/com/yihu/jw/fegin/iot/data_input/DataSearchFeign.java
  97. 32 1
      common/common-request-mapping/pom.xml
  98. 50 0
      common/common-web/pom.xml
  99. 162 0
      common/common-web/src/main/java/com/yihu/jw/web/endpoint/EnvelopRestEndpoint.java
  100. 0 0
      common/common-web/src/main/java/com/yihu/jw/web/exception/ApiException.java

+ 30 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/AssignedIdentityEntity.java

@ -0,0 +1,30 @@
package com.yihu.jw.entity;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by progr1mmer on 2018/8/13.
 */
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class AssignedIdentityEntity implements Serializable {
    protected String id;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "id", unique = true, nullable = false)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
}

+ 92 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/AssignedIdentityEntityWithOperator.java

@ -0,0 +1,92 @@
package com.yihu.jw.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.util.Date;
/**
 * Created by progr1mmer on 2018/8/13.
 */
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class AssignedIdentityEntityWithOperator extends AssignedIdentityEntity {
    protected Date createTime;
    protected String createUser;
    protected String createUserName;
    protected Date updateTime;
    protected String updateUser;
    protected String updateUserName;
    @CreatedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", nullable = false, length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @CreatedBy
    @Column(name = "create_user",updatable = false)
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @CreatedBy
    @Column(name = "create_user_name",updatable = false)
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @LastModifiedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time", nullable = false, length = 0)
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @LastModifiedBy
    @Column(name = "update_user")
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @LastModifiedBy
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
}

+ 30 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@ -0,0 +1,30 @@
package com.yihu.jw.entity;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by progr1mmer on 2018/8/13.
 */
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IntegerIdentityEntity implements Serializable {
    protected Integer id;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
}

+ 92 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntityWithOperator.java

@ -0,0 +1,92 @@
package com.yihu.jw.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.util.Date;
/**
 * Created by progr1mmer on 2018/8/13.
 */
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IntegerIdentityEntityWithOperator extends IntegerIdentityEntity {
    protected Date createTime;
    protected String createUser;
    protected String createUserName;
    protected Date updateTime;
    protected String updateUser;
    protected String updateUserName;
    @CreatedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", nullable = false, length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @CreatedBy
    @Column(name = "create_user",updatable = false)
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @CreatedBy
    @Column(name = "create_user_name",updatable = false)
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @LastModifiedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time", nullable = false, length = 0)
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @LastModifiedBy
    @Column(name = "update_user")
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @LastModifiedBy
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
}

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

@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw;
package com.yihu.jw.entity;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

+ 102 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/UuidIdentityEntityWithOperator.java

@ -0,0 +1,102 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.entity;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.util.Date;
/**
 * 统一定义id的entity基类.
 * 主键生成策略是UUID
 * 还包含业务表用的 创建人,创建时间 创建人名  修改人,修改时间 修改人名
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class UuidIdentityEntityWithOperator extends UuidIdentityEntity {
    //创建时间
	protected Date createTime;
	//创建者
	protected String createUser;
	protected String createUserName;
	//更新时间
	protected Date updateTime;
	//更新者
	protected String updateUser;
	protected String updateUserName;
	@CreatedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
	public Date getCreateTime() {
		return createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@CreatedBy
	@Column(name = "create_user",updatable = false)
	public String getCreateUser() {
		return createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	@CreatedBy
	@Column(name = "create_user_name",updatable = false)
	public String getCreateUserName() {
		return createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	@LastModifiedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "update_time", nullable = false, length = 0)
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	@LastModifiedBy
	@Column(name = "update_user")
	public String getUpdateUser() {
		return updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	@LastModifiedBy
	@Column(name = "update_user_name")
	public String getUpdateUserName() {
		return updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
}

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

@ -1,6 +1,6 @@
package com.yihu.jw.entity.archives;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_patient_archives")
public class PatientArchivesDO extends UuidIdentityEntityWithOperation implements Serializable {
public class PatientArchivesDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasid
    @Column(name = "patient_code")

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

@ -1,6 +1,6 @@
package com.yihu.jw.entity.archives;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_patient_archives_info")
public class PatientArchivesInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
public class PatientArchivesInfoDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasid

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/function/FunctionDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.function;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -15,7 +15,7 @@ import java.util.List;
 */
@Entity
@Table(name = "base_function")
public class FunctionDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class FunctionDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
    // Fields

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/login/BaseLoginAccountDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.login;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/login/BaseLoginLogDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.login;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.*;
import java.util.Date;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/message/Message.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/message/MessageSubscriberDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/module/ModuleDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.module;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.List;
 */
@Entity
@Table(name = "base_module")
public class ModuleDO extends UuidIdentityEntityWithOperation {
public class ModuleDO extends UuidIdentityEntityWithOperator {
    public enum Status {
        delete,

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/module/ModuleFunctionDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.module;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.*;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/org/OrganizationDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.org;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 38 - 7
common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.saas;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -10,11 +10,10 @@ import javax.persistence.Table;
/**
 * WlyySaas entity. @author MyEclipse Persistence Tools
 *
 *
 */
@Entity
@Table(name = "base_saas")
public class SaasDO extends UuidIdentityEntityWithOperation {
public class SaasDO extends UuidIdentityEntityWithOperator {
    public enum Status {
        delete,
@ -32,6 +31,7 @@ public class SaasDO extends UuidIdentityEntityWithOperation {
        hybrid
    }
    private String orgCode; //机构编码
	private String name; //系统名称
	private Status status; //状态 0 已删除 1待审核 2审核通过 3审核不通过
	private String remark; //备注
@ -39,13 +39,16 @@ public class SaasDO extends UuidIdentityEntityWithOperation {
    private Integer theme; //主题ID
    private Type type; //类型
	@Column(name = "org_code", nullable = false)
	public String getOrgCode() {
		return orgCode;
	}
    // Constructors
	/** default constructor */
	public SaasDO() {
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
	@Column(name = "name", length = 200)
	@Column(name = "name", nullable = false, length = 200)
	public String getName() {
		return this.name;
	}
@ -54,6 +57,7 @@ public class SaasDO extends UuidIdentityEntityWithOperation {
		this.name = name;
	}
	@Column(name = "status", nullable = false)
    public Status getStatus() {
        return status;
    }
@ -70,4 +74,31 @@ public class SaasDO extends UuidIdentityEntityWithOperation {
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "logo")
	public String getLogo() {
		return logo;
	}
	public void setLogo(String logo) {
		this.logo = logo;
	}
	@Column(name = "theme")
	public Integer getTheme() {
		return theme;
	}
	public void setTheme(Integer theme) {
		this.theme = theme;
	}
	@Column(name = "type", nullable = false)
	public Type getType() {
		return type;
	}
	public void setType(Type type) {
		this.type = type;
	}
}

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDefaultModuleDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.saas;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasModuleDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.saas;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.*;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/BaseSmsDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.sms;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.*;
import java.sql.Timestamp;
@ -13,7 +13,7 @@ import java.util.Date;
@Entity
@Table(name = "base_sms")
@Deprecated
public class BaseSmsDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class BaseSmsDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	// Fields

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/SmsGatewayDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.sms;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/SmsTemplateDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.sms;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 1 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/system/SystemDictDO.java

@ -1,8 +1,7 @@
package com.yihu.jw.entity.base.system;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 1 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/system/SystemDictEntryDO.java

@ -1,8 +1,7 @@
package com.yihu.jw.entity.base.system;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/theme/ThemeDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.theme;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
@ -10,7 +10,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_theme")
public class ThemeDO extends UuidIdentityEntityWithOperation {
public class ThemeDO extends UuidIdentityEntityWithOperator {
    private String backgroundColor; //主体背景颜色
    private String fontColor; //主体字体颜色

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/BaseMenuDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import java.sql.Timestamp;
import javax.persistence.Column;
@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_menu")
public class BaseMenuDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class BaseMenuDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	private String saasId;
	private String parentId; //父级ID

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/BaseRoleMenuDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/EmployDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -11,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_employ")
public class EmployDO extends UuidIdentityEntityWithOperation {
public class EmployDO extends UuidIdentityEntityWithOperator {
	// Fields
	private String saasId; //saasIDF

+ 3 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/EmployHideModuleFunctionDO.java

@ -1,5 +1,7 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
@ -8,7 +10,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_employ_hide_module_function")
public class EmployHideModuleFunctionDO {
public class EmployHideModuleFunctionDO extends UuidIdentityEntity {
    //用户ID
    private String employId;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/EmployRoleDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

+ 2 - 3
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/RoleDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import java.sql.Timestamp;
import javax.persistence.Column;
@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_role")
public class RoleDO extends UuidIdentityEntityWithOperation {
public class RoleDO extends UuidIdentityEntityWithOperator {
	//saas id
	private String saasId;
@ -23,7 +23,6 @@ public class RoleDO extends UuidIdentityEntityWithOperation {
	//备注
	private String remark;
	// Constructors
	/** default constructor */
	public RoleDO() {

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/user/RoleModuleFunctionDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/version/BaseUserVersionDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.version;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/version/WlyyVersionDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.version;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -11,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_version")
public class WlyyVersionDO  extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class WlyyVersionDO  extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	// Fields

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxAccessTokenDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.*;
import java.util.Date;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxGraphicMessageDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_graphic_message")
public class WxGraphicMessageDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class WxGraphicMessageDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
    private String saasId;
    private String title;//标题

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxMenuDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -15,7 +15,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wx_menu")
public class WxMenuDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class WxMenuDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
    private String wechatId;//关联的微信code 关联表 Wx_Wechat
    private String supMenuid;//父菜单id 如果是一级菜单 此字段为空

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxTemplateDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -12,7 +12,7 @@ import javax.persistence.Transient;
 */
@Entity
@Table(name = "wx_template")
public class WxTemplateDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class WxTemplateDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
    // Fields
    private String title;//模板标题

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxWechatDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.util.Map;
 */
@Entity
@Table(name = "wx_wechat")
public class WxWechatDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class WxWechatDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
    // Fields
    private String saasId;//'saas配置id'

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/AccountDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_health_bank_account")
public class AccountDO extends UuidIdentityEntityWithOperation implements Serializable {
public class AccountDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasId

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActiveRecordDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_health_bank_activity")
public class ActivityDO extends UuidIdentityEntityWithOperation implements Serializable {
public class ActivityDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//saasId

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/CreditsDetailDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_health_bank_credits_detail")
public class CreditsDetailDO extends UuidIdentityEntityWithOperation implements Serializable{
public class CreditsDetailDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ExchangeGoodsDO.java

@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/5/3.
 */
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -17,7 +17,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_exchange_goods")
public class ExchangeGoodsDO extends UuidIdentityEntityWithOperation implements Serializable {
public class ExchangeGoodsDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//saasid

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/GoodsDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_health_bank_goods")
public class GoodsDO extends UuidIdentityEntityWithOperation implements Serializable{
public class GoodsDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId;//saasid

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_health_bank_task")
public class TaskDO extends UuidIdentityEntityWithOperation implements Serializable{
public class TaskDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDictDO.java

@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/6/8.
 */
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_task_dict" )
public class TaskDictDO extends UuidIdentityEntityWithOperation implements Serializable {
public class TaskDictDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private  String saasId;//环境id

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskGoodsDO.java

@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/6/8.
 */
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_task_goods")
public class TaskGoodsDO extends UuidIdentityEntityWithOperation implements Serializable {
public class TaskGoodsDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//环境id

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskPatientDetailDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_health_bank_task_patient_detail")
public class TaskPatientDetailDO extends UuidIdentityEntityWithOperation implements Serializable{
public class TaskPatientDetailDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskRangDO.java

@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/6/8.
 */
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_task_rang")
public class TaskRangDO extends UuidIdentityEntityWithOperation implements Serializable {
public class TaskRangDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//环境id

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskRuleDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -12,7 +12,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_health_bank_task_rule")
public class TaskRuleDO extends UuidIdentityEntityWithOperation implements Serializable{
public class TaskRuleDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyCertificateChangeRecordDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.company;
package com.yihu.jw.entity.iot.company;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_company_certificate_change_record")
public class IotCompanyCertificateChangeRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotCompanyCertificateChangeRecordDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyCertificateDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.iot.company;
package com.yihu.jw.entity.iot.company;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_company_certificate")
public class IotCompanyCertificateDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotCompanyCertificateDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.company;
package com.yihu.jw.entity.iot.company;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.util.List;
 */
@Entity
@Table(name = "iot_company")
public class IotCompanyDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotCompanyDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyTypeDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.company;
package com.yihu.jw.entity.iot.company;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_company_type")
public class IotCompanyTypeDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotCompanyTypeDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/iot/datainput/DataProcessLogDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.datainput;
package com.yihu.jw.entity.iot.datainput;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/iot/datainput/DataStandardDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.datainput;
package com.yihu.jw.entity.iot.datainput;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_device")
public class IotDeviceDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotDeviceDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceImportRecordDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_import_record")
public class IotDeviceImportRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotDeviceImportRecordDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceOrderDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_device_order")
public class IotDeviceOrderDO extends UuidIdentityEntityWithOperation implements Serializable{
public class IotDeviceOrderDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceQualityInspectionPlanDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_device_quality_inspection_plan")
public class IotDeviceQualityInspectionPlanDO extends UuidIdentityEntityWithOperation implements Serializable{
public class IotDeviceQualityInspectionPlanDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotOrderPurchaseDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_order_purchase")
public class IotOrderPurchaseDO extends UuidIdentityEntityWithOperation implements Serializable{
public class IotOrderPurchaseDO extends UuidIdentityEntityWithOperator implements Serializable{
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotPatientDeviceDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_patient_device")
public class IotPatientDeviceDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotPatientDeviceDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/device/IotQualityRecordDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_quality_record")
public class IotQualityRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotQualityRecordDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/dict/IotDeviceDictDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.iot.dict;
package com.yihu.jw.entity.iot.dict;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_dict")
public class IotDeviceDictDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotDeviceDictDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/dict/IotSystemDictDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.dict;
package com.yihu.jw.entity.iot.dict;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_system_dict")
public class IotSystemDictDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotSystemDictDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/label/IotDeviceLabelDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.label;
package com.yihu.jw.entity.iot.label;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_label")
public class IotDeviceLabelDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotDeviceLabelDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/label/IotDeviceLabelInfoDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.label;
package com.yihu.jw.entity.iot.label;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_label_info")
public class IotDeviceLabelInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotDeviceLabelInfoDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductAttachmentDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
package com.yihu.jw.entity.iot.product;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_attachment")
public class IotProductAttachmentDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotProductAttachmentDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductBaseInfoDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
package com.yihu.jw.entity.iot.product;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_product_base_info")
public class IotProductBaseInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotProductBaseInfoDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductDataTransmissionDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
package com.yihu.jw.entity.iot.product;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_data_transmission")
public class IotProductDataTransmissionDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotProductDataTransmissionDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductExtendInfoDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
package com.yihu.jw.entity.iot.product;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_extend_info")
public class IotProductExtendInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotProductExtendInfoDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductMeasuredDataDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
package com.yihu.jw.entity.iot.product;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_measured_data")
public class IotProductMeasuredDataDO extends UuidIdentityEntityWithOperation implements Serializable {
public class IotProductMeasuredDataDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationInformationDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.rehabilitation;
package com.yihu.jw.entity.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "rehabilitation_information")
public class RehabilitationInformationDO extends UuidIdentityEntityWithOperation implements Serializable {
public class RehabilitationInformationDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationPerformanceDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.rehabilitation;
package com.yihu.jw.entity.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -14,7 +14,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "rehabilitation_performance")
public class RehabilitationPerformanceDO extends UuidIdentityEntityWithOperation implements Serializable {
public class RehabilitationPerformanceDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationPlanningDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.rehabilitation;
package com.yihu.jw.entity.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "rehabilitation_planning")
public class RehabilitationPlanningDO extends UuidIdentityEntityWithOperation implements Serializable {
public class RehabilitationPlanningDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationTreatmentProgramDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.rehabilitation;
package com.yihu.jw.entity.rehabilitation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "rehabilitation_treatment_program")
public class RehabilitationTreatmentProgramDO extends UuidIdentityEntityWithOperation implements Serializable {
public class RehabilitationTreatmentProgramDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/specialist/PatientHospitalRecordDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.specialist;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -12,7 +12,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_patient_hospital_record")
public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//
    @Column(name = "third_code")

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistPatientRelationDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.entity.specialist;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_specialist_patient_relation")
public class SpecialistPatientRelationDO extends UuidIdentityEntityWithOperation implements Serializable {
public class SpecialistPatientRelationDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementDO.java

@ -3,7 +3,7 @@ package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -16,7 +16,7 @@ import java.math.BigDecimal;
 */
@Entity
@Table(name = "wlyy_agreement")
public class WlyyAgreementDO extends UuidIdentityEntityWithOperation implements Serializable{
public class WlyyAgreementDO extends UuidIdentityEntityWithOperator implements Serializable{
    private static final long serialVersionUID = -4343130835307199266L;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiDO.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_agreement_kpi")
public class WlyyAgreementKpiDO extends UuidIdentityEntityWithOperation {
public class WlyyAgreementKpiDO extends UuidIdentityEntityWithOperator {
    private String saasId;//saasId
    private String agreementCode;//套餐代码
    private String kpiName;//服务项名称

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiLogDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyySignFamilyDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_sign_family")
public class WlyySignFamilyDO extends UuidIdentityEntityWithOperation {
public class WlyySignFamilyDO extends UuidIdentityEntityWithOperator {
    private static final long serialVersionUID = -6759565631854462880L;
    private String saasId;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.hospital;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import java.sql.Timestamp;
import javax.persistence.Column;
@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org")
public class BaseOrgDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class BaseOrgDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	// Fields

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgDeptDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.hospital;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -11,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org_dept")
public class BaseOrgDeptDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class BaseOrgDeptDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	// Fields
	private String orgId;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/hospital/BaseOrgHospitalDO.java

@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.hospital;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org_hospital")
public class BaseOrgHospitalDO extends UuidIdentityEntityWithOperation {
public class BaseOrgHospitalDO extends UuidIdentityEntityWithOperator {
    private static final long serialVersionUID = 5463913446686402252L;
    private String orgId;//

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientExtendDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.patient;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import java.util.Date;
import javax.persistence.Column;
@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_patient_extend")
public class BasePatientExtendDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
public class BasePatientExtendDO extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	// Fields

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientWechatDO.java

@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.patient;// default package
import com.yihu.jw.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import java.util.Date;
import javax.persistence.Column;

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/WlyyAdvertisementDO.java

@ -1,7 +1,7 @@
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_advertisement")
public class WlyyAdvertisementDO extends UuidIdentityEntityWithOperation implements Serializable {
public class WlyyAdvertisementDO extends UuidIdentityEntityWithOperator implements Serializable {
    private static final long serialVersionUID = 1497635003375865515L;
    private String saasId;//0,为默认广告

+ 0 - 2
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/base/SaasFeign.java

@ -4,8 +4,6 @@ import com.yihu.jw.fegin.fallbackfactory.base.base.SaasFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;

+ 0 - 8
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/login/LoginFeign.java

@ -1,24 +1,16 @@
package com.yihu.jw.fegin.base.login;
import com.yihu.jw.fegin.fallbackfactory.base.base.FunctionFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.base.LoginFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.base.BaseEnvelop;
import com.yihu.jw.rm.base.BaseLoginRequestMapping;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.base.BaseUserRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
 * Created by 刘文彬 on 2018/4/20.
 */

+ 0 - 6
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/sms/RegisterSmsFeign.java

@ -1,21 +1,15 @@
package com.yihu.jw.fegin.base.sms;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.base.BaseEnvelop;
import com.yihu.jw.rm.base.BaseLoginRequestMapping;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**

+ 0 - 2
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/user/BaseRoleFeign.java

@ -5,8 +5,6 @@ import com.yihu.jw.fegin.fallbackfactory.base.user.BaseRoleFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseUserRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;

+ 0 - 3
common/common-fegin/src/main/java/com/yihu/jw/fegin/base/user/EmployFeign.java

@ -4,10 +4,7 @@ import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.fegin.fallbackfactory.base.user.EmployeeFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.base.BaseUserRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;

+ 0 - 2
common/common-fegin/src/main/java/com/yihu/jw/fegin/common/security/LoginSmsFeign.java

@ -1,13 +1,11 @@
package com.yihu.jw.fegin.common.security;
import com.yihu.jw.fegin.fallbackfactory.base.base.SaasFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.rm.base.BaseLoginRequestMapping;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.ServletWebRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

+ 0 - 5
common/common-fegin/src/main/java/com/yihu/jw/fegin/iot/data_input/DataSearchFeign.java

@ -1,19 +1,14 @@
package com.yihu.jw.fegin.iot.data_input;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.fegin.fallbackfactory.iot.data_input.DataSearchFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(
        name = CommonContants.svr_iot // name值是eurika的实例名字

+ 32 - 1
common/common-request-mapping/pom.xml

@ -14,7 +14,38 @@
    <artifactId>common-request-mapping</artifactId>
    <version>${parent.version}</version>
    <dependencies>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-webmvc</artifactId>
        </dependency>
        <dependency>
            <groupId>io.github.openfeign</groupId>
            <artifactId>feign-core</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-annotations</artifactId>
        </dependency>
    </dependencies>
</project>

+ 50 - 0
common/common-web/pom.xml

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>wlyy-parent-pom</artifactId>
        <groupId>com.yihu.jw</groupId>
        <version>2.0.0</version>
        <relativePath>../../wlyy-parent-pom/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>common-web</artifactId>
    <dependencies>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-webmvc</artifactId>
        </dependency>
        <dependency>
            <groupId>io.github.openfeign</groupId>
            <artifactId>feign-core</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-annotations</artifactId>
        </dependency>
    </dependencies>
</project>

+ 162 - 0
common/common-web/src/main/java/com/yihu/jw/web/endpoint/EnvelopRestEndpoint.java

@ -0,0 +1,162 @@
package com.yihu.jw.web.endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.web.model.BaseEnvelop;
import com.yihu.jw.web.model.ListEnvelop;
import com.yihu.jw.web.model.MultiEnvelop;
import com.yihu.jw.web.model.ObjEnvelop;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.*;
/**
 * Created by progr1mmer on 2018/8/15.
 */
public abstract class EnvelopRestEndpoint {
    @Autowired
    protected ObjectMapper objectMapper;
    protected BaseEnvelop success(String message) {
        return success(message, 200);
    }
    protected BaseEnvelop success(String message, int status) {
        BaseEnvelop baseEnvelop = new BaseEnvelop();
        baseEnvelop.setMessage(message);
        baseEnvelop.setStatus(status);
        return baseEnvelop;
    }
    protected <J> ObjEnvelop<J> success(J obj){
        return success(obj, "success", 200);
    }
    protected <J> ObjEnvelop<J> success(J obj, String message){
        return success(obj, message, 200);
    }
    protected <J> ObjEnvelop<J> success(J obj, String message, Integer status){
        ObjEnvelop<J> objEnvelop = new ObjEnvelop<>();
        objEnvelop.setMessage(message);
        objEnvelop.setStatus(status);
        objEnvelop.setObj(obj);
        return objEnvelop;
    }
    protected <T> ListEnvelop<T> success(List<T> detailModelList){
        return success(detailModelList, "message", 200);
    }
    protected <T> ListEnvelop<T> success(List<T> detailModelList, String message){
        return success(detailModelList, message, 200);
    }
    protected <T> ListEnvelop<T> success(List<T> detailModelList, String message, Integer status){
        ListEnvelop<T> listEnvelop = new ListEnvelop<>();
        listEnvelop.setMessage(message);
        listEnvelop.setStatus(status);
        listEnvelop.setDetailModelList(detailModelList);
        return listEnvelop;
    }
    protected <T> MultiEnvelop success(List<T> detailModelList, int totalCount, int currPage, int rows) {
        return success(detailModelList, "success", 200, totalCount, currPage, rows);
    }
    protected <T> MultiEnvelop success(List<T> detailModelList, String message, int totalCount, int currPage, int rows) {
        return success(detailModelList, message, 200, totalCount, currPage, rows);
    }
    protected <T> MultiEnvelop success(List<T> detailModelList, String message, int status, int totalCount, int currPage, int rows) {
        return success(detailModelList, null, message, status, totalCount, currPage, rows);
    }
    protected <T, J> MultiEnvelop success(List<T> detailModelList, J obj, String message, int status, int totalCount, int currPage, int rows) {
        MultiEnvelop multiEnvelop = new MultiEnvelop();
        multiEnvelop.setMessage(message);
        multiEnvelop.setStatus(status);
        multiEnvelop.setDetailModelList(detailModelList);
        multiEnvelop.setObj(obj);
        multiEnvelop.setTotalCount(totalCount);
        multiEnvelop.setCurrPage(currPage);
        multiEnvelop.setPageSize(rows);
        if (totalCount % rows > 0) {
            multiEnvelop.setTotalPage((totalCount / rows) + 1);
        } else {
            multiEnvelop.setTotalPage(totalCount / rows);
        }
        return multiEnvelop;
    }
    public <T> T toEntity(String json, Class<T> target) throws IOException {
        T entity = objectMapper.readValue(json, target);
        return entity;
    }
    public <T> T convertToModel(Object source, Class<T> target, String... properties) {
        if (source == null) {
            return null;
        }
        T _target = BeanUtils.instantiate(target);
        BeanUtils.copyProperties(source, _target, propertyDiffer(properties, target));
        return _target;
    }
    public <T> List<T> convertToModels(Collection sources, List<T> targets, Class<T> target){
        if (null == sources) {
            return null;
        }
        sources.forEach(item -> {
            T _target = BeanUtils.instantiate(target);
            BeanUtils.copyProperties(item, _target);
            targets.add(_target);
        });
        return targets;
    }
    public <T> List<T> convertToModels(Collection sources, List<T> targets, Class<T> target, String properties) {
        if (null == sources) {
            return null;
        }
        sources.forEach(item -> {
            T _target = BeanUtils.instantiate(target);
            BeanUtils.copyProperties(item, _target, propertyDiffer(StringUtils.isEmpty(properties) ? null : properties.split(","), target));
            targets.add(_target);
        });
        return targets;
    }
    protected String[] propertyDiffer(String[] properties, Class target) {
        if (properties == null || properties.length == 0) {
            return null;
        }
        PropertyDescriptor[] targetPds = BeanUtils.getPropertyDescriptors(target);
        List<String> propertiesList = Arrays.asList(properties);
        List<String> arrayList = new ArrayList<>();
        for (PropertyDescriptor targetPd : targetPds) {
            Method writeMethod = targetPd.getWriteMethod();
            if (writeMethod != null && !propertiesList.contains(targetPd.getName())) {
                arrayList.add(targetPd.getName());
            }
        }
        return arrayList.toArray(new String[arrayList.size()]);
    }
    protected String randomString(int length) {
        String str = "abcdefghigklmnopkrstuvwxyzABCDEFGHIGKLMNOPQRSTUVWXYZ0123456789";
        StringBuffer buffer = new StringBuffer();
        Random random = new Random();
        for (int i = 0; i < length; i++) {
            int number = random.nextInt(str.length());//0~61
            buffer.append(str.charAt(number));
        }
        return buffer.toString();
    }
}

+ 0 - 0
common/common-web/src/main/java/com/yihu/jw/web/exception/ApiException.java


Some files were not shown because too many files changed in this diff