Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.device;
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;
@@ -161,6 +163,7 @@ public class IotDeviceOrderDO extends UuidIdentityEntityWithOperator implements
        this.purchaseUnitName = purchaseUnitName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPurchaserName() {
        return purchaserName;
    }
@@ -169,6 +172,7 @@ public class IotDeviceOrderDO extends UuidIdentityEntityWithOperator implements
        this.purchaserName = purchaserName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPurchaserPhone() {
        return purchaserPhone;
    }
@@ -193,6 +197,7 @@ public class IotDeviceOrderDO extends UuidIdentityEntityWithOperator implements
        this.supplierName = supplierName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getSupplierLeader() {
        return supplierLeader;
    }
@@ -201,6 +206,7 @@ public class IotDeviceOrderDO extends UuidIdentityEntityWithOperator implements
        this.supplierLeader = supplierLeader;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getSupplierLeaderPhone() {
        return supplierLeaderPhone;
    }

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

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.device;
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;
@@ -196,6 +198,7 @@ public class IotDeviceQualityInspectionPlanDO extends UuidIdentityEntityWithOper
        this.purchaseNum = purchaseNum;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getQualityLeader() {
        return qualityLeader;
    }
@@ -204,6 +207,7 @@ public class IotDeviceQualityInspectionPlanDO extends UuidIdentityEntityWithOper
        this.qualityLeader = qualityLeader;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getQualityLeaderPhone() {
        return qualityLeaderPhone;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/device/IotDeviceSimDO.java

@@ -1,11 +1,9 @@
package com.yihu.jw.entity.iot.device;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@@ -100,6 +98,7 @@ public class IotDeviceSimDO extends UuidIdentityEntityWithOperator implements Se
        this.status = status;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getContactsName() {
        return contactsName;
    }
@@ -108,6 +107,7 @@ public class IotDeviceSimDO extends UuidIdentityEntityWithOperator implements Se
        this.contactsName = contactsName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getContactsMobile() {
        return contactsMobile;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/device/IotDeviceTransfersDO.java

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.device;
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;
@@ -107,6 +109,7 @@ public class IotDeviceTransfersDO extends UuidIdentityEntity implements Serializ
        this.num = num;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getContactsName() {
        return contactsName;
    }
@@ -115,6 +118,7 @@ public class IotDeviceTransfersDO extends UuidIdentityEntity implements Serializ
        this.contactsName = contactsName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getContactsMobile() {
        return contactsMobile;
    }

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

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.device;
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;
@@ -182,6 +184,7 @@ public class IotOrderPurchaseDO extends UuidIdentityEntityWithOperator implement
        this.qualityStatus = qualityStatus;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getQualityLeader() {
        return qualityLeader;
    }

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

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.device;
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;
@@ -77,6 +79,7 @@ public class IotPatientDeviceDO extends UuidIdentityEntityWithOperator implement
        this.patient = patient;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPatientName() {
        return patientName;
    }
@@ -85,6 +88,7 @@ public class IotPatientDeviceDO extends UuidIdentityEntityWithOperator implement
        this.patientName = patientName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getIdcard() {
        return idcard;
    }
@@ -165,6 +169,7 @@ public class IotPatientDeviceDO extends UuidIdentityEntityWithOperator implement
        this.sim = sim;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getMobile() {
        return mobile;
    }

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

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.device;
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;
@@ -77,6 +79,7 @@ public class IotQualityRecordDO extends UuidIdentityEntityWithOperator implement
        this.purchaseNum = purchaseNum;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getQualityLeader() {
        return qualityLeader;
    }
@@ -85,6 +88,7 @@ public class IotQualityRecordDO extends UuidIdentityEntityWithOperator implement
        this.qualityLeader = qualityLeader;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getQualityLeaderPhone() {
        return qualityLeaderPhone;
    }

svr/svr-wlyy-health-bank/src/main/resources/application.yml

@@ -154,8 +154,8 @@ spring:
  datasource:
    url: jdbc:mysql://59.61.92.90:9069/wlyy_health_bank?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy
    password: jkzlehr@123
    username: wlyy_new
    password: J4&y9sk#1G
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9054  # Redis server port.

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

@@ -216,8 +216,8 @@ spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://59.61.92.90:9069/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy
    password: jkzlehr@123
    username: wlyy_new
    password: J4&y9sk#1G
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9054 # Redis server port.