From 7deb218dae5b5083c4377cba2539ea07eca5146e Mon Sep 17 00:00:00 2001 From: unknown <627433532@qq.com> Date: Mon, 15 Jan 2024 23:29:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?FBILL=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zero-fm/script/code/config/zero-jooq.xml | 4 +- zero-fm/script/code/zero-jooq.bat | 4 + .../cn/vertxup/fm/domain/tables/FBill.java | 20 ++- .../fm/domain/tables/daos/FBillDao.java | 16 ++ .../fm/domain/tables/interfaces/IFBill.java | 14 ++ .../vertxup/fm/domain/tables/pojos/FBill.java | 32 ++++ .../fm/domain/tables/records/FBillRecord.java | 152 +++++++++++------ .../cn/vertxup/fm/service/BillService.java | 157 +++++++++--------- .../main/resources/plugin/fm/sql/F_BILL.sql | 101 +++++------ 9 files changed, 309 insertions(+), 191 deletions(-) create mode 100644 zero-fm/script/code/zero-jooq.bat diff --git a/zero-fm/script/code/config/zero-jooq.xml b/zero-fm/script/code/config/zero-jooq.xml index 98e9abe9..fc3e6bbd 100644 --- a/zero-fm/script/code/config/zero-jooq.xml +++ b/zero-fm/script/code/config/zero-jooq.xml @@ -5,8 +5,8 @@ - ${jooq.codegen.jdbc.username} - ${jooq.codegen.jdbc.password} + root + pl,okmijn123 io.github.jklingsporn.vertx.jooq.generate.classic.ClassicJDBCVertxGenerator diff --git a/zero-fm/script/code/zero-jooq.bat b/zero-fm/script/code/zero-jooq.bat new file mode 100644 index 00000000..0bd65cc1 --- /dev/null +++ b/zero-fm/script/code/zero-jooq.bat @@ -0,0 +1,4 @@ +@echo off +java -Djooq.codegen.jdbc.username=%Z_DBR_USERNAME% -Djooq.codegen.jdbc.password=%Z_DBR_PASS% ^ + -classpath "jooq-3.18.5.jar;jooq-meta-3.18.5.jar;jooq-codegen-3.18.5.jar;mysql-connector-j-8.0.33.jar;reactive-streams-1.0.4.jar;vertx-jooq-generate-6.5.5.jar;vertx-jooq-shared-6.5.5.jar;vertx-jooq-classic-6.5.5.jar;jakarta.xml.bind-api-4.0.0.jar;r2dbc-spi-1.0.0.RELEASE.jar;vertx-core-4.4.4.jar" ^ + org.jooq.codegen.GenerationTool .\config\zero-jooq.xml \ No newline at end of file diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java index 4d6676f2..a9199077 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java @@ -17,12 +17,12 @@ import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function21; +import org.jooq.Function22; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Records; -import org.jooq.Row21; +import org.jooq.Row22; import org.jooq.Schema; import org.jooq.SelectField; import org.jooq.Table; @@ -123,6 +123,12 @@ public class FBill extends TableImpl { */ public final TableField MODEL_KEY = createField(DSL.name("MODEL_KEY"), SQLDataType.VARCHAR(36), this, "「modelKey」- 关联的模型记录ID，用于描述哪一个Model中的记录"); + /** + * The column ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + public final TableField MODEL_NEW_KEY = createField(DSL.name("MODEL_NEW_KEY"), SQLDataType.VARCHAR(36), this, "「modelKey」- 关联的模型记录ID，用于描述新的Model中的记录"); + /** * The column ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @@ -256,18 +262,18 @@ public class FBill extends TableImpl { } // ------------------------------------------------------------------------- - // Row21 type methods + // Row22 type methods // ------------------------------------------------------------------------- @Override - public Row21 fieldsRow() { - return (Row21) super.fieldsRow(); + public Row22 fieldsRow() { + return (Row22) super.fieldsRow(); } /** * Convenience mapping calling {@link SelectField#convertFrom(Function)}. */ - public SelectField mapping(Function21 from) { + public SelectField mapping(Function22 from) { return convertFrom(Records.mapping(from)); } @@ -275,7 +281,7 @@ public class FBill extends TableImpl { * Convenience mapping calling {@link SelectField#convertFrom(Class, * Function)}. */ - public SelectField mapping(Class toType, Function21 from) { + public SelectField mapping(Class toType, Function22 from) { return convertFrom(toType, Records.mapping(from)); } } diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java index 3264b481..32b9b667 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java @@ -219,6 +219,22 @@ public class FBillDao extends AbstractVertxDAOMODEL_NEW_KEY IN (values) + * asynchronously + */ + public Future> findManyByModelNewKey(Collection values) { + return findManyByCondition(FBill.F_BILL.MODEL_NEW_KEY.in(values)); + } + + /** + * Find records that have MODEL_NEW_KEY IN (values) + * asynchronously limited by the given limit + */ + public Future> findManyByModelNewKey(Collection values, int limit) { + return findManyByCondition(FBill.F_BILL.MODEL_NEW_KEY.in(values),limit); + } + /** * Find records that have SIGMA IN (values) asynchronously */ diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java index 7f34bf4e..df367894 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java @@ -154,6 +154,18 @@ public interface IFBill extends VertxPojo, Serializable { */ public String getModelKey(); + /** + * Setter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + public IFBill setModelNewKey(String value); + + /** + * Getter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + public String getModelNewKey(); + /** * Setter for ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @@ -265,6 +277,7 @@ public interface IFBill extends VertxPojo, Serializable { setOrThrow(this::setBookId,json::getString,"BOOK_ID","java.lang.String"); setOrThrow(this::setModelId,json::getString,"MODEL_ID","java.lang.String"); setOrThrow(this::setModelKey,json::getString,"MODEL_KEY","java.lang.String"); + setOrThrow(this::setModelNewKey,json::getString,"MODEL_NEW_KEY","java.lang.String"); setOrThrow(this::setSigma,json::getString,"SIGMA","java.lang.String"); setOrThrow(this::setLanguage,json::getString,"LANGUAGE","java.lang.String"); setOrThrow(this::setActive,json::getBoolean,"ACTIVE","java.lang.Boolean"); @@ -293,6 +306,7 @@ public interface IFBill extends VertxPojo, Serializable { json.put("BOOK_ID",getBookId()); json.put("MODEL_ID",getModelId()); json.put("MODEL_KEY",getModelKey()); + json.put("MODEL_NEW_KEY",getModelNewKey()); json.put("SIGMA",getSigma()); json.put("LANGUAGE",getLanguage()); json.put("ACTIVE",getActive()); diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java index 95a8dcdd..0a6940fe 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java @@ -34,6 +34,7 @@ public class FBill implements VertxPojo, IFBill { private String bookId; private String modelId; private String modelKey; + private String modelNewKey; private String sigma; private String language; private Boolean active; @@ -59,6 +60,7 @@ public class FBill implements VertxPojo, IFBill { this.bookId = value.getBookId(); this.modelId = value.getModelId(); this.modelKey = value.getModelKey(); + this.modelNewKey = value.getModelNewKey(); this.sigma = value.getSigma(); this.language = value.getLanguage(); this.active = value.getActive(); @@ -83,6 +85,7 @@ public class FBill implements VertxPojo, IFBill { String bookId, String modelId, String modelKey, + String modelNewKey, String sigma, String language, Boolean active, @@ -105,6 +108,7 @@ public class FBill implements VertxPojo, IFBill { this.bookId = bookId; this.modelId = modelId; this.modelKey = modelKey; + this.modelNewKey = modelNewKey; this.sigma = sigma; this.language = language; this.active = active; @@ -347,6 +351,25 @@ public class FBill implements VertxPojo, IFBill { return this; } + /** + * Getter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + @Override + public String getModelNewKey() { + return this.modelNewKey; + } + + /** + * Setter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + @Override + public FBill setModelNewKey(String modelNewKey) { + this.modelNewKey = modelNewKey; + return this; + } + /** * Getter for ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @@ -570,6 +593,12 @@ public class FBill implements VertxPojo, IFBill { } else if (!this.modelKey.equals(other.modelKey)) return false; + if (this.modelNewKey == null) { + if (other.modelNewKey != null) + return false; + } + else if (!this.modelNewKey.equals(other.modelNewKey)) + return false; if (this.sigma == null) { if (other.sigma != null) return false; @@ -638,6 +667,7 @@ public class FBill implements VertxPojo, IFBill { result = prime * result + ((this.bookId == null) ? 0 : this.bookId.hashCode()); result = prime * result + ((this.modelId == null) ? 0 : this.modelId.hashCode()); result = prime * result + ((this.modelKey == null) ? 0 : this.modelKey.hashCode()); + result = prime * result + ((this.modelNewKey == null) ? 0 : this.modelNewKey.hashCode()); result = prime * result + ((this.sigma == null) ? 0 : this.sigma.hashCode()); result = prime * result + ((this.language == null) ? 0 : this.language.hashCode()); result = prime * result + ((this.active == null) ? 0 : this.active.hashCode()); @@ -666,6 +696,7 @@ public class FBill implements VertxPojo, IFBill { sb.append(", ").append(bookId); sb.append(", ").append(modelId); sb.append(", ").append(modelKey); + sb.append(", ").append(modelNewKey); sb.append(", ").append(sigma); sb.append(", ").append(language); sb.append(", ").append(active); @@ -698,6 +729,7 @@ public class FBill implements VertxPojo, IFBill { setBookId(from.getBookId()); setModelId(from.getModelId()); setModelKey(from.getModelKey()); + setModelNewKey(from.getModelNewKey()); setSigma(from.getSigma()); setLanguage(from.getLanguage()); setActive(from.getActive()); diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java index 0d05b0ab..824b4b68 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java @@ -14,8 +14,8 @@ import java.time.LocalDateTime; import org.jooq.Field; import org.jooq.Record1; -import org.jooq.Record21; -import org.jooq.Row21; +import org.jooq.Record22; +import org.jooq.Row22; import org.jooq.impl.UpdatableRecordImpl; @@ -24,7 +24,7 @@ import static io.github.jklingsporn.vertx.jooq.shared.internal.VertxPojo.*; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class FBillRecord extends UpdatableRecordImpl implements VertxPojo, Record21, IFBill { +public class FBillRecord extends UpdatableRecordImpl implements VertxPojo, Record22, IFBill { private static final long serialVersionUID = 1L; @@ -255,12 +255,31 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver return (String) get(12); } + /** + * Setter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + @Override + public FBillRecord setModelNewKey(String value) { + set(13, value); + return this; + } + + /** + * Getter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- + * 关联的模型记录ID，用于描述新的Model中的记录 + */ + @Override + public String getModelNewKey() { + return (String) get(13); + } + /** * Setter for ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @Override public FBillRecord setSigma(String value) { - set(13, value); + set(14, value); return this; } @@ -269,7 +288,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getSigma() { - return (String) get(13); + return (String) get(14); } /** @@ -277,7 +296,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setLanguage(String value) { - set(14, value); + set(15, value); return this; } @@ -286,7 +305,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getLanguage() { - return (String) get(14); + return (String) get(15); } /** @@ -294,7 +313,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setActive(Boolean value) { - set(15, value); + set(16, value); return this; } @@ -303,7 +322,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public Boolean getActive() { - return (Boolean) get(15); + return (Boolean) get(16); } /** @@ -311,7 +330,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setMetadata(String value) { - set(16, value); + set(17, value); return this; } @@ -320,7 +339,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getMetadata() { - return (String) get(16); + return (String) get(17); } /** @@ -328,7 +347,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setCreatedAt(LocalDateTime value) { - set(17, value); + set(18, value); return this; } @@ -337,7 +356,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public LocalDateTime getCreatedAt() { - return (LocalDateTime) get(17); + return (LocalDateTime) get(18); } /** @@ -345,7 +364,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setCreatedBy(String value) { - set(18, value); + set(19, value); return this; } @@ -354,7 +373,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getCreatedBy() { - return (String) get(18); + return (String) get(19); } /** @@ -362,7 +381,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setUpdatedAt(LocalDateTime value) { - set(19, value); + set(20, value); return this; } @@ -371,7 +390,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public LocalDateTime getUpdatedAt() { - return (LocalDateTime) get(19); + return (LocalDateTime) get(20); } /** @@ -379,7 +398,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setUpdatedBy(String value) { - set(20, value); + set(21, value); return this; } @@ -388,7 +407,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getUpdatedBy() { - return (String) get(20); + return (String) get(21); } // ------------------------------------------------------------------------- @@ -401,17 +420,17 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver } // ------------------------------------------------------------------------- - // Record21 type implementation + // Record22 type implementation // ------------------------------------------------------------------------- @Override - public Row21 fieldsRow() { - return (Row21) super.fieldsRow(); + public Row22 fieldsRow() { + return (Row22) super.fieldsRow(); } @Override - public Row21 valuesRow() { - return (Row21) super.valuesRow(); + public Row22 valuesRow() { + return (Row22) super.valuesRow(); } @Override @@ -481,41 +500,46 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public Field field14() { - return FBill.F_BILL.SIGMA; + return FBill.F_BILL.MODEL_NEW_KEY; } @Override public Field field15() { + return FBill.F_BILL.SIGMA; + } + + @Override + public Field field16() { return FBill.F_BILL.LANGUAGE; } @Override - public Field field16() { + public Field field17() { return FBill.F_BILL.ACTIVE; } @Override - public Field field17() { + public Field field18() { return FBill.F_BILL.METADATA; } @Override - public Field field18() { + public Field field19() { return FBill.F_BILL.CREATED_AT; } @Override - public Field field19() { + public Field field20() { return FBill.F_BILL.CREATED_BY; } @Override - public Field field20() { + public Field field21() { return FBill.F_BILL.UPDATED_AT; } @Override - public Field field21() { + public Field field22() { return FBill.F_BILL.UPDATED_BY; } @@ -586,41 +610,46 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public String component14() { - return getSigma(); + return getModelNewKey(); } @Override public String component15() { + return getSigma(); + } + + @Override + public String component16() { return getLanguage(); } @Override - public Boolean component16() { + public Boolean component17() { return getActive(); } @Override - public String component17() { + public String component18() { return getMetadata(); } @Override - public LocalDateTime component18() { + public LocalDateTime component19() { return getCreatedAt(); } @Override - public String component19() { + public String component20() { return getCreatedBy(); } @Override - public LocalDateTime component20() { + public LocalDateTime component21() { return getUpdatedAt(); } @Override - public String component21() { + public String component22() { return getUpdatedBy(); } @@ -691,41 +720,46 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public String value14() { - return getSigma(); + return getModelNewKey(); } @Override public String value15() { + return getSigma(); + } + + @Override + public String value16() { return getLanguage(); } @Override - public Boolean value16() { + public Boolean value17() { return getActive(); } @Override - public String value17() { + public String value18() { return getMetadata(); } @Override - public LocalDateTime value18() { + public LocalDateTime value19() { return getCreatedAt(); } @Override - public String value19() { + public String value20() { return getCreatedBy(); } @Override - public LocalDateTime value20() { + public LocalDateTime value21() { return getUpdatedAt(); } @Override - public String value21() { + public String value22() { return getUpdatedBy(); } @@ -809,54 +843,60 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public FBillRecord value14(String value) { - setSigma(value); + setModelNewKey(value); return this; } @Override public FBillRecord value15(String value) { + setSigma(value); + return this; + } + + @Override + public FBillRecord value16(String value) { setLanguage(value); return this; } @Override - public FBillRecord value16(Boolean value) { + public FBillRecord value17(Boolean value) { setActive(value); return this; } @Override - public FBillRecord value17(String value) { + public FBillRecord value18(String value) { setMetadata(value); return this; } @Override - public FBillRecord value18(LocalDateTime value) { + public FBillRecord value19(LocalDateTime value) { setCreatedAt(value); return this; } @Override - public FBillRecord value19(String value) { + public FBillRecord value20(String value) { setCreatedBy(value); return this; } @Override - public FBillRecord value20(LocalDateTime value) { + public FBillRecord value21(LocalDateTime value) { setUpdatedAt(value); return this; } @Override - public FBillRecord value21(String value) { + public FBillRecord value22(String value) { setUpdatedBy(value); return this; } @Override - public FBillRecord values(String value1, String value2, String value3, String value4, String value5, String value6, BigDecimal value7, Boolean value8, String value9, String value10, String value11, String value12, String value13, String value14, String value15, Boolean value16, String value17, LocalDateTime value18, String value19, LocalDateTime value20, String value21) { + public FBillRecord values(String value1, String value2, String value3, String value4, String value5, String value6, BigDecimal value7, Boolean value8, String value9, String value10, String value11, String value12, String value13, String value14, String value15, String value16, Boolean value17, String value18, LocalDateTime value19, String value20, LocalDateTime value21, String value22) { value1(value1); value2(value2); value3(value3); @@ -878,6 +918,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver value19(value19); value20(value20); value21(value21); + value22(value22); return this; } @@ -900,6 +941,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver setBookId(from.getBookId()); setModelId(from.getModelId()); setModelKey(from.getModelKey()); + setModelNewKey(from.getModelNewKey()); setSigma(from.getSigma()); setLanguage(from.getLanguage()); setActive(from.getActive()); @@ -931,7 +973,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver /** * Create a detached, initialised FBillRecord */ - public FBillRecord(String key, String name, String code, String serial, String type, String category, BigDecimal amount, Boolean income, String comment, String orderId, String bookId, String modelId, String modelKey, String sigma, String language, Boolean active, String metadata, LocalDateTime createdAt, String createdBy, LocalDateTime updatedAt, String updatedBy) { + public FBillRecord(String key, String name, String code, String serial, String type, String category, BigDecimal amount, Boolean income, String comment, String orderId, String bookId, String modelId, String modelKey, String modelNewKey, String sigma, String language, Boolean active, String metadata, LocalDateTime createdAt, String createdBy, LocalDateTime updatedAt, String updatedBy) { super(FBill.F_BILL); setKey(key); @@ -947,6 +989,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver setBookId(bookId); setModelId(modelId); setModelKey(modelKey); + setModelNewKey(modelNewKey); setSigma(sigma); setLanguage(language); setActive(active); @@ -978,6 +1021,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver setBookId(value.getBookId()); setModelId(value.getModelId()); setModelKey(value.getModelKey()); + setModelNewKey(value.getModelNewKey()); setSigma(value.getSigma()); setLanguage(value.getLanguage()); setActive(value.getActive()); diff --git a/zero-fm/src/main/java/cn/vertxup/fm/service/BillService.java b/zero-fm/src/main/java/cn/vertxup/fm/service/BillService.java index 4f69620f..53aeb9cb 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/service/BillService.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/service/BillService.java @@ -1,78 +1,79 @@ -package cn.vertxup.fm.service; - -import cn.vertxup.fm.domain.tables.daos.*; -import cn.vertxup.fm.domain.tables.pojos.*; -import io.vertx.core.Future; -import io.vertx.core.json.JsonObject; -import io.vertx.up.eon.KName; -import io.vertx.up.unity.Ux; -import io.vertx.up.util.Ut; -import jakarta.inject.Inject; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * @author Lang - */ -public class BillService implements BillStub { - @Inject - private transient BookStub bookStub; - - @Override - public Future> fetchPayments(final List settlements) { - final Set settlementIds = Ut.valueSetString(settlements, FSettlement::getKey); - final JsonObject condition = Ux.whereAnd(); - condition.put("settlementId,i", Ut.toJArray(settlementIds)); - return Ux.Jooq.on(FPaymentItemDao.class).fetchAsync(condition); - } - - @Override - public Future> fetchByOrder(final String orderId) { - /* - * Fetch Bill List - */ - final JsonObject condBill = Ux.whereAnd(); - condBill.put("orderId", orderId); - return Ux.Jooq.on(FBillDao.class).fetchAsync(condBill); - } - - @Override - public Future> fetchByBills(final List bills) { - if (bills.isEmpty()) { - return Ux.future(new ArrayList<>()); - } else { - final JsonObject condition = Ux.whereAnd(); - condition.put("billId,i", Ut.toJArray(bills.stream().map(FBill::getKey) - .filter(Objects::nonNull) - .collect(Collectors.toSet()))); - return Ux.Jooq.on(FBillItemDao.class).fetchAsync(condition); - } - } - - @Override - public Future> fetchSettlements(final List items) { - if (items.isEmpty()) { - return Ux.future(new ArrayList<>()); - } else { - final JsonObject condition = Ux.whereAnd(); - condition.put(KName.KEY, Ut.toJArray(items.stream() - .map(FBillItem::getSettlementId) - .filter(Ut::isNotNil) - .collect(Collectors.toSet()) - )); - return Ux.Jooq.on(FSettlementDao.class).fetchAsync(condition); - } - } - - @Override - public Future> fetchBySettlements(final List settlements) { - final Set settlementIds = Ut.valueSetString(settlements, FSettlement::getKey); - final JsonObject condition = Ux.whereAnd(); - condition.put("settlementId,i", Ut.toJArray(settlementIds)); - return Ux.Jooq.on(FSettlementItemDao.class).fetchAsync(condition); - } -} +package cn.vertxup.fm.service; + +import cn.vertxup.fm.domain.tables.daos.*; +import cn.vertxup.fm.domain.tables.pojos.*; +import io.vertx.core.Future; +import io.vertx.core.json.JsonObject; +import io.vertx.up.eon.KName; +import io.vertx.up.unity.Ux; +import io.vertx.up.util.Ut; +import jakarta.inject.Inject; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author Lang + */ +public class BillService implements BillStub { + @Inject + private transient BookStub bookStub; + + @Override + public Future> fetchPayments(final List settlements) { + final Set settlementIds = Ut.valueSetString(settlements, FSettlement::getKey); + final JsonObject condition = Ux.whereAnd(); + condition.put("settlementId,i", Ut.toJArray(settlementIds)); + return Ux.Jooq.on(FPaymentItemDao.class).fetchAsync(condition); + } + + @Override + public Future> fetchByOrder(final String orderId) { + /* + * Fetch Bill List + */ + final JsonObject condBill = Ux.whereAnd(); + condBill.put("orderId", orderId); + return Ux.Jooq.on(FBillDao.class).fetchAsync(condBill); + } + + @Override + public Future> fetchByBills(final List bills) { + if (bills.isEmpty()) { + return Ux.future(new ArrayList<>()); + } else { + final JsonObject condition = Ux.whereAnd(); + condition.put("billId,i", Ut.toJArray(bills.stream().map(FBill::getKey) + .filter(Objects::nonNull) + .collect(Collectors.toSet()))); + return Ux.Jooq.on(FBillItemDao.class).fetchAsync(condition); + } + } + + @Override + public Future> fetchSettlements(final List items) { + if (items.isEmpty()) { + return Ux.future(new ArrayList<>()); + } else { + final JsonObject condition = Ux.whereAnd(); + Set set = new HashSet<>(); + for (FBillItem fBillItem : items) { + String settlementId = fBillItem.getSettlementId(); + if (Ut.isNotNil(settlementId)) { + set.add(settlementId); + } + } + condition.put(KName.KEY, Ut.toJArray(set + )); + return Ux.Jooq.on(FSettlementDao.class).fetchAsync(condition); + } + } + + @Override + public Future> fetchBySettlements(final List settlements) { + final Set settlementIds = Ut.valueSetString(settlements, FSettlement::getKey); + final JsonObject condition = Ux.whereAnd(); + condition.put("settlementId,i", Ut.toJArray(settlementIds)); + return Ux.Jooq.on(FSettlementItemDao.class).fetchAsync(condition); + } +} diff --git a/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql b/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql index 02749b28..60b984a5 100644 --- a/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql +++ b/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql @@ -1,50 +1,51 @@ --- liquibase formatted sql - --- changeset Lang:f-bill-1 -DROP TABLE IF EXISTS `F_BILL`; -CREATE TABLE `F_BILL` -( - `KEY` VARCHAR(36) COMMENT '「key」- 账单主键', - `NAME` VARCHAR(255) COMMENT '「name」- 账单标题', - `CODE` VARCHAR(255) NOT NULL COMMENT '「code」- 账单系统编号', - `SERIAL` VARCHAR(255) NOT NULL COMMENT '「serial」- 账单流水线号', - - -- 维度信息 - `TYPE` VARCHAR(36) NOT NULL COMMENT '「type」- 账单类型', - `CATEGORY` VARCHAR(36) NOT NULL COMMENT '「category」- 账单类别', - - -- 基本信息 - `AMOUNT` DECIMAL(18, 2) NOT NULL COMMENT '「amount」- 账单金额', - `INCOME` BIT COMMENT '「income」- true = 消费类，false = 付款类', - `COMMENT` LONGTEXT COMMENT '「comment」 - 账单备注', - - -- 关联信息 - `ORDER_ID` VARCHAR(36) COMMENT '「orderId」- 订单对应的订单ID', - `BOOK_ID` VARCHAR(36) COMMENT '「bookId」- 关联账本ID', - `MODEL_ID` VARCHAR(255) COMMENT '「modelId」- 关联的模型identifier，用于描述', - `MODEL_KEY` VARCHAR(36) COMMENT '「modelKey」- 关联的模型记录ID，用于描述哪一个Model中的记录', - - -- 特殊字段 - `SIGMA` VARCHAR(32) COMMENT '「sigma」- 统一标识', - `LANGUAGE` VARCHAR(10) COMMENT '「language」- 使用的语言', - `ACTIVE` BIT COMMENT '「active」- 是否启用', - `METADATA` TEXT COMMENT '「metadata」- 附加配置数据', - - -- Auditor字段 - `CREATED_AT` DATETIME COMMENT '「createdAt」- 创建时间', - `CREATED_BY` VARCHAR(36) COMMENT '「createdBy」- 创建人', - `UPDATED_AT` DATETIME COMMENT '「updatedAt」- 更新时间', - `UPDATED_BY` VARCHAR(36) COMMENT '「updatedBy」- 更新人', - PRIMARY KEY (`KEY`) -); --- changeset Lang:f-bill-2 -ALTER TABLE F_BILL - ADD UNIQUE (`CODE`, `ORDER_ID`, `SIGMA`); -ALTER TABLE F_BILL - ADD UNIQUE (`SERIAL`, `ORDER_ID`, `SIGMA`); - --- INDEX -ALTER TABLE F_BILL - ADD INDEX IDX_F_BILL_ORDER_ID (`ORDER_ID`); -ALTER TABLE F_BILL - ADD INDEX IDX_F_BILL_BOOK_ID (`BOOK_ID`); +-- liquibase formatted sql + +-- changeset Lang:f-bill-1 +DROP TABLE IF EXISTS `F_BILL`; +CREATE TABLE `F_BILL` +( + `KEY` VARCHAR(36) COMMENT '「key」- 账单主键', + `NAME` VARCHAR(255) COMMENT '「name」- 账单标题', + `CODE` VARCHAR(255) NOT NULL COMMENT '「code」- 账单系统编号', + `SERIAL` VARCHAR(255) NOT NULL COMMENT '「serial」- 账单流水线号', + + -- 维度信息 + `TYPE` VARCHAR(36) NOT NULL COMMENT '「type」- 账单类型', + `CATEGORY` VARCHAR(36) NOT NULL COMMENT '「category」- 账单类别', + + -- 基本信息 + `AMOUNT` DECIMAL(18, 2) NOT NULL COMMENT '「amount」- 账单金额', + `INCOME` BIT COMMENT '「income」- true = 消费类，false = 付款类', + `COMMENT` LONGTEXT COMMENT '「comment」 - 账单备注', + + -- 关联信息 + `ORDER_ID` VARCHAR(36) COMMENT '「orderId」- 订单对应的订单ID', + `BOOK_ID` VARCHAR(36) COMMENT '「bookId」- 关联账本ID', + `MODEL_ID` VARCHAR(255) COMMENT '「modelId」- 关联的模型identifier，用于描述', + `MODEL_KEY` VARCHAR(36) COMMENT '「modelKey」- 关联的模型记录ID，用于描述哪一个Model中的记录', + `MODEL_NEW_KEY` VARCHAR(36) COMMENT '「modelKey」- 关联的模型记录新ID，用于描述新的Model中的某一条新记录', + + -- 特殊字段 + `SIGMA` VARCHAR(32) COMMENT '「sigma」- 统一标识', + `LANGUAGE` VARCHAR(10) COMMENT '「language」- 使用的语言', + `ACTIVE` BIT COMMENT '「active」- 是否启用', + `METADATA` TEXT COMMENT '「metadata」- 附加配置数据', + + -- Auditor字段 + `CREATED_AT` DATETIME COMMENT '「createdAt」- 创建时间', + `CREATED_BY` VARCHAR(36) COMMENT '「createdBy」- 创建人', + `UPDATED_AT` DATETIME COMMENT '「updatedAt」- 更新时间', + `UPDATED_BY` VARCHAR(36) COMMENT '「updatedBy」- 更新人', + PRIMARY KEY (`KEY`) +); +-- changeset Lang:f-bill-2 +ALTER TABLE F_BILL + ADD UNIQUE (`CODE`, `ORDER_ID`, `SIGMA`); +ALTER TABLE F_BILL + ADD UNIQUE (`SERIAL`, `ORDER_ID`, `SIGMA`); + +-- INDEX +ALTER TABLE F_BILL + ADD INDEX IDX_F_BILL_ORDER_ID (`ORDER_ID`); +ALTER TABLE F_BILL + ADD INDEX IDX_F_BILL_BOOK_ID (`BOOK_ID`); -- Gitee From 94c8d01a5c6eb8eecc5ad07ab9096ff1a3399f47 Mon Sep 17 00:00:00 2001 From: unknown <627433532@qq.com> Date: Mon, 15 Jan 2024 23:34:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zero-fm/script/code/config/zero-jooq.xml | 4 ++-- zero-fm/script/code/zero-jooq.bat | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 zero-fm/script/code/zero-jooq.bat diff --git a/zero-fm/script/code/config/zero-jooq.xml b/zero-fm/script/code/config/zero-jooq.xml index fc3e6bbd..98e9abe9 100644 --- a/zero-fm/script/code/config/zero-jooq.xml +++ b/zero-fm/script/code/config/zero-jooq.xml @@ -5,8 +5,8 @@ - root - pl,okmijn123 + ${jooq.codegen.jdbc.username} + ${jooq.codegen.jdbc.password} io.github.jklingsporn.vertx.jooq.generate.classic.ClassicJDBCVertxGenerator diff --git a/zero-fm/script/code/zero-jooq.bat b/zero-fm/script/code/zero-jooq.bat deleted file mode 100644 index 0bd65cc1..00000000 --- a/zero-fm/script/code/zero-jooq.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -java -Djooq.codegen.jdbc.username=%Z_DBR_USERNAME% -Djooq.codegen.jdbc.password=%Z_DBR_PASS% ^ - -classpath "jooq-3.18.5.jar;jooq-meta-3.18.5.jar;jooq-codegen-3.18.5.jar;mysql-connector-j-8.0.33.jar;reactive-streams-1.0.4.jar;vertx-jooq-generate-6.5.5.jar;vertx-jooq-shared-6.5.5.jar;vertx-jooq-classic-6.5.5.jar;jakarta.xml.bind-api-4.0.0.jar;r2dbc-spi-1.0.0.RELEASE.jar;vertx-core-4.4.4.jar" ^ - org.jooq.codegen.GenerationTool .\config\zero-jooq.xml \ No newline at end of file -- Gitee From 59302c59ef1b3da2fea97d907050a1dfea48eae8 Mon Sep 17 00:00:00 2001 From: unknown <627433532@qq.com> Date: Wed, 20 Mar 2024 15:07:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/vertxup/fm/api/FetchActor.java | 8 +- .../cn/vertxup/fm/domain/tables/FBill.java | 20 +-- .../fm/domain/tables/daos/FBillDao.java | 16 -- .../fm/domain/tables/interfaces/IFBill.java | 120 ++++++------- .../vertxup/fm/domain/tables/pojos/FBill.java | 82 +++------ .../fm/domain/tables/records/FBillRecord.java | 160 +++++++----------- .../main/resources/plugin/fm/sql/F_BILL.sql | 1 - 7 files changed, 147 insertions(+), 260 deletions(-) diff --git a/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java b/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java index 4d57afed..0bdc917b 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java @@ -46,7 +46,7 @@ public class FetchActor { final BillData data = new BillData(); /* 按照 orderId 查询账单集合信息 */ return this.fetchStub.fetchByOrder(orderId) - .compose(data::bill) + .compose(bills1 -> data.bill(bills1)) /* 根据账单查询 账单明细 信息 */ @@ -55,14 +55,14 @@ public class FetchActor { /* 根据账单明细查询 结算单 信息 */ - .compose(this.fetchStub::fetchSettlements) - .compose(data::settlement) + .compose(items -> this.fetchStub.fetchSettlements(items)) + .compose(settlements -> data.settlement(settlements)) /* * 旧版本多查询了一步，但实际这个步骤查询下来没有任何用 * 根据结算单查询 交易明细 信息 */ - .compose(nil -> data.response(true)); + .compose(nil -> data.response(false)); } diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java index a9199077..4d6676f2 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/FBill.java @@ -17,12 +17,12 @@ import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function22; +import org.jooq.Function21; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; import org.jooq.Records; -import org.jooq.Row22; +import org.jooq.Row21; import org.jooq.Schema; import org.jooq.SelectField; import org.jooq.Table; @@ -123,12 +123,6 @@ public class FBill extends TableImpl { */ public final TableField MODEL_KEY = createField(DSL.name("MODEL_KEY"), SQLDataType.VARCHAR(36), this, "「modelKey」- 关联的模型记录ID，用于描述哪一个Model中的记录"); - /** - * The column ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - public final TableField MODEL_NEW_KEY = createField(DSL.name("MODEL_NEW_KEY"), SQLDataType.VARCHAR(36), this, "「modelKey」- 关联的模型记录ID，用于描述新的Model中的记录"); - /** * The column ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @@ -262,18 +256,18 @@ public class FBill extends TableImpl { } // ------------------------------------------------------------------------- - // Row22 type methods + // Row21 type methods // ------------------------------------------------------------------------- @Override - public Row22 fieldsRow() { - return (Row22) super.fieldsRow(); + public Row21 fieldsRow() { + return (Row21) super.fieldsRow(); } /** * Convenience mapping calling {@link SelectField#convertFrom(Function)}. */ - public SelectField mapping(Function22 from) { + public SelectField mapping(Function21 from) { return convertFrom(Records.mapping(from)); } @@ -281,7 +275,7 @@ public class FBill extends TableImpl { * Convenience mapping calling {@link SelectField#convertFrom(Class, * Function)}. */ - public SelectField mapping(Class toType, Function22 from) { + public SelectField mapping(Class toType, Function21 from) { return convertFrom(toType, Records.mapping(from)); } } diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java index 32b9b667..3264b481 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/daos/FBillDao.java @@ -219,22 +219,6 @@ public class FBillDao extends AbstractVertxDAOMODEL_NEW_KEY IN (values) - * asynchronously - */ - public Future> findManyByModelNewKey(Collection values) { - return findManyByCondition(FBill.F_BILL.MODEL_NEW_KEY.in(values)); - } - - /** - * Find records that have MODEL_NEW_KEY IN (values) - * asynchronously limited by the given limit - */ - public Future> findManyByModelNewKey(Collection values, int limit) { - return findManyByCondition(FBill.F_BILL.MODEL_NEW_KEY.in(values),limit); - } - /** * Find records that have SIGMA IN (values) asynchronously */ diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java index df367894..d1c219e9 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/interfaces/IFBill.java @@ -154,18 +154,6 @@ public interface IFBill extends VertxPojo, Serializable { */ public String getModelKey(); - /** - * Setter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - public IFBill setModelNewKey(String value); - - /** - * Getter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - public String getModelNewKey(); - /** * Setter for ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @@ -262,60 +250,58 @@ public interface IFBill extends VertxPojo, Serializable { */ public E into(E into); - @Override - public default IFBill fromJson(io.vertx.core.json.JsonObject json) { - setOrThrow(this::setKey,json::getString,"KEY","java.lang.String"); - setOrThrow(this::setName,json::getString,"NAME","java.lang.String"); - setOrThrow(this::setCode,json::getString,"CODE","java.lang.String"); - setOrThrow(this::setSerial,json::getString,"SERIAL","java.lang.String"); - setOrThrow(this::setType,json::getString,"TYPE","java.lang.String"); - setOrThrow(this::setCategory,json::getString,"CATEGORY","java.lang.String"); - setOrThrow(this::setAmount,key -> {String s = json.getString(key); return s==null?null:new java.math.BigDecimal(s);},"AMOUNT","java.math.BigDecimal"); - setOrThrow(this::setIncome,json::getBoolean,"INCOME","java.lang.Boolean"); - setOrThrow(this::setComment,json::getString,"COMMENT","java.lang.String"); - setOrThrow(this::setOrderId,json::getString,"ORDER_ID","java.lang.String"); - setOrThrow(this::setBookId,json::getString,"BOOK_ID","java.lang.String"); - setOrThrow(this::setModelId,json::getString,"MODEL_ID","java.lang.String"); - setOrThrow(this::setModelKey,json::getString,"MODEL_KEY","java.lang.String"); - setOrThrow(this::setModelNewKey,json::getString,"MODEL_NEW_KEY","java.lang.String"); - setOrThrow(this::setSigma,json::getString,"SIGMA","java.lang.String"); - setOrThrow(this::setLanguage,json::getString,"LANGUAGE","java.lang.String"); - setOrThrow(this::setActive,json::getBoolean,"ACTIVE","java.lang.Boolean"); - setOrThrow(this::setMetadata,json::getString,"METADATA","java.lang.String"); - setOrThrow(this::setCreatedAt,key -> {String s = json.getString(key); return s==null?null:java.time.LocalDateTime.parse(s);},"CREATED_AT","java.time.LocalDateTime"); - setOrThrow(this::setCreatedBy,json::getString,"CREATED_BY","java.lang.String"); - setOrThrow(this::setUpdatedAt,key -> {String s = json.getString(key); return s==null?null:java.time.LocalDateTime.parse(s);},"UPDATED_AT","java.time.LocalDateTime"); - setOrThrow(this::setUpdatedBy,json::getString,"UPDATED_BY","java.lang.String"); - return this; - } - - - @Override - public default io.vertx.core.json.JsonObject toJson() { - io.vertx.core.json.JsonObject json = new io.vertx.core.json.JsonObject(); - json.put("KEY",getKey()); - json.put("NAME",getName()); - json.put("CODE",getCode()); - json.put("SERIAL",getSerial()); - json.put("TYPE",getType()); - json.put("CATEGORY",getCategory()); - json.put("AMOUNT",getAmount()==null?null:getAmount().toString()); - json.put("INCOME",getIncome()); - json.put("COMMENT",getComment()); - json.put("ORDER_ID",getOrderId()); - json.put("BOOK_ID",getBookId()); - json.put("MODEL_ID",getModelId()); - json.put("MODEL_KEY",getModelKey()); - json.put("MODEL_NEW_KEY",getModelNewKey()); - json.put("SIGMA",getSigma()); - json.put("LANGUAGE",getLanguage()); - json.put("ACTIVE",getActive()); - json.put("METADATA",getMetadata()); - json.put("CREATED_AT",getCreatedAt()==null?null:getCreatedAt().toString()); - json.put("CREATED_BY",getCreatedBy()); - json.put("UPDATED_AT",getUpdatedAt()==null?null:getUpdatedAt().toString()); - json.put("UPDATED_BY",getUpdatedBy()); - return json; - } + @Override + public default IFBill fromJson(io.vertx.core.json.JsonObject json) { + setOrThrow(this::setKey,json::getString,"KEY","java.lang.String"); + setOrThrow(this::setName,json::getString,"NAME","java.lang.String"); + setOrThrow(this::setCode,json::getString,"CODE","java.lang.String"); + setOrThrow(this::setSerial,json::getString,"SERIAL","java.lang.String"); + setOrThrow(this::setType,json::getString,"TYPE","java.lang.String"); + setOrThrow(this::setCategory,json::getString,"CATEGORY","java.lang.String"); + setOrThrow(this::setAmount,key -> {String s = json.getString(key); return s==null?null:new java.math.BigDecimal(s);},"AMOUNT","java.math.BigDecimal"); + setOrThrow(this::setIncome,json::getBoolean,"INCOME","java.lang.Boolean"); + setOrThrow(this::setComment,json::getString,"COMMENT","java.lang.String"); + setOrThrow(this::setOrderId,json::getString,"ORDER_ID","java.lang.String"); + setOrThrow(this::setBookId,json::getString,"BOOK_ID","java.lang.String"); + setOrThrow(this::setModelId,json::getString,"MODEL_ID","java.lang.String"); + setOrThrow(this::setModelKey,json::getString,"MODEL_KEY","java.lang.String"); + setOrThrow(this::setSigma,json::getString,"SIGMA","java.lang.String"); + setOrThrow(this::setLanguage,json::getString,"LANGUAGE","java.lang.String"); + setOrThrow(this::setActive,json::getBoolean,"ACTIVE","java.lang.Boolean"); + setOrThrow(this::setMetadata,json::getString,"METADATA","java.lang.String"); + setOrThrow(this::setCreatedAt,key -> {String s = json.getString(key); return s==null?null:java.time.LocalDateTime.parse(s);},"CREATED_AT","java.time.LocalDateTime"); + setOrThrow(this::setCreatedBy,json::getString,"CREATED_BY","java.lang.String"); + setOrThrow(this::setUpdatedAt,key -> {String s = json.getString(key); return s==null?null:java.time.LocalDateTime.parse(s);},"UPDATED_AT","java.time.LocalDateTime"); + setOrThrow(this::setUpdatedBy,json::getString,"UPDATED_BY","java.lang.String"); + return this; + } + + + @Override + public default io.vertx.core.json.JsonObject toJson() { + io.vertx.core.json.JsonObject json = new io.vertx.core.json.JsonObject(); + json.put("KEY",getKey()); + json.put("NAME",getName()); + json.put("CODE",getCode()); + json.put("SERIAL",getSerial()); + json.put("TYPE",getType()); + json.put("CATEGORY",getCategory()); + json.put("AMOUNT",getAmount()==null?null:getAmount().toString()); + json.put("INCOME",getIncome()); + json.put("COMMENT",getComment()); + json.put("ORDER_ID",getOrderId()); + json.put("BOOK_ID",getBookId()); + json.put("MODEL_ID",getModelId()); + json.put("MODEL_KEY",getModelKey()); + json.put("SIGMA",getSigma()); + json.put("LANGUAGE",getLanguage()); + json.put("ACTIVE",getActive()); + json.put("METADATA",getMetadata()); + json.put("CREATED_AT",getCreatedAt()==null?null:getCreatedAt().toString()); + json.put("CREATED_BY",getCreatedBy()); + json.put("UPDATED_AT",getUpdatedAt()==null?null:getUpdatedAt().toString()); + json.put("UPDATED_BY",getUpdatedBy()); + return json; + } } diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java index 0a6940fe..61d5eae6 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/pojos/FBill.java @@ -34,7 +34,6 @@ public class FBill implements VertxPojo, IFBill { private String bookId; private String modelId; private String modelKey; - private String modelNewKey; private String sigma; private String language; private Boolean active; @@ -60,7 +59,6 @@ public class FBill implements VertxPojo, IFBill { this.bookId = value.getBookId(); this.modelId = value.getModelId(); this.modelKey = value.getModelKey(); - this.modelNewKey = value.getModelNewKey(); this.sigma = value.getSigma(); this.language = value.getLanguage(); this.active = value.getActive(); @@ -72,28 +70,27 @@ public class FBill implements VertxPojo, IFBill { } public FBill( - String key, - String name, - String code, - String serial, - String type, - String category, - BigDecimal amount, - Boolean income, - String comment, - String orderId, - String bookId, - String modelId, - String modelKey, - String modelNewKey, - String sigma, - String language, - Boolean active, - String metadata, - LocalDateTime createdAt, - String createdBy, - LocalDateTime updatedAt, - String updatedBy + String key, + String name, + String code, + String serial, + String type, + String category, + BigDecimal amount, + Boolean income, + String comment, + String orderId, + String bookId, + String modelId, + String modelKey, + String sigma, + String language, + Boolean active, + String metadata, + LocalDateTime createdAt, + String createdBy, + LocalDateTime updatedAt, + String updatedBy ) { this.key = key; this.name = name; @@ -108,7 +105,6 @@ public class FBill implements VertxPojo, IFBill { this.bookId = bookId; this.modelId = modelId; this.modelKey = modelKey; - this.modelNewKey = modelNewKey; this.sigma = sigma; this.language = language; this.active = active; @@ -119,10 +115,10 @@ public class FBill implements VertxPojo, IFBill { this.updatedBy = updatedBy; } - public FBill(io.vertx.core.json.JsonObject json) { - this(); - fromJson(json); - } + public FBill(io.vertx.core.json.JsonObject json) { + this(); + fromJson(json); + } /** * Getter for ZDB.F_BILL.KEY. 「key」- 账单主键 @@ -351,25 +347,6 @@ public class FBill implements VertxPojo, IFBill { return this; } - /** - * Getter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - @Override - public String getModelNewKey() { - return this.modelNewKey; - } - - /** - * Setter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - @Override - public FBill setModelNewKey(String modelNewKey) { - this.modelNewKey = modelNewKey; - return this; - } - /** * Getter for ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @@ -593,12 +570,6 @@ public class FBill implements VertxPojo, IFBill { } else if (!this.modelKey.equals(other.modelKey)) return false; - if (this.modelNewKey == null) { - if (other.modelNewKey != null) - return false; - } - else if (!this.modelNewKey.equals(other.modelNewKey)) - return false; if (this.sigma == null) { if (other.sigma != null) return false; @@ -667,7 +638,6 @@ public class FBill implements VertxPojo, IFBill { result = prime * result + ((this.bookId == null) ? 0 : this.bookId.hashCode()); result = prime * result + ((this.modelId == null) ? 0 : this.modelId.hashCode()); result = prime * result + ((this.modelKey == null) ? 0 : this.modelKey.hashCode()); - result = prime * result + ((this.modelNewKey == null) ? 0 : this.modelNewKey.hashCode()); result = prime * result + ((this.sigma == null) ? 0 : this.sigma.hashCode()); result = prime * result + ((this.language == null) ? 0 : this.language.hashCode()); result = prime * result + ((this.active == null) ? 0 : this.active.hashCode()); @@ -696,7 +666,6 @@ public class FBill implements VertxPojo, IFBill { sb.append(", ").append(bookId); sb.append(", ").append(modelId); sb.append(", ").append(modelKey); - sb.append(", ").append(modelNewKey); sb.append(", ").append(sigma); sb.append(", ").append(language); sb.append(", ").append(active); @@ -729,7 +698,6 @@ public class FBill implements VertxPojo, IFBill { setBookId(from.getBookId()); setModelId(from.getModelId()); setModelKey(from.getModelKey()); - setModelNewKey(from.getModelNewKey()); setSigma(from.getSigma()); setLanguage(from.getLanguage()); setActive(from.getActive()); diff --git a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java index 824b4b68..ff1fb67a 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/domain/tables/records/FBillRecord.java @@ -14,8 +14,8 @@ import java.time.LocalDateTime; import org.jooq.Field; import org.jooq.Record1; -import org.jooq.Record22; -import org.jooq.Row22; +import org.jooq.Record21; +import org.jooq.Row21; import org.jooq.impl.UpdatableRecordImpl; @@ -24,7 +24,7 @@ import static io.github.jklingsporn.vertx.jooq.shared.internal.VertxPojo.*; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class FBillRecord extends UpdatableRecordImpl implements VertxPojo, Record22, IFBill { +public class FBillRecord extends UpdatableRecordImpl implements VertxPojo, Record21, IFBill { private static final long serialVersionUID = 1L; @@ -255,31 +255,12 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver return (String) get(12); } - /** - * Setter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - @Override - public FBillRecord setModelNewKey(String value) { - set(13, value); - return this; - } - - /** - * Getter for ZDB.F_BILL.MODEL_NEW_KEY. 「modelKey」- - * 关联的模型记录ID，用于描述新的Model中的记录 - */ - @Override - public String getModelNewKey() { - return (String) get(13); - } - /** * Setter for ZDB.F_BILL.SIGMA. 「sigma」- 统一标识 */ @Override public FBillRecord setSigma(String value) { - set(14, value); + set(13, value); return this; } @@ -288,7 +269,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getSigma() { - return (String) get(14); + return (String) get(13); } /** @@ -296,7 +277,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setLanguage(String value) { - set(15, value); + set(14, value); return this; } @@ -305,7 +286,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getLanguage() { - return (String) get(15); + return (String) get(14); } /** @@ -313,7 +294,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setActive(Boolean value) { - set(16, value); + set(15, value); return this; } @@ -322,7 +303,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public Boolean getActive() { - return (Boolean) get(16); + return (Boolean) get(15); } /** @@ -330,7 +311,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setMetadata(String value) { - set(17, value); + set(16, value); return this; } @@ -339,7 +320,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getMetadata() { - return (String) get(17); + return (String) get(16); } /** @@ -347,7 +328,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setCreatedAt(LocalDateTime value) { - set(18, value); + set(17, value); return this; } @@ -356,7 +337,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public LocalDateTime getCreatedAt() { - return (LocalDateTime) get(18); + return (LocalDateTime) get(17); } /** @@ -364,7 +345,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setCreatedBy(String value) { - set(19, value); + set(18, value); return this; } @@ -373,7 +354,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getCreatedBy() { - return (String) get(19); + return (String) get(18); } /** @@ -381,7 +362,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setUpdatedAt(LocalDateTime value) { - set(20, value); + set(19, value); return this; } @@ -390,7 +371,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public LocalDateTime getUpdatedAt() { - return (LocalDateTime) get(20); + return (LocalDateTime) get(19); } /** @@ -398,7 +379,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public FBillRecord setUpdatedBy(String value) { - set(21, value); + set(20, value); return this; } @@ -407,7 +388,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver */ @Override public String getUpdatedBy() { - return (String) get(21); + return (String) get(20); } // ------------------------------------------------------------------------- @@ -420,17 +401,17 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver } // ------------------------------------------------------------------------- - // Record22 type implementation + // Record21 type implementation // ------------------------------------------------------------------------- @Override - public Row22 fieldsRow() { - return (Row22) super.fieldsRow(); + public Row21 fieldsRow() { + return (Row21) super.fieldsRow(); } @Override - public Row22 valuesRow() { - return (Row22) super.valuesRow(); + public Row21 valuesRow() { + return (Row21) super.valuesRow(); } @Override @@ -500,46 +481,41 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public Field field14() { - return FBill.F_BILL.MODEL_NEW_KEY; - } - - @Override - public Field field15() { return FBill.F_BILL.SIGMA; } @Override - public Field field16() { + public Field field15() { return FBill.F_BILL.LANGUAGE; } @Override - public Field field17() { + public Field field16() { return FBill.F_BILL.ACTIVE; } @Override - public Field field18() { + public Field field17() { return FBill.F_BILL.METADATA; } @Override - public Field field19() { + public Field field18() { return FBill.F_BILL.CREATED_AT; } @Override - public Field field20() { + public Field field19() { return FBill.F_BILL.CREATED_BY; } @Override - public Field field21() { + public Field field20() { return FBill.F_BILL.UPDATED_AT; } @Override - public Field field22() { + public Field field21() { return FBill.F_BILL.UPDATED_BY; } @@ -610,46 +586,41 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public String component14() { - return getModelNewKey(); - } - - @Override - public String component15() { return getSigma(); } @Override - public String component16() { + public String component15() { return getLanguage(); } @Override - public Boolean component17() { + public Boolean component16() { return getActive(); } @Override - public String component18() { + public String component17() { return getMetadata(); } @Override - public LocalDateTime component19() { + public LocalDateTime component18() { return getCreatedAt(); } @Override - public String component20() { + public String component19() { return getCreatedBy(); } @Override - public LocalDateTime component21() { + public LocalDateTime component20() { return getUpdatedAt(); } @Override - public String component22() { + public String component21() { return getUpdatedBy(); } @@ -720,46 +691,41 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public String value14() { - return getModelNewKey(); - } - - @Override - public String value15() { return getSigma(); } @Override - public String value16() { + public String value15() { return getLanguage(); } @Override - public Boolean value17() { + public Boolean value16() { return getActive(); } @Override - public String value18() { + public String value17() { return getMetadata(); } @Override - public LocalDateTime value19() { + public LocalDateTime value18() { return getCreatedAt(); } @Override - public String value20() { + public String value19() { return getCreatedBy(); } @Override - public LocalDateTime value21() { + public LocalDateTime value20() { return getUpdatedAt(); } @Override - public String value22() { + public String value21() { return getUpdatedBy(); } @@ -843,60 +809,54 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver @Override public FBillRecord value14(String value) { - setModelNewKey(value); - return this; - } - - @Override - public FBillRecord value15(String value) { setSigma(value); return this; } @Override - public FBillRecord value16(String value) { + public FBillRecord value15(String value) { setLanguage(value); return this; } @Override - public FBillRecord value17(Boolean value) { + public FBillRecord value16(Boolean value) { setActive(value); return this; } @Override - public FBillRecord value18(String value) { + public FBillRecord value17(String value) { setMetadata(value); return this; } @Override - public FBillRecord value19(LocalDateTime value) { + public FBillRecord value18(LocalDateTime value) { setCreatedAt(value); return this; } @Override - public FBillRecord value20(String value) { + public FBillRecord value19(String value) { setCreatedBy(value); return this; } @Override - public FBillRecord value21(LocalDateTime value) { + public FBillRecord value20(LocalDateTime value) { setUpdatedAt(value); return this; } @Override - public FBillRecord value22(String value) { + public FBillRecord value21(String value) { setUpdatedBy(value); return this; } @Override - public FBillRecord values(String value1, String value2, String value3, String value4, String value5, String value6, BigDecimal value7, Boolean value8, String value9, String value10, String value11, String value12, String value13, String value14, String value15, String value16, Boolean value17, String value18, LocalDateTime value19, String value20, LocalDateTime value21, String value22) { + public FBillRecord values(String value1, String value2, String value3, String value4, String value5, String value6, BigDecimal value7, Boolean value8, String value9, String value10, String value11, String value12, String value13, String value14, String value15, Boolean value16, String value17, LocalDateTime value18, String value19, LocalDateTime value20, String value21) { value1(value1); value2(value2); value3(value3); @@ -918,7 +878,6 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver value19(value19); value20(value20); value21(value21); - value22(value22); return this; } @@ -941,7 +900,6 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver setBookId(from.getBookId()); setModelId(from.getModelId()); setModelKey(from.getModelKey()); - setModelNewKey(from.getModelNewKey()); setSigma(from.getSigma()); setLanguage(from.getLanguage()); setActive(from.getActive()); @@ -973,7 +931,7 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver /** * Create a detached, initialised FBillRecord */ - public FBillRecord(String key, String name, String code, String serial, String type, String category, BigDecimal amount, Boolean income, String comment, String orderId, String bookId, String modelId, String modelKey, String modelNewKey, String sigma, String language, Boolean active, String metadata, LocalDateTime createdAt, String createdBy, LocalDateTime updatedAt, String updatedBy) { + public FBillRecord(String key, String name, String code, String serial, String type, String category, BigDecimal amount, Boolean income, String comment, String orderId, String bookId, String modelId, String modelKey, String sigma, String language, Boolean active, String metadata, LocalDateTime createdAt, String createdBy, LocalDateTime updatedAt, String updatedBy) { super(FBill.F_BILL); setKey(key); @@ -989,7 +947,6 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver setBookId(bookId); setModelId(modelId); setModelKey(modelKey); - setModelNewKey(modelNewKey); setSigma(sigma); setLanguage(language); setActive(active); @@ -1021,7 +978,6 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver setBookId(value.getBookId()); setModelId(value.getModelId()); setModelKey(value.getModelKey()); - setModelNewKey(value.getModelNewKey()); setSigma(value.getSigma()); setLanguage(value.getLanguage()); setActive(value.getActive()); @@ -1034,8 +990,8 @@ public class FBillRecord extends UpdatableRecordImpl implements Ver } } - public FBillRecord(io.vertx.core.json.JsonObject json) { - this(); - fromJson(json); - } + public FBillRecord(io.vertx.core.json.JsonObject json) { + this(); + fromJson(json); + } } diff --git a/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql b/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql index de1e3bca..f35959fe 100644 --- a/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql +++ b/zero-fm/src/main/resources/plugin/fm/sql/F_BILL.sql @@ -23,7 +23,6 @@ CREATE TABLE `F_BILL` `BOOK_ID` VARCHAR(36) COMMENT '「bookId」- 关联账本ID', `MODEL_ID` VARCHAR(255) COMMENT '「modelId」- 关联的模型identifier，用于描述', `MODEL_KEY` VARCHAR(36) COMMENT '「modelKey」- 关联的模型记录ID，用于描述哪一个Model中的记录', - `MODEL_NEW_KEY` VARCHAR(36) COMMENT '「modelKey」- 关联的模型记录新ID，用于描述新的Model中的某一条新记录', -- 特殊字段 `SIGMA` VARCHAR(32) COMMENT '「sigma」- 统一标识', -- Gitee From bf961cefd55826545cc012f5bf2459e5b32cd79d Mon Sep 17 00:00:00 2001 From: unknown <627433532@qq.com> Date: Wed, 20 Mar 2024 15:10:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java b/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java index 0bdc917b..04340ea6 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/api/FetchActor.java @@ -46,7 +46,7 @@ public class FetchActor { final BillData data = new BillData(); /* 按照 orderId 查询账单集合信息 */ return this.fetchStub.fetchByOrder(orderId) - .compose(bills1 -> data.bill(bills1)) + .compose(data::bill) /* 根据账单查询 账单明细 信息 */ @@ -55,8 +55,8 @@ public class FetchActor { /* 根据账单明细查询 结算单 信息 */ - .compose(items -> this.fetchStub.fetchSettlements(items)) - .compose(settlements -> data.settlement(settlements)) + .compose(this.fetchStub::fetchSettlements) + .compose(data::settlement) /* * 旧版本多查询了一步，但实际这个步骤查询下来没有任何用 -- Gitee From 1b25d6d5c15be329c3fcbcc17e0d7e64dbfd94d9 Mon Sep 17 00:00:00 2001 From: unknown <627433532@qq.com> Date: Thu, 11 Apr 2024 19:48:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=86=B2=E8=B4=A6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vertxup/fm/api/income/VarietyActor.java | 5 +- .../vertxup/fm/api/income/VarietyAgent.java | 2 + .../main/modulat/io/vertx/mod/fm/cv/Addr.java | 3 ++ .../uca/notification/NotifyReversalOrder.java | 50 +++++++++++++++++++ .../uca/notification/NotifyReversalParam.java | 29 +++++++++++ .../io/vertx/mod/fm/uca/trans/Sync01Debt.java | 2 +- 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalOrder.java create mode 100644 zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalParam.java diff --git a/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyActor.java b/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyActor.java index 66cd3b1c..10923926 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyActor.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyActor.java @@ -46,7 +46,10 @@ public class VarietyActor { public Future upRevert(final String key, final JsonObject data) { return Maker.upBI().buildAsync(data, key).compose(item -> { final FBillItem to = Ux.fromJson(data.getJsonObject("item"), FBillItem.class); - return this.varietyStub.revertAsync(item, to); + return this.varietyStub.revertAsync(item, to).compose(json->{ + json.put("realname",data.getString("realname")); + return Ux.future(json); + }); }); } diff --git a/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyAgent.java b/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyAgent.java index 40040278..bd355660 100644 --- a/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyAgent.java +++ b/zero-fm/src/main/java/cn/vertxup/fm/api/income/VarietyAgent.java @@ -4,6 +4,7 @@ import io.vertx.core.json.JsonObject; import io.vertx.mod.fm.cv.Addr; import io.vertx.up.annotations.Address; import io.vertx.up.annotations.EndPoint; +import io.vertx.up.annotations.Off; import io.vertx.up.eon.KName; import jakarta.ws.rs.BodyParam; import jakarta.ws.rs.PUT; @@ -42,6 +43,7 @@ public interface VarietyAgent { @PUT @Path("/bill-item/revert/:key") @Address(Addr.BillItem.UP_REVERT) + @Off(address = Addr.Notify.REVERSAL_ORDER) JsonObject upRevert(@PathParam(KName.KEY) String key, @BodyParam JsonObject data); /** diff --git a/zero-fm/src/main/modulat/io/vertx/mod/fm/cv/Addr.java b/zero-fm/src/main/modulat/io/vertx/mod/fm/cv/Addr.java index 6256ad8f..c49dc4a4 100644 --- a/zero-fm/src/main/modulat/io/vertx/mod/fm/cv/Addr.java +++ b/zero-fm/src/main/modulat/io/vertx/mod/fm/cv/Addr.java @@ -57,4 +57,7 @@ public interface Addr { String FETCH_BY_KEY = Prefix._EVENT + "TRANS-BY/KEY"; } + interface Notify { + String REVERSAL_ORDER = Prefix._EVENT + "NOTIFY/REVERSAL/ORDER"; + } } diff --git a/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalOrder.java b/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalOrder.java new file mode 100644 index 00000000..a6e0da0c --- /dev/null +++ b/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalOrder.java @@ -0,0 +1,50 @@ +package io.vertx.mod.fm.uca.notification; + +import cn.vertxup.fm.domain.tables.daos.FBillDao; +import cn.vertxup.fm.domain.tables.pojos.FBill; +import io.horizon.spi.feature.Transit; +import io.vertx.core.Future; +import io.vertx.core.json.JsonObject; +import io.vertx.mod.fm.cv.Addr; +import io.vertx.up.annotations.Address; +import io.vertx.up.annotations.Subscribe; +import io.vertx.up.commune.config.XHeader; +import io.vertx.up.eon.KName; +import io.vertx.up.unity.Ux; + +/** + * 冲账提醒处理 + * + * @author lang : 2024-04-03 + */ +public class NotifyReversalOrder { + /* + * 冲账提交专用提醒模型，此处为基础站内信模式 + * 1. 如果 WebSocket 存在订阅，那么此处才会执行，若没有开浏览器，则不会执行 + * 2. 发送完成之后，消息会直接发送到浏览器中，使用回调模式来创建消息历史，只存在 SENT 和 HISTORY 两种状态 + */ + @Subscribe("reversal-order") + @Address(Addr.Notify.REVERSAL_ORDER) + public Future submitNotify(final JsonObject input, final XHeader header) { + return Ux.Jooq.on(FBillDao.class).fetchOneAsync("key",input.getString("billId")).compose(bill->{ + JsonObject entries = new JsonObject(); + entries.put(KName.Finance.AMOUNT,input.getString("amount")); + entries.put(KName.Finance.SERIAL,input.getString("serial")); + entries.put(KName.Finance.REALNAME,input.getString("realname")); + entries.put(KName.Finance.ROOMNUMBER,bill.getModelKey()); + entries.put(KName.Finance.CREATEDAT,input.getString("createdAt")); + entries.put(KName.SIGMA, header.getSigma()); + entries.put(KName.APP_ID, header.getAppId()); + entries.put(KName.Finance.NAME,"冲账"); + return Ux.future(entries); + }).compose(massger->{ + JsonObject entries = new JsonObject(); + entries.put(KName.DATA,massger); + entries.put(KName.SIGMA, header.getSigma()); + entries.put(KName.APP_ID, header.getAppId()); + entries.put(KName.MESSAGE, "NOTIFY.REVERSAL.ORDER"); + return Ux.channel(Transit.class, JsonObject::new, stub -> stub.message(entries)) + .compose(message -> Ux.future(NotifyReversalParam.response(message, input))); + }); + } +} diff --git a/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalParam.java b/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalParam.java new file mode 100644 index 00000000..b1df88ef --- /dev/null +++ b/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/notification/NotifyReversalParam.java @@ -0,0 +1,29 @@ +package io.vertx.mod.fm.uca.notification; + +import io.vertx.core.json.JsonObject; +import io.vertx.up.commune.config.XHeader; +import io.vertx.up.eon.KName; + +import java.util.Objects; + +/** + * @author lang : 2024-04-04 + */ +class NotifyReversalParam { + + static JsonObject normalized(final JsonObject input, final XHeader header) { + final JsonObject params = new JsonObject(); + if (Objects.nonNull(header)) { + params.put(KName.SIGMA, header.getSigma()); + params.put(KName.APP_ID, header.getAppId()); + } + params.put(KName.DATA, input); + return params; + } + + static JsonObject response(final JsonObject message, final JsonObject input) { + final JsonObject response = message.copy(); + response.put("request", input); + return response; + } +} diff --git a/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/trans/Sync01Debt.java b/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/trans/Sync01Debt.java index 7a87d875..3f78f2b4 100644 --- a/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/trans/Sync01Debt.java +++ b/zero-fm/src/main/modulat/io/vertx/mod/fm/uca/trans/Sync01Debt.java @@ -70,7 +70,7 @@ class Sync01Debt implements Trade { debt.setAmountBalance(amountBalance); - if (0 >= amountBalance.doubleValue()) { + if (0 == amountBalance.doubleValue()) { debt.setFinished(Boolean.TRUE); debt.setFinishedAt(nowAt); } -- Gitee