refactor: 移除冗余方法并优化查询逻辑

移除多个服务类中重复的findAll方法实现，统一使用父类方法优化QueryService的findOneByProperty实现，提高可读性为EntityService添加aliasFor方法支持字段别名修复ContractVerifyWindowController的消息处理逻辑添加查看验证状态的功能菜单项
2025-12-15 00:04:32 +08:00
parent 3cf3a717be
commit 4e738bea3c
18 changed files with 166 additions and 207 deletions
--- a/client/src/main/java/com/ecep/contract/controller/contract/ContractVerifyWindowController.java
+++ b/client/src/main/java/com/ecep/contract/controller/contract/ContractVerifyWindowController.java
@@ -12,6 +12,9 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;

+import javafx.scene.Node;
+import javafx.scene.control.*;
+import org.controlsfx.control.PopOver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,13 +53,6 @@ import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckMenuItem;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.Label;
-import javafx.scene.control.TableCell;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
 import javafx.scene.layout.HBox;
 import javafx.stage.FileChooser;
 import javafx.stage.Modality;
@@ -79,6 +75,7 @@ public class ContractVerifyWindowController extends BaseController {
        return super.show(loader, owner, modality);
    }

+
    @Setter
    @Getter
    public static class MessageExt extends Message {
@@ -90,12 +87,16 @@ public class ContractVerifyWindowController extends BaseController {
    }

    @Data
-    public static class Model implements MessageHolder {
+    public static class Model {
        private SimpleStringProperty code = new SimpleStringProperty();
        private SimpleStringProperty name = new SimpleStringProperty();
        private SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
        private SimpleObjectProperty<LocalDate> setupDate = new SimpleObjectProperty<>();
        private SimpleListProperty<MessageExt> messages = new SimpleListProperty<>(FXCollections.observableArrayList());
+    }
+
+    static class MessageHolderImpl implements MessageHolder {
+        List<MessageExt> messages = new ArrayList<>();

        @Override
        public void addMessage(Level level, String message) {
@@ -261,6 +262,8 @@ public class ContractVerifyWindowController extends BaseController {
            long total = contractService.count(params);
            setStatus("合同：" + total + " 条");

+            MessageHolderImpl messageHolder = new MessageHolderImpl();
+
            while (true) {
                if (isCloseRequested()) {
                    break;
@@ -268,6 +271,7 @@ public class ContractVerifyWindowController extends BaseController {

                Page<ContractVo> page = contractService.findAll(params, pageRequest);
                for (ContractVo contract : page) {
+                    messageHolder.messages.clear();
                    if (isCloseRequested()) {
                        break;
                    }
@@ -285,11 +289,11 @@ public class ContractVerifyWindowController extends BaseController {
                    model.getName().set(contract.getName());
                    model.getSetupDate().set(contract.getSetupDate());

-                    comm.verify(contract, model);
+                    comm.verify(contract, messageHolder);
                    setStatus("合同验证进度：" + counter.get() + " / " + total);
                    // 移除中间消息
-                    if (!model.getMessages().isEmpty()) {
-                        model.getMessages().removeIf(msg -> msg.getLevel().intValue() <= Level.INFO.intValue());
+                    if (!messageHolder.messages.isEmpty()) {
+                        model.getMessages().setAll(messageHolder.messages.stream().filter(msg -> msg.getLevel().intValue() > Level.INFO.intValue()).limit(50).toList());
                    }
                    if (model.getMessages().isEmpty()) {
                        if (onlyShowVerifiedChecker.isSelected()) {
@@ -325,6 +329,7 @@ public class ContractVerifyWindowController extends BaseController {
        }
        runAsync(() -> {
            ContractVo contract = null;
+            MessageHolderImpl messageHolder = new MessageHolderImpl();
            try {
                contract = contractService.findByCode(contractCode);
            } catch (Exception e) {
@@ -336,17 +341,18 @@ public class ContractVerifyWindowController extends BaseController {
            }
            model.getMessages().clear();
            try {
-                comm.verify(contract, model);
-                // 移除中间消息
-                if (!model.getMessages().isEmpty()) {
-                    model.getMessages().removeIf(msg -> msg.getLevel().intValue() <= Level.INFO.intValue());
-                }
+                comm.verify(contract, messageHolder);
            } catch (Exception e) {
                logger.error(model.getCode().get(), e);
-                model.error(e.getMessage());
+                messageHolder.error(e.getMessage());
            }

-            if (model.getMessages().isEmpty()) {
+            // 移除中间消息
+            if (!messageHolder.messages.isEmpty()) {
+                model.getMessages().setAll(messageHolder.messages.stream().filter(msg -> msg.getLevel().intValue() > Level.INFO.intValue()).limit(50).toList());
+            }
+
+            if (messageHolder.messages.isEmpty()) {
                Platform.runLater(() -> {
                    viewTableDataSet.remove(model);
                });
@@ -380,6 +386,38 @@ public class ContractVerifyWindowController extends BaseController {
        ContractWindowController.show(contract, viewTable.getScene().getWindow());
    }

+
+    public void onShowVerifyStatusAction(ActionEvent event) {
+
+        // 在新新窗口中显示 状态消息 Model# messages
+
+        Model selectedItem = viewTable.getSelectionModel().getSelectedItem();
+        if (selectedItem == null) {
+            return;
+        }
+
+        ListView<MessageExt> listView = new ListView<>();
+        listView.setItems(selectedItem.messages);
+        listView.setCellFactory(v -> new ListCell<>() {
+            @Override
+            protected void updateItem(MessageExt item, boolean empty) {
+                super.updateItem(item, empty);
+                if (item == null || empty) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    setText(item.getMessage());
+                    setGraphic(new Label(item.getPrefix()));
+                }
+            }
+        });
+        PopOver popOver = new PopOver(listView);
+        popOver.setArrowLocation(PopOver.ArrowLocation.TOP_LEFT);
+        MenuItem menuItem = (MenuItem) event.getSource();
+        Node node = viewTable.lookup(".table-row-cell:selected");
+        popOver.show(node);
+    }
+
    public void onExportVerifyResultAsFileAction(ActionEvent e) {
        FileChooser chooser = new FileChooser();
        chooser.setTitle("导出核验结果");
--- a/client/src/main/java/com/ecep/contract/service/ContractFileService.java
+++ b/client/src/main/java/com/ecep/contract/service/ContractFileService.java
@@ -13,6 +13,12 @@ import com.ecep.contract.vo.ContractVo;

@Service
 public class ContractFileService extends QueryService<ContractFileVo, ContractFileViewModel> {
+
+    @Override
+    public ContractFileVo findById(Integer id) {
+        return super.findById(id);
+    }
+
    public List<ContractFileVo> findAllByContract(ContractVo contract) {
        return findAll(ParamUtils.equal("contract", contract.getId()), Pageable.unpaged()).getContent();
    }
--- a/client/src/main/java/com/ecep/contract/service/ProjectSaleTypeService.java
+++ b/client/src/main/java/com/ecep/contract/service/ProjectSaleTypeService.java
@@ -26,11 +26,11 @@ public class ProjectSaleTypeService extends QueryService<ProjectSaleTypeVo, Proj
    }

    public ProjectSaleTypeVo findByCode(String code) {
-        return findAll(ParamUtils.builder().equals("code", code).build(), Pageable.ofSize(1)).getContent().getFirst();
+        return findOneByProperty("code", code);
    }

    public ProjectSaleTypeVo findByName(String name) {
-        return findAll(ParamUtils.builder().equals("name", name).build(), Pageable.ofSize(1)).getContent().getFirst();
+        return findOneByProperty("name", name);
    }

    @Caching(evict = {@CacheEvict(key = "#p0.id")})
--- a/client/src/main/java/com/ecep/contract/service/QueryService.java
+++ b/client/src/main/java/com/ecep/contract/service/QueryService.java
@@ -188,8 +188,9 @@ public class QueryService<T extends IdentityEntity, TV extends IdentityViewModel
    }

    public T findOneByProperty(String propertyName, Object propertyValue) {
-        return findAll(ParamUtils.builder().equals(propertyName, propertyValue).build(), Pageable.ofSize(1)).stream()
-                .findFirst().orElse(null);
+        ParamUtils.Builder paramBuilder = ParamUtils.builder().equals(propertyName, propertyValue);
+        Page<T> page = findAll(paramBuilder.build(), Pageable.ofSize(1));
+        return page.stream().findFirst().orElse(null);
    }

    /**
--- a/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java
+++ b/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java
@@ -373,7 +373,10 @@ public class ContractVerifyComm implements BeanContext {
                        }

                        CompanyVo company = getCompanyService().findById(bidVendor.getCompanyId());
-                        ContractFileVo contractFile = fileService.findById(bidVendor.getQuotationSheetFileId());
+                        ContractFileVo contractFile = null;
+                        if (bidVendor.getQuotationSheetFileId() != null) {
+                            contractFile = fileService.findById(bidVendor.getQuotationSheetFileId());
+                        }
                        // 报价表文件不存在
                        if (contractFile == null) {
                            if (requireQuotation && bidVendor.getCompanyId().equals(contract.getCompanyId())) {
--- a/client/src/main/resources/ui/contract/contract-verify.fxml
+++ b/client/src/main/resources/ui/contract/contract-verify.fxml
@@ -105,9 +105,9 @@
                    <contextMenu>
                        <ContextMenu>
                            <items>
-                                <MenuItem mnemonicParsing="false" onAction="#onShowContractDetailAction"
-                                          text="合同详情"/>
+                                <MenuItem mnemonicParsing="false" onAction="#onShowContractDetailAction" text="合同详情"/>
                                <MenuItem mnemonicParsing="false" onAction="#onContractReVerifyAction" text="重新验证"/>
+                                <MenuItem mnemonicParsing="false" onAction="#onShowVerifyStatusAction" text="查看状态"/>
                            </items>
                        </ContextMenu>
                    </contextMenu>