#

luxiaotao1123

2024-09-13 9b50dca2a601d1cf231821e248d3b9fbedd8febe

#

 zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java

@@ -499,22 +499,24 @@
                        .append("    }\n\n");
                // 枚举字段增加$格式化
            } else if (!Cools.isEmpty(column.getEnums())){
                sb.append("    public String get")
                        .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1))
                        .append("\\$")
                        .append("(){\n")
                        .append("        if (null == this.").append(column.getHumpName()).append("){ return null; }\n")
                        .append("        switch (this.").append(column.getHumpName()).append("){\n");
                for (Map<String, Object> map : column.getEnums()){
                    for (Map.Entry<String, Object> entry : map.entrySet()){
                        sb.append("            case ").append(entry.getKey()).append(":\n")
                                .append("                return \"").append(entry.getValue()).append("\";\n");
                if (!column.getHumpName().equals("deleted")) {
                    sb.append("    public String get")
                            .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1))
                            .append("\\$")
                            .append("(){\n")
                            .append("        if (null == this.").append(column.getHumpName()).append("){ return null; }\n")
                            .append("        switch (this.").append(column.getHumpName()).append("){\n");
                    for (Map<String, Object> map : column.getEnums()){
                        for (Map.Entry<String, Object> entry : map.entrySet()){
                            sb.append("            case ").append(entry.getKey()).append(":\n")
                                    .append("                return \"").append(entry.getValue()).append("\";\n");
                        }
                    }
                    sb.append("            default:\n")
                            .append("                return String.valueOf(this.").append(column.getHumpName()).append(");\n")
                            .append("        }\n")
                            .append("    }\n\n");
                }
                sb.append("            default:\n")
                        .append("                return String.valueOf(this.").append(column.getHumpName()).append(");\n")
                        .append("        }\n")
                        .append("    }\n\n");
            }

            // 外键修饰

 zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt

@@ -36,15 +36,4 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }
}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java

@@ -263,17 +263,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java

@@ -122,17 +122,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java

@@ -122,17 +122,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java

@@ -109,4 +109,17 @@
        }
    }

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java

@@ -351,17 +351,7 @@
        return this.agvStatus.desc;
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public Long getRecentCode() {
//        if (this.code != null) {
@@ -379,4 +369,18 @@
        return null;
    }

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java

@@ -254,17 +254,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java

@@ -122,17 +122,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java

@@ -166,17 +166,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java

@@ -122,17 +122,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java

@@ -164,17 +164,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java

@@ -71,17 +71,7 @@
//            null    // 租户
//    );

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getCode0$() {
        CodeService service = SpringUtils.getBean(CodeService.class);
@@ -101,4 +91,6 @@
        return null;
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java

@@ -155,17 +155,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java

@@ -234,17 +234,20 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java

@@ -265,17 +265,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getCompDirect$(){
        if (null == this.compDirect){ return null; }
@@ -289,5 +279,16 @@
        }
    }

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java

@@ -122,17 +122,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java

@@ -122,17 +122,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java

@@ -178,17 +178,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getStartCode$() {
        CodeService service = SpringUtils.getBean(CodeService.class);
@@ -208,4 +198,16 @@
        return null;
    }

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java

@@ -229,17 +229,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java

@@ -252,17 +252,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java

@@ -122,17 +122,16 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java

@@ -122,17 +122,16 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java

@@ -380,15 +380,17 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java

@@ -122,17 +122,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java

@@ -122,17 +122,17 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java

@@ -174,17 +174,17 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java

@@ -173,17 +173,17 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java

@@ -138,17 +138,17 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Config.java

@@ -146,17 +146,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getTenantId$(){
        TenantService service = SpringUtils.getBean(TenantService.class);
@@ -211,16 +201,6 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Dept.java

@@ -175,17 +175,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
@@ -231,16 +221,6 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Host.java

@@ -97,17 +97,7 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Menu.java

@@ -205,17 +205,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
@@ -261,16 +251,6 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Role.java

@@ -100,17 +100,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
@@ -138,16 +128,6 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Tenant.java

@@ -74,17 +74,7 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/User.java

@@ -234,17 +234,7 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }


    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
@@ -320,16 +310,6 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }


}