Merge branch 'dev' of humingfen/wlyy2.0 into dev

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

@@ -7,6 +7,7 @@ package com.yihu.jw.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
@@ -14,6 +15,7 @@ import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.util.Date;
@@ -73,6 +75,7 @@ public abstract class UuidIdentityEntityWithOperator extends UuidIdentityEntity
	}
	@Column(name = "create_user_name",updatable = false)
	@Convert(converter = StringFStringEncryptConverter.class)
	public String getCreateUserName() {
		return createUserName;
	}
@@ -101,6 +104,7 @@ public abstract class UuidIdentityEntityWithOperator extends UuidIdentityEntity
	}
	@Column(name = "update_user_name")
	@Convert(converter = StringFStringEncryptConverter.class)
	public String getUpdateUserName() {
		return updateUserName;
	}

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

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.specialist;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -109,6 +111,7 @@ public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperator impl
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -215,7 +218,7 @@ public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperator impl
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }

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

@@ -3,8 +3,10 @@ package com.yihu.jw.entity.specialist;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -27,6 +29,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
    private String doctor;//专科医生
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    private String doctorName;//专科医生姓名
    @Column(name = "patient")
@@ -57,12 +60,14 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
    private String signDoctor;//签约医生
    @Column(name = "sign_doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    private String signDoctorName;//签约医生
    @Column(name = "health_doctor")
    private String healthDoctor;//健康管理师
    @Column(name = "health_doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    private String healthDoctorName;//健康管理师姓名
    @Column(name = "sign_year")
@@ -138,6 +143,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -170,6 +176,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.signDoctor = signDoctor;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getSignDoctorName() {
        return signDoctorName;
    }
@@ -186,6 +193,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.healthDoctor = healthDoctor;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getHealthDoctorName() {
        return healthDoctorName;
    }
@@ -226,6 +234,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.healthAssistant = healthAssistant;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getHealthAssistantName() {
        return healthAssistantName;
    }
@@ -323,6 +332,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -348,6 +358,7 @@ public class SpecialistPatientRelationDO extends UuidIdentityEntity implements S
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/GuidanceMessageLogDO.java

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.specialist.rehabilitation;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -35,6 +37,7 @@ public class GuidanceMessageLogDO extends UuidIdentityEntityWithOperator impleme
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientDiagnosisInformationDO.java

@@ -2,10 +2,12 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -75,6 +77,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -115,6 +118,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.attendingDoctorCode = attendingDoctorCode;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getAttendingDoctorName() {
        return attendingDoctorName;
    }
@@ -171,6 +175,7 @@ public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

@@ -3,8 +3,10 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -115,6 +117,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
    }
    @Column(name = "name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getName() {
        return name;
    }
@@ -238,6 +241,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -263,6 +267,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanLogDO.java

@@ -2,7 +2,9 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -36,6 +38,7 @@ public class PatientRehabilitationPlanLogDO extends UuidIdentityEntity implement
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailAppointmentDO.java

@@ -2,8 +2,10 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -36,6 +38,7 @@ public class RehabilitationDetailAppointmentDO extends UuidIdentityEntity implem
    }
    @Column(name = "appointment_doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getAppointmentDoctorName() {
        return appointmentDoctorName;
    }
@@ -81,6 +84,7 @@ public class RehabilitationDetailAppointmentDO extends UuidIdentityEntity implem
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailDO.java

@@ -4,8 +4,10 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -152,6 +154,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -231,6 +234,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -256,6 +260,8 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationOperateRecordsDO.java

@@ -3,8 +3,10 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -66,6 +68,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
    }
    @Column(name = "patient_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -84,6 +87,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
    }
    @Column(name = "doctor_name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getDoctorName() {
        return doctorName;
    }
@@ -190,6 +194,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
        this.createUser = createUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return createUserName;
    }
@@ -215,6 +220,7 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntity implement
        this.updateUser = updateUser;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return updateUserName;
    }

svr/svr-wlyy-specialist/src/main/resources/application.yml

@@ -104,6 +104,8 @@ im:
  #im_list_get: http://192.168.131.24:3000/
  data_base_name: ichat
encrypt:
  key: jkzl2021ZJXL*#%a
---
spring:
  profiles: jwtest
@@ -140,6 +142,8 @@ im:
  im_list_get: http://172.26.0.118:3000/
  data_base_name: im_new
encrypt:
  key: jkzl2021ZJXL*#%a
---
spring:
  profiles: iotyanshi
@@ -176,6 +180,8 @@ im:
  im_list_get: http://172.26.0.191:3000/
  data_base_name: im_new
encrypt:
  key: jkzl2021ZJXL*#%a
---
spring:
  profiles: jwdevtest
@@ -211,6 +217,9 @@ wechat:
im:
  im_list_get: http://172.26.0.118:3000/
  data_base_name: im_new
encrypt:
  key: jkzl2021ZJXL*#%a
---
spring:
  profiles: prod
@@ -246,3 +255,6 @@ wechat:
im:
  im_list_get: http://27.155.101.77:3000/
  data_base_name: im
encrypt:
  key: jkzl2021ZJXL*#%a