diff --git a/src/main/java/com/vxnet/pms/domain/Company.java b/src/main/java/com/vxnet/pms/domain/Company.java index 9c79e18..914d223 100644 --- a/src/main/java/com/vxnet/pms/domain/Company.java +++ b/src/main/java/com/vxnet/pms/domain/Company.java @@ -16,6 +16,11 @@ public class Company implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @NotNull + @Size(max = 50) + @Column(name = "number", length = 50, nullable = false, unique = true) + private String number; + @NotNull @Size(max = 100) @Column(name = "name", length = 100, nullable = false) @@ -55,6 +60,14 @@ public class Company implements Serializable { this.id = id; } + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + public String getName() { return name; } diff --git a/src/main/java/com/vxnet/pms/web/rest/CompanyResource.java b/src/main/java/com/vxnet/pms/web/rest/CompanyResource.java index c26c863..25ed13a 100644 --- a/src/main/java/com/vxnet/pms/web/rest/CompanyResource.java +++ b/src/main/java/com/vxnet/pms/web/rest/CompanyResource.java @@ -10,6 +10,7 @@ import java.net.URISyntaxException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; @@ -81,6 +82,15 @@ public class CompanyResource { * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the list of companies in body. */ @GetMapping("/companies") + public Mono>> getAllCompanies( + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size + ) { + log.debug("REST request to get Companies with pagination - Page: {}, Size: {}", page, size); + Pageable pageable = PageRequest.of(page, size); + return Mono.just(ResponseEntity.ok().body(companyService.findAll(pageable))); + } + public Flux getAllCompanies() { log.debug("REST request to get all Companies"); return companyService.getAllCompanies(); diff --git a/src/main/resources/config/liquibase/changelog/20240325000002_added_entity_Company.xml b/src/main/resources/config/liquibase/changelog/20240325000002_added_entity_Company.xml index 2b63fee..66bf4ab 100644 --- a/src/main/resources/config/liquibase/changelog/20240325000002_added_entity_Company.xml +++ b/src/main/resources/config/liquibase/changelog/20240325000002_added_entity_Company.xml @@ -11,6 +11,9 @@ + + + @@ -30,6 +33,7 @@ tableName="jhi_company" usePreparedStatements="true"> + diff --git a/src/main/resources/config/liquibase/data/company.csv b/src/main/resources/config/liquibase/data/company.csv index 7d5598e..fc8f713 100644 --- a/src/main/resources/config/liquibase/data/company.csv +++ b/src/main/resources/config/liquibase/data/company.csv @@ -1,3 +1,3 @@ -id;name;address;license_no;license_expire;createtime;updatetime;lastmodby;version -1;测试公司;广州市天河区天河路100号;GZ202403250001;2025-03-25 00:00:00;2024-03-25 00:00:00;2024-03-25 00:00:00;system;0 -2;示例企业;深圳市南山区科技园;SZ202403250002;2025-03-25 00:00:00;2024-03-25 00:00:00;2024-03-25 00:00:00;system;0 \ No newline at end of file +id;number;name;address;license_no;license_expire;createtime;updatetime;lastmodby;version +1;C001;测试公司;广州市天河区天河路100号;GZ202403250001;2025-03-25 00:00:00;2024-03-25 00:00:00;2024-03-25 00:00:00;system;0 +2;C002;示例企业;深圳市南山区科技园;SZ202403250002;2025-03-25 00:00:00;2024-03-25 00:00:00;2024-03-25 00:00:00;system;0 \ No newline at end of file diff --git a/src/main/webapp/app/admin/menu/menu.component.ts b/src/main/webapp/app/admin/menu/menu.component.ts index 2141c44..19fc404 100644 --- a/src/main/webapp/app/admin/menu/menu.component.ts +++ b/src/main/webapp/app/admin/menu/menu.component.ts @@ -6,7 +6,6 @@ import axios from 'axios'; import TreeTable from 'vue-table-with-tree-grid'; export default defineComponent({ - compatConfig: { MODE: 3 }, name: 'Menu', components: { TreeTable, @@ -102,8 +101,8 @@ export default defineComponent({ loadAll(); }; - const showEditDialog = ref(false); - const showDeleteDialog = ref(false); + const editDialogRef = ref(null); + const deleteDialogRef = ref(null); const openDialog = () => { dialogTitle.value = t('jewpmsApp.menu.home.createLabel'); @@ -121,27 +120,29 @@ export default defineComponent({ lastmodby: '', version: 0, }; - showEditDialog.value = true; + const modal = document.getElementById('editDialog'); + if (modal) { + const bModal = (modal as any).__vue__.$refs.modal; + if (bModal) { + bModal.show(); + } + } }; const closeDialog = () => { - showEditDialog.value = false; - }; - - const closeDeleteDialog = () => { - showDeleteDialog.value = false; + editDialogRef.value?.hide(); }; const prepareEdit = menuItem => { dialogTitle.value = t('jewpmsApp.menu.home.editLabel'); menu.value = { ...menuItem }; - showEditDialog.value = true; + editDialogRef.value?.show(); }; const prepareDelete = menuItem => { removeId.value = menuItem.id; menu.value = menuItem; - showDeleteDialog.value = true; + deleteDialogRef.value?.show(); }; const save = async () => { @@ -193,9 +194,8 @@ export default defineComponent({ removeMenu, deleteMenu: removeMenu, getParentName, - showEditDialog, - showDeleteDialog, - closeDeleteDialog, + editDialogRef, + deleteDialogRef, }; }, }); diff --git a/src/main/webapp/app/admin/menu/menu.vue b/src/main/webapp/app/admin/menu/menu.vue index 60582b1..c91d05f 100644 --- a/src/main/webapp/app/admin/menu/menu.vue +++ b/src/main/webapp/app/admin/menu/menu.vue @@ -3,6 +3,10 @@

+ Launch demo modal + +

Hello from modal!

+
- +
@@ -94,7 +98,7 @@ - +