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

business/push-service/src/main/java/com/yihu/jw/push/service/GetuiService.java

@@ -134,6 +134,7 @@ public class GetuiService {
        ApiHelper apiHelper = ApiHelper.build(apiConfiguration);
        // 创建对象，建议复用。目前有PushApi、StatisticApi、UserApi
        PushApi pushApi = apiHelper.creatApi(PushApi.class);
        logger.info("个推初始化："+pushApi);
        return pushApi;
    }

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

@@ -89,7 +89,7 @@ public class AccountDO extends UuidIdentityEntityWithOperator implements Seriali
        this.patientId = patientId;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    public String getAccountName() {
        return accountName;
    }

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

@@ -101,7 +101,7 @@ public class ActiveRecordDO extends UuidIdentityEntity implements Serializable {
        this.patientId = patientId;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
//    @Convert(converter = StringFStringEncryptConverter.class)
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;

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

@@ -111,7 +111,7 @@ public class TaskPatientDetailDO extends UuidIdentityEntityWithOperator implemen
        this.patientId = patientId;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    /*@Convert(converter = StringFStringEncryptConverter.class)*/
    public String getPatientIdcard() {
        return patientIdcard;
    }

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/util/TransforSqlUtl.java

@@ -5,17 +5,28 @@ package com.yihu.jw.util;
 */
public class TransforSqlUtl {
    private static final boolean dbEncrypt=false; //不需要加密时 改为false即可，实体类注释需同时处理
    public static String accountName(String sql){
        return sql.replaceAll("ba1.account_name","CAST(AES_DECRYPT(from_base64(ba1.account_name),'jkzl2021ZJXL*#%a')AS char)");
        if(dbEncrypt){
            return sql.replaceAll("ba1.account_name","CAST(AES_DECRYPT(from_base64(ba1.account_name),'jkzl2021ZJXL*#%a')AS char)");
        }
        return sql;
    }
    public static String wlyyHealthBankAccountAll(String sql){
        String str = "*,CAST(AES_DECRYPT(from_base64(account_name),'jkzl2021ZJXL*#%a') AS CHAR ) AS account_name ";
        return sql.replace("*",str);
        if(dbEncrypt){
            String str = "*,CAST(AES_DECRYPT(from_base64(account_name),'jkzl2021ZJXL*#%a') AS CHAR ) AS account_name ";
            return sql.replace("*",str);
        }
        return sql;
    }
    public static String wlyyHealthBankTaskPatientDetailAll(String sql){
        String str = "*,CAST(AES_DECRYPT(from_base64(patient_idcard),'jkzl2021ZJXL*#%a') AS CHAR ) AS patient_idcard ";
        return sql.replace("*",str);
        if(dbEncrypt){
            String str = "*,CAST(AES_DECRYPT(from_base64(patient_idcard),'jkzl2021ZJXL*#%a') AS CHAR ) AS patient_idcard ";
            return sql.replace("*",str);
        }
        return sql;
    }
}